Skip to content

Commit 2892f2f

Browse files
mfeurermfeurer
committed
FIX documentation building on RTD.org
1 parent 0c18499 commit 2892f2f

File tree

9 files changed

+112
-113
lines changed

9 files changed

+112
-113
lines changed

‎autosklearn/estimators.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
# -*- encoding: utf-8 -*-
22
import os
33
import random
4-
import shutil
54

65
import numpy as np
7-
from os import stat
86
import six
97

10-
from autosklearn.automl import AutoML
8+
import autosklearn.automl
119
from autosklearn.constants import *
1210

1311

14-
class AutoSklearnClassifier(AutoML):
12+
class AutoSklearnClassifier(autosklearn.automl.AutoML):
1513
"""This class implements the classification task. It must not be pickled!
1614
1715
Parameters
@@ -302,7 +300,7 @@ def predict_proba(self, X):
302300
return super(AutoSklearnClassifier, self).predict_proba(X)
303301

304302

305-
class AutoSklearnRegressor(AutoML):
303+
class AutoSklearnRegressor(autosklearn.automl.AutoML):
306304

307305
def __init__(self, **kwargs):
308306
raise NotImplementedError()

‎autosklearn/evaluation/abstract_evaluator.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
import traceback
77

88
import numpy as np
9-
import lockfile
10-
from autosklearn.pipeline.classification import SimpleClassificationPipeline
11-
from autosklearn.pipeline.regression import SimpleRegressionPipeline
9+
import autosklearn.pipeline.classification
10+
import autosklearn.pipeline.regression
1211
from sklearn.dummy import DummyClassifier, DummyRegressor
1312

1413
from autosklearn.constants import *
@@ -105,13 +104,15 @@ def __init__(self, Datamanager, output_dir, configuration=None,
105104
if self.configuration is None:
106105
self.model_class = MyDummyRegressor
107106
else:
108-
self.model_class = SimpleRegressionPipeline
107+
self.model_class = \
108+
autosklearn.pipeline.regression.SimpleRegressionPipeline
109109
self.predict_function = self.predict_regression
110110
else:
111111
if self.configuration is None:
112112
self.model_class = MyDummyClassifier
113113
else:
114-
self.model_class = SimpleClassificationPipeline
114+
self.model_class = \
115+
autosklearn.pipeline.classification.SimpleClassificationPipeline
115116
self.predict_function = self.predict_proba
116117

117118
if num_run is None:

‎autosklearn/pipeline/classification.py‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
99
from HPOlibConfigSpace.forbidden import ForbiddenEqualsClause, ForbiddenAndConjunction
1010

11-
from autosklearn.pipeline import components as components
11+
from autosklearn.pipeline.components import classification as \
12+
classification_components
13+
from autosklearn.pipeline.components import data_preprocessing as \
14+
data_preprocessing_components
15+
from autosklearn.pipeline.components import feature_preprocessing as \
16+
feature_preprocessing_components
1217
from autosklearn.pipeline.base import BasePipeline
1318
from autosklearn.pipeline.constants import SPARSE
1419
from autosklearn.pipeline.components.data_preprocessing.balancing import Balancing
@@ -284,21 +289,21 @@ def _get_pipeline(cls):
284289
# Add the always active preprocessing components
285290
steps.extend(
286291
[["one_hot_encoding",
287-
components.data_preprocessing._preprocessors['one_hot_encoding']],
292+
data_preprocessing_components._preprocessors['one_hot_encoding']],
288293
["imputation",
289-
components.data_preprocessing._preprocessors['imputation']],
294+
data_preprocessing_components._preprocessors['imputation']],
290295
["rescaling",
291-
components.data_preprocessing._preprocessors['rescaling']],
296+
data_preprocessing_components._preprocessors['rescaling']],
292297
["balancing",
293-
components.data_preprocessing._preprocessors['balancing']]])
298+
data_preprocessing_components._preprocessors['balancing']]])
294299

295300
# Add the preprocessing component
296301
steps.append(['preprocessor',
297-
components.feature_preprocessing.FeaturePreprocessorChoice])
302+
feature_preprocessing_components.FeaturePreprocessorChoice])
298303

299304
# Add the classification component
300305
steps.append(['classifier',
301-
components.classification_components.ClassifierChoice])
306+
classification_components.ClassifierChoice])
302307
return steps
303308

304309
def _get_estimator_hyperparameter_name(self):

‎autosklearn/pipeline/components/__init__.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +0,0 @@
1-
from . import classification as classification_components
2-
from . import regression as regression_components
3-
from . import feature_preprocessing as feature_preprocessing_components
4-
from . import data_preprocessing as data_preprocessing_components
5-
6-
7-

‎autosklearn/pipeline/components/base.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ def __init__(self):
7676
def get_properties(dataset_properties=None):
7777
"""Get the properties of the underlying algorithm.
7878
79-
Find more information at :ref:`get_properties`
79+
Find more information at :ref:`get_properties`
8080
81-
Paramaters
81+
Parameters
8282
----------
8383
8484
dataset_properties : dict, optional (default=None)
@@ -93,7 +93,7 @@ def get_properties(dataset_properties=None):
9393
def get_hyperparameter_search_space(dataset_properties=None):
9494
"""Return the configuration space of this classification algorithm.
9595
96-
Paramaters
96+
Parameters
9797
----------
9898
9999
dataset_properties : dict, optional (default=None)
@@ -188,9 +188,9 @@ def __init__(self):
188188
def get_properties(dataset_properties=None):
189189
"""Get the properties of the underlying algorithm.
190190
191-
Find more information at :ref:`get_properties`
191+
Find more information at :ref:`get_properties`
192192
193-
Paramaters
193+
Parameters
194194
----------
195195
196196
dataset_properties : dict, optional (default=None)
@@ -205,7 +205,7 @@ def get_properties(dataset_properties=None):
205205
def get_hyperparameter_search_space(dataset_properties=None):
206206
"""Return the configuration space of this preprocessing algorithm.
207207
208-
Paramaters
208+
Parameters
209209
----------
210210
211211
dataset_properties : dict, optional (default=None)
@@ -287,9 +287,9 @@ def __init__(self):
287287
def get_properties(dataset_properties=None):
288288
"""Get the properties of the underlying algorithm.
289289
290-
Find more information at :ref:`get_properties`
290+
Find more information at :ref:`get_properties`
291291
292-
Paramaters
292+
Parameters
293293
----------
294294
295295
dataset_properties : dict, optional (default=None)
@@ -304,7 +304,7 @@ def get_properties(dataset_properties=None):
304304
def get_hyperparameter_search_space(dataset_properties=None):
305305
"""Return the configuration space of this regression algorithm.
306306
307-
Paramaters
307+
Parameters
308308
----------
309309
310310
dataset_properties : dict, optional (default=None)

‎autosklearn/pipeline/regression.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
from HPOlibConfigSpace.forbidden import ForbiddenEqualsClause, ForbiddenAndConjunction
99
from HPOlibConfigSpace.configuration_space import ConfigurationSpace
1010

11-
from autosklearn.pipeline import components as components
11+
from autosklearn.pipeline.components import regression as regression_components
12+
from autosklearn.pipeline.components import data_preprocessing as \
13+
data_preprocessing_components
14+
from autosklearn.pipeline.components import feature_preprocessing as \
15+
feature_preprocessing_components
1216
from autosklearn.pipeline.base import BasePipeline
1317
from autosklearn.pipeline.constants import SPARSE
1418

@@ -238,7 +242,7 @@ def get_hyperparameter_search_space(cls, include=None, exclude=None,
238242

239243
@staticmethod
240244
def _get_estimator_components():
241-
return components.regression_components._regressors
245+
return regression_components._regressors
242246

243247
@classmethod
244248
def _get_pipeline(cls):
@@ -247,19 +251,19 @@ def _get_pipeline(cls):
247251
# Add the always active preprocessing components
248252
steps.extend(
249253
[["one_hot_encoding",
250-
components.data_preprocessing._preprocessors['one_hot_encoding']],
254+
data_preprocessing_components._preprocessors['one_hot_encoding']],
251255
["imputation",
252-
components.data_preprocessing._preprocessors['imputation']],
256+
data_preprocessing_components._preprocessors['imputation']],
253257
["rescaling",
254-
components.data_preprocessing._preprocessors['rescaling']]])
258+
data_preprocessing_components._preprocessors['rescaling']]])
255259

256260
# Add the preprocessing component
257261
steps.append(['preprocessor',
258-
components.feature_preprocessing.FeaturePreprocessorChoice])
262+
feature_preprocessing_components.FeaturePreprocessorChoice])
259263

260264
# Add the classification component
261265
steps.append(['regressor',
262-
components.regression_components.RegressorChoice])
266+
regression_components.RegressorChoice])
263267
return steps
264268

265269
def _get_estimator_hyperparameter_name(self):

‎source/api.rst‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,11 @@ Main modules
1010

1111
.. autoclass:: autosklearn.classification.AutoSklearnClassifier
1212

13-
Pipeline modules
14-
================
15-
16-
.. autoclass:: autosklearn.pipeline.classification.SimpleClassificationPipeline
17-
18-
1913
Extension Interfaces
2014
====================
2115

22-
.. autoclass:: autosklearn.pipeline.components.classification.AutoSklearnClassificationAlgorithm
16+
.. autoclass:: autosklearn.pipeline.components.base.AutoSklearnClassificationAlgorithm
17+
18+
.. autoclass:: autosklearn.pipeline.components.base.AutoSklearnRegressionAlgorithm
2319

24-
.. autoclass:: autosklearn.pipeline.components.regression.AutoSklearnRegressionAlgorithm
25-
26-
.. autoclass:: autosklearn.pipeline.components.feature_preprocessing.AutoSklearnPreprocessingAlgorithm
20+
.. autoclass:: autosklearn.pipeline.components.base.AutoSklearnPreprocessingAlgorithm

‎source/conf.py‎

Lines changed: 54 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -25,57 +25,60 @@
2525

2626

2727
# Mock out stuff for readthedocs.org
28-
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
29-
if on_rtd:
30-
31-
try:
32-
from mock import Mock as MagicMock
33-
except:
34-
from unittest.mock import MagicMock
35-
36-
class Mock(MagicMock):
37-
@classmethod
38-
def __getattr__(cls, name):
39-
if 'BaseEstimator' in name:
40-
class BaseEstimator(object):
41-
pass
42-
43-
return BaseEstimator
44-
return Mock()
45-
46-
MOCK_MODULES = ['lockfile',
47-
'joblib',
48-
'psutil',
49-
'pyyaml',
50-
'ConfigArgParse',
51-
'arff',
52-
'pandas',
53-
'Cython',
54-
'numpy',
55-
'scipy', 'scipy.sparse', 'scipy.stats', 'scipy.linalg',
56-
'sklearn',
57-
'sklearn.base',
58-
'sklearn.cross_validation',
59-
'sklearn.dummy',
60-
'sklearn.metrics',
61-
'sklearn.multiclass',
62-
'sklearn.neighbors',
63-
'sklearn.utils',
64-
'psutil','pyyaml','pandas',
65-
'matplotlib',
66-
'autosklearn.pipeline',
67-
'autosklearn.pipeline.implementations',
68-
'autosklearn.pipeline.implementations.OneHotEncoder',
69-
'autosklearn.pipeline.implementations.Imputation',
70-
'autosklearn.pipeline.implementations.StandardScaler',
71-
'autosklearn.pipeline.implementations.util'
72-
'autosklearn.pipeline.classification',
73-
'autosklearn.pipeline.regression',
74-
'HPOlibConfigSpace',
75-
'HPOlibConfigSpace.converters',
76-
'HPOlibConfigSpace.configuration_space']
77-
78-
sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
28+
#on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
29+
#if on_rtd:
30+
31+
try:
32+
from mock import Mock as MagicMock
33+
except:
34+
from unittest.mock import MagicMock
35+
36+
class Mock(MagicMock):
37+
@classmethod
38+
def __getattr__(cls, name):
39+
if 'BaseEstimator' in name:
40+
class BaseEstimator(object):
41+
pass
42+
43+
return BaseEstimator
44+
return Mock()
45+
46+
MOCK_MODULES = ['lockfile',
47+
'joblib',
48+
'psutil',
49+
'pyyaml',
50+
'ConfigArgParse',
51+
'arff',
52+
'pandas',
53+
'Cython',
54+
'numpy', 'numpy.random',
55+
'scipy', 'scipy.sparse', 'scipy.stats', 'scipy.linalg',
56+
'scipy.sparse.linalg',
57+
'sklearn',
58+
'sklearn.base',
59+
'sklearn.cross_validation',
60+
'sklearn.dummy',
61+
'sklearn.metrics',
62+
'sklearn.multiclass',
63+
'sklearn.neighbors',
64+
'sklearn.utils',
65+
'psutil','pyyaml','pandas',
66+
'matplotlib',
67+
'autosklearn.cli.base_interface',
68+
'autosklearn.pipeline.implementations.OneHotEncoder',
69+
'autosklearn.pipeline.implementations.Imputation',
70+
'autosklearn.pipeline.implementations.StandardScaler',
71+
'autosklearn.pipeline.implementations.MultilabelClassifier',
72+
'autosklearn.pipeline.classification',
73+
'autosklearn.pipeline.regression',
74+
'HPOlibConfigSpace',
75+
'HPOlibConfigSpace.converters',
76+
'HPOlibConfigSpace.configuration_space',
77+
'HPOlibConfigSpace.hyperparameters',
78+
'HPOlibConfigSpace.conditions',
79+
'HPOlibConfigSpace.forbidden']
80+
81+
sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
7982

8083
# Add the parent directory of this file to the PYTHONPATH
8184
import os

0 commit comments

Comments
 (0)