Merge pull request #1104 from RobertArbon/sklearn-0.2-fix

Modified import of ParameterGrid for compatibility with sklearn 0.20 and below.
msmbuilder · Oct 7, 2018 · 8c901a3 · 8c901a3
2 parents 6051f33 + 4ff9fd1
commit 8c901a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -46,7 +46,7 @@ Improvements
 - Changed zippy_maker code so that ```Featurizer.describe_features``` will
   return ordered unique lists to make reading and subselecting features easier.
 - ``SASAFeaturizer`` now really supports the ``describe_features`` method (gh-913).
-
+- Made ``ParameterGrid`` import compatible with ``scikit-learn`` version 0.20 and below.
 
 v3.8 (April 26, 2017)
 ---------------------

diff --git a/msmbuilder/utils/param_sweep.py b/msmbuilder/utils/param_sweep.py
@@ -1,6 +1,10 @@
 from __future__ import print_function, division, absolute_import
 from sklearn import clone
-from sklearn.grid_search import ParameterGrid
+try:
+    from sklearn.model_selection import ParameterGrid
+except ImportError:
+    from sklearn.grid_search import ParameterGrid
+
 from sklearn.externals.joblib import Parallel, delayed
 
 __all__ = ['param_sweep']