Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions autosklearn/estimators.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def __init__(
ensemble_size : int, optional (default=50)
Number of models added to the ensemble built by *Ensemble
selection from libraries of models*. Models are drawn with
replacement.
replacement. If set to ``0`` no ensemble is fit.

ensemble_nbest : int, optional (default=50)
Only consider the ``ensemble_nbest`` models when building an
Expand All @@ -96,10 +96,14 @@ def __init__(
memory_limit : int, optional (3072)
Memory limit in MB for the machine learning algorithm.
`auto-sklearn` will stop fitting the machine learning algorithm if
it tries to allocate more than `memory_limit` MB.
If None is provided, no memory limit is set.
In case of multi-processing, `memory_limit` will be per job.
This memory limit also applies to the ensemble creation process.
it tries to allocate more than ``memory_limit`` MB.

**Important notes:**

* If ``None`` is provided, no memory limit is set.
* In case of multi-processing, ``memory_limit`` will be *per job*, so the total usage is
``n_jobs x memory_limit``.
* The memory limit also applies to the ensemble creation process.

include : dict, optional (None)
If None, all possible algorithms are used. Otherwise specifies
Expand Down Expand Up @@ -145,10 +149,10 @@ def __init__(
* 'cv-iterative-fit': {'folds': int}
* 'partial-cv': {'folds': int, 'shuffle': bool}
* BaseCrossValidator or _RepeatedSplits or BaseShuffleSplit object: all arguments
required by chosen class as specified in scikit-learn documentation.
If arguments are not provided, scikit-learn defaults are used.
If no defaults are available, an exception is raised.
Refer to the 'n_splits' argument as 'folds'.
required by chosen class as specified in scikit-learn documentation.
If arguments are not provided, scikit-learn defaults are used.
If no defaults are available, an exception is raised.
Refer to the 'n_splits' argument as 'folds'.

tmp_folder : string, optional (None)
folder to store configuration output and log files, if ``None``
Expand All @@ -160,13 +164,15 @@ def __init__(

n_jobs : int, optional, experimental
The number of jobs to run in parallel for ``fit()``. ``-1`` means
using all processors. By default, Auto-sklearn uses a single core
for fitting the machine learning model and a single core for fitting
an ensemble. Ensemble building is not affected by ``n_jobs`` but
can be controlled by the number of models in the ensemble. In
contrast to most scikit-learn models, ``n_jobs`` given in the
constructor is not applied to the ``predict()`` method. If
``dask_client`` is None, a new dask client is created.
using all processors.

**Important notes**:

* By default, Auto-sklearn uses one core.
* Ensemble building is not affected by ``n_jobs`` but can be controlled by the number
of models in the ensemble.
* ``predict()`` is not affected by ``n_jobs`` (in contrast to most scikit-learn models)
* If ``dask_client`` is ``None``, a new dask client is created.

dask_client : dask.distributed.Client, optional
User-created dask client, can be used to start a dask cluster and then
Expand All @@ -179,10 +185,10 @@ def __init__(
fine-grained information on what to save. Allowed elements in the
list are:

* ``'y_optimization'`` : do not save the predictions for the
* ``y_optimization`` : do not save the predictions for the
optimization/validation set, which would later on be used to build
an ensemble.
* ``'model'`` : do not save any model files
* ``model`` : do not save any model files

smac_scenario_args : dict, optional (None)
Additional arguments inserted into the scenario of SMAC. See the
Expand Down
34 changes: 20 additions & 14 deletions autosklearn/experimental/askl2.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def __init__(
ensemble_size : int, optional (default=50)
Number of models added to the ensemble built by *Ensemble
selection from libraries of models*. Models are drawn with
replacement.
replacement. If set to ``0`` no ensemble is fit.

ensemble_nbest : int, optional (default=50)
Only consider the ``ensemble_nbest`` models when building an
Expand All @@ -238,10 +238,14 @@ def __init__(
memory_limit : int, optional (3072)
Memory limit in MB for the machine learning algorithm.
`auto-sklearn` will stop fitting the machine learning algorithm if
it tries to allocate more than `memory_limit` MB.
If None is provided, no memory limit is set.
In case of multi-processing, `memory_limit` will be per job.
This memory limit also applies to the ensemble creation process.
it tries to allocate more than ``memory_limit`` MB.

**Important notes:**

* If ``None`` is provided, no memory limit is set.
* In case of multi-processing, ``memory_limit`` will be *per job*, so the total usage is
``n_jobs x memory_limit``.
* The memory limit also applies to the ensemble creation process.

tmp_folder : string, optional (None)
folder to store configuration output and log files, if ``None``
Expand All @@ -253,13 +257,15 @@ def __init__(

n_jobs : int, optional, experimental
The number of jobs to run in parallel for ``fit()``. ``-1`` means
using all processors. By default, Auto-sklearn uses a single core
for fitting the machine learning model and a single core for fitting
an ensemble. Ensemble building is not affected by ``n_jobs`` but
can be controlled by the number of models in the ensemble. In
contrast to most scikit-learn models, ``n_jobs`` given in the
constructor is not applied to the ``predict()`` method. If
``dask_client`` is None, a new dask client is created.
using all processors.

**Important notes**:

* By default, Auto-sklearn uses one core.
* Ensemble building is not affected by ``n_jobs`` but can be controlled by the number
of models in the ensemble.
* ``predict()`` is not affected by ``n_jobs`` (in contrast to most scikit-learn models)
* If ``dask_client`` is ``None``, a new dask client is created.

dask_client : dask.distributed.Client, optional
User-created dask client, can be used to start a dask cluster and then
Expand All @@ -272,10 +278,10 @@ def __init__(
fine-grained information on what to save. Allowed elements in the
list are:

* ``'y_optimization'`` : do not save the predictions for the
* ``y_optimization`` : do not save the predictions for the
optimization/validation set, which would later on be used to build
an ensemble.
* ``'model'`` : do not save any model files
* ``model`` : do not save any model files

smac_scenario_args : dict, optional (None)
Additional arguments inserted into the scenario of SMAC. See the
Expand Down
1 change: 1 addition & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
'sphinx.ext.doctest', 'sphinx.ext.coverage',
'sphinx.ext.mathjax', 'sphinx.ext.viewcode',
'sphinx_gallery.gen_gallery', 'sphinx.ext.autosectionlabel',
'sphinx_toolbox.collapse',
# sphinx.ext.autosexctionlabel raises duplicate label warnings
# because same section headers are used multiple times throughout
# the documentation.
Expand Down
4 changes: 2 additions & 2 deletions doc/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Can the preprocessing be disabled
---------------------------------

Feature preprocessing can be disabled as discussed in the example
:ref:`restricting_the_searchspace`. Other preprocessing steps such as one hot encoding, missing
:ref:`space`. Other preprocessing steps such as one hot encoding, missing
feature imputation and normalization cannot yet be disabled, but we're working on that.

Usage
Expand All @@ -176,7 +176,7 @@ Only use interpretable models
-----------------------------

Auto-sklearn can be restricted to only use interpretable models and preprocessing algorithms.
Please see the Section :ref:`restricting_the_searchspace` to learn how to restrict the models
Please see the Section :ref:`space` to learn how to restrict the models
which are searched over or see the Example
:ref:`sphx_glr_examples_40_advanced_example_interpretable_models.py`.

Expand Down
7 changes: 6 additions & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ replacement for a scikit-learn estimator:
hyperparameter tuning. It leverages recent advantages in *Bayesian
optimization*, *meta-learning* and *ensemble construction*. Learn more about
the technology behind *auto-sklearn* by reading our paper published at
`NIPS 2015 <https://papers.neurips.cc/paper/5872-efficient-and-robust-automated-machine-learning.pdf>`_
`NeurIPS 2015 <https://papers.neurips.cc/paper/5872-efficient-and-robust-automated-machine-learning.pdf>`_
.

.. topic:: NEW: Auto-sklearn 2.0
Expand All @@ -38,6 +38,11 @@ the technology behind *auto-sklearn* by reading our paper published at

A paper describing our advances is available on `arXiv <https://arxiv.org/abs/2007.04074>`_.

.. topic:: NEW: Material from tutorials and presentations

We provide slides and notebooks from talks and tutorials here: `auto-sklearn-talks <https://github.com/automl/auto-sklearn-talks>`_


Example
*******

Expand Down
Loading