config space renaming fixes

zhangweijiqn · Feb 11, 2016 · 0ffe325 · 0ffe325
1 parent f18a63a
commit 0ffe325
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/autosklearn/pipeline/components/classification/__init__.py b/autosklearn/pipeline/components/classification/__init__.py
@@ -6,9 +6,9 @@
 
 from ..base import AutoSklearnClassificationAlgorithm, find_components, \
     ThirdPartyComponents
-from HPOlibConfigSpace.configuration_space import ConfigurationSpace
-from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter
-from HPOlibConfigSpace.conditions import EqualsCondition
+from ConfigSpace.configuration_space import ConfigurationSpace
+from ConfigSpace.hyperparameters import CategoricalHyperparameter
+from ConfigSpace.conditions import EqualsCondition
 
 classifier_directory = os.path.split(__file__)[0]
 _classifiers = find_components(__package__,

diff --git a/autosklearn/pipeline/components/feature_preprocessing/__init__.py b/autosklearn/pipeline/components/feature_preprocessing/__init__.py
@@ -8,9 +8,9 @@
 
 from ..base import AutoSklearnPreprocessingAlgorithm, find_components, \
     ThirdPartyComponents
-from HPOlibConfigSpace.configuration_space import ConfigurationSpace
-from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter
-from HPOlibConfigSpace.conditions import EqualsCondition, AbstractConjunction
+from ConfigSpace.configuration_space import ConfigurationSpace
+from ConfigSpace.hyperparameters import CategoricalHyperparameter
+from ConfigSpace.conditions import EqualsCondition, AbstractConjunction
 
 classifier_directory = os.path.split(__file__)[0]
 _preprocessors = find_components(__package__,

diff --git a/autosklearn/pipeline/components/regression/__init__.py b/autosklearn/pipeline/components/regression/__init__.py
@@ -8,9 +8,9 @@
 
 from ..base import AutoSklearnRegressionAlgorithm, find_components, \
     ThirdPartyComponents
-from HPOlibConfigSpace.configuration_space import ConfigurationSpace
-from HPOlibConfigSpace.hyperparameters import CategoricalHyperparameter
-from HPOlibConfigSpace.conditions import EqualsCondition
+from ConfigSpace.configuration_space import ConfigurationSpace
+from ConfigSpace.hyperparameters import CategoricalHyperparameter
+from ConfigSpace.conditions import EqualsCondition
 
 regressor_directory = os.path.split(__file__)[0]
 _regressors = find_components(__package__,

diff --git a/deprecated/cli/cli/base_interface.py b/deprecated/cli/cli/base_interface.py
@@ -5,7 +5,7 @@
 import signal
 import time
 
-from HPOlibConfigSpace import configuration_space
+from ConfigSpace import configuration_space
 
 from autosklearn.data.abstract_data_manager import AbstractDataManager
 from autosklearn.data.competition_data_manager import CompetitionDataManager

diff --git a/source/conf.py b/source/conf.py
@@ -51,9 +51,8 @@ class BaseEstimator(object):
                 'arff',
                 'pandas',
                 'Cython',
-                'numpy', 'numpy.random',
+                'numpy',
                 'scipy', 'scipy.sparse', 'scipy.stats', 'scipy.linalg',
-                'scipy.sparse.linalg',
                 'sklearn',
                 'sklearn.base',
                 'sklearn.cross_validation',
@@ -64,19 +63,16 @@ class BaseEstimator(object):
                 'sklearn.utils',
                 'psutil','pyyaml','pandas',
                 'matplotlib',
-                'autosklearn.cli.base_interface',
+                'autosklearn.pipeline',
+                'autosklearn.pipeline.implementations',
                 'autosklearn.pipeline.implementations.OneHotEncoder',
                 'autosklearn.pipeline.implementations.Imputation',
                 'autosklearn.pipeline.implementations.StandardScaler',
-                'autosklearn.pipeline.implementations.MultilabelClassifier',
                 'autosklearn.pipeline.classification',
                 'autosklearn.pipeline.regression',
-                'HPOlibConfigSpace',
-                'HPOlibConfigSpace.converters',
-                'HPOlibConfigSpace.configuration_space',
-                'HPOlibConfigSpace.hyperparameters',
-                'HPOlibConfigSpace.conditions',
-                'HPOlibConfigSpace.forbidden']
+                'ConfigSpace',
+                'ConfigSpace.converters',
+                'ConfigSpace.configuration_space']
 
 sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)