Skip to content

Commit c73f398

Browse files
author
Github Actions
committed
Ravin Kohli: Merge pull request automl#84 from franchuterivera/refactor_development_loggermsg
1 parent ea6d567 commit c73f398

File tree

11 files changed

+73
-63
lines changed

11 files changed

+73
-63
lines changed
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

refactor_development/_sources/examples/example_image_classification.rst.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,23 @@ Image Classification
7777
Pipeline Random Config:
7878
________________________________________
7979
Configuration:
80-
image_augmenter:GaussianBlur:sigma_min, Value: 0.8480354370981031
81-
image_augmenter:GaussianBlur:sigma_offset, Value: 1.8662941407999276
80+
image_augmenter:GaussianBlur:sigma_min, Value: 1.7036821970866085
81+
image_augmenter:GaussianBlur:sigma_offset, Value: 0.5101116362011204
8282
image_augmenter:GaussianBlur:use_augmenter, Value: True
8383
image_augmenter:GaussianNoise:use_augmenter, Value: False
8484
image_augmenter:RandomAffine:use_augmenter, Value: False
85-
image_augmenter:RandomCutout:p, Value: 0.3656551312711466
85+
image_augmenter:RandomCutout:p, Value: 0.20861972651678756
8686
image_augmenter:RandomCutout:use_augmenter, Value: True
8787
image_augmenter:Resize:use_augmenter, Value: False
88-
image_augmenter:ZeroPadAndCrop:percent, Value: 0.4929042351991033
89-
normalizer:__choice__, Value: 'NoNormalizer'
88+
image_augmenter:ZeroPadAndCrop:percent, Value: 0.30771906150929457
89+
normalizer:__choice__, Value: 'ImageNormalizer'
9090

9191
Fitting the pipeline...
9292
________________________________________
9393
ImageClassificationPipeline
9494
________________________________________
9595
0-) normalizer:
96-
NoNormalizer
96+
ImageNormalizer
9797

9898
1-) preprocessing:
9999
EarlyPreprocessing
@@ -165,7 +165,7 @@ Image Classification
165165
166166
.. rst-class:: sphx-glr-timing
167167

168-
**Total running time of the script:** ( 0 minutes 8.334 seconds)
168+
**Total running time of the script:** ( 0 minutes 6.450 seconds)
169169

170170

171171
.. _sphx_glr_download_examples_example_image_classification.py:

refactor_development/_sources/examples/example_tabular_classification.rst.txt

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ with AutoPyTorch
3636

3737
.. code-block:: none
3838
39-
<smac.runhistory.runhistory.RunHistory object at 0x7f66907c4640> [TrajEntry(train_perf=2147483648, incumbent_id=1, incumbent=Configuration:
39+
<smac.runhistory.runhistory.RunHistory object at 0x7f54f00ebdf0> [TrajEntry(train_perf=2147483648, incumbent_id=1, incumbent=Configuration:
4040
data_loader:batch_size, Value: 32
4141
encoder:__choice__, Value: 'OneHotEncoder'
4242
feature_preprocessor:__choice__, Value: 'NoFeaturePreprocessor'
@@ -67,7 +67,7 @@ with AutoPyTorch
6767
scaler:__choice__, Value: 'StandardScaler'
6868
trainer:StandardTrainer:weighted_loss, Value: True
6969
trainer:__choice__, Value: 'StandardTrainer'
70-
, ta_runs=0, ta_time_used=0.0, wallclock_time=0.002040863037109375, budget=0), TrajEntry(train_perf=0.14619883040935677, incumbent_id=1, incumbent=Configuration:
70+
, ta_runs=0, ta_time_used=0.0, wallclock_time=0.0013642311096191406, budget=0), TrajEntry(train_perf=0.14035087719298245, incumbent_id=1, incumbent=Configuration:
7171
data_loader:batch_size, Value: 32
7272
encoder:__choice__, Value: 'OneHotEncoder'
7373
feature_preprocessor:__choice__, Value: 'NoFeaturePreprocessor'
@@ -98,21 +98,26 @@ with AutoPyTorch
9898
scaler:__choice__, Value: 'StandardScaler'
9999
trainer:StandardTrainer:weighted_loss, Value: True
100100
trainer:__choice__, Value: 'StandardTrainer'
101-
, ta_runs=1, ta_time_used=4.407814264297485, wallclock_time=5.844383239746094, budget=5.555555555555555)]
101+
, ta_runs=1, ta_time_used=3.364515781402588, wallclock_time=4.680835247039795, budget=5.555555555555555)]
102102
{'accuracy': 0.861271676300578}
103103
| | Preprocessing | Estimator | Weight |
104104
|---:|:------------------------------------------------------------------|:------------------------------------------------------|---------:|
105-
| 0 | None | RFClassifier | 0.26 |
106-
| 1 | None | ExtraTreesClassifier | 0.22 |
107-
| 2 | SimpleImputer,OrdinalEncoder,NoScaler,Nystroem | ShapedMLPBackbone,FullyConnectedHead,nn.Sequential | 0.14 |
108-
| 3 | SimpleImputer,OneHotEncoder,StandardScaler,NoFeaturePreprocessing | ShapedMLPBackbone,FullyConnectedHead,nn.Sequential | 0.14 |
109-
| 4 | SimpleImputer,OrdinalEncoder,Normalizer,PowerTransformer | MLPBackbone,FullyConnectedHead,nn.Sequential | 0.06 |
110-
| 5 | None | SVC | 0.06 |
111-
| 6 | None | KNNClassifier | 0.04 |
112-
| 7 | SimpleImputer,OrdinalEncoder,Normalizer,PowerTransformer | MLPBackbone,FullyConnectedHead,nn.Sequential | 0.02 |
113-
| 8 | SimpleImputer,OrdinalEncoder,MinMaxScaler,KitchenSink | ShapedResNetBackbone,FullyConnectedHead,nn.Sequential | 0.02 |
114-
| 9 | SimpleImputer,OrdinalEncoder,MinMaxScaler,KitchenSink | ShapedResNetBackbone,FullyConnectedHead,nn.Sequential | 0.02 |
115-
| 10 | SimpleImputer,OneHotEncoder,StandardScaler,NoFeaturePreprocessing | ShapedMLPBackbone,FullyConnectedHead,nn.Sequential | 0.02 |
105+
| 0 | None | RFClassifier | 0.16 |
106+
| 1 | None | ExtraTreesClassifier | 0.14 |
107+
| 2 | SimpleImputer,OrdinalEncoder,Normalizer,PowerTransformer | MLPBackbone,FullyConnectedHead,nn.Sequential | 0.1 |
108+
| 3 | SimpleImputer,OrdinalEncoder,NoScaler,Nystroem | ShapedMLPBackbone,FullyConnectedHead,nn.Sequential | 0.1 |
109+
| 4 | SimpleImputer,OneHotEncoder,MinMaxScaler,PowerTransformer | ShapedResNetBackbone,FullyConnectedHead,nn.Sequential | 0.08 |
110+
| 5 | None | KNNClassifier | 0.08 |
111+
| 6 | SimpleImputer,OrdinalEncoder,Normalizer,PowerTransformer | MLPBackbone,FullyConnectedHead,nn.Sequential | 0.04 |
112+
| 7 | SimpleImputer,OrdinalEncoder,NoScaler,Nystroem | ShapedMLPBackbone,FullyConnectedHead,nn.Sequential | 0.04 |
113+
| 8 | SimpleImputer,OrdinalEncoder,MinMaxScaler,KitchenSink | ShapedResNetBackbone,FullyConnectedHead,nn.Sequential | 0.04 |
114+
| 9 | SimpleImputer,OrdinalEncoder,StandardScaler,Nystroem | ShapedResNetBackbone,FullyConnectedHead,nn.Sequential | 0.04 |
115+
| 10 | None | SVC | 0.04 |
116+
| 11 | SimpleImputer,OneHotEncoder,StandardScaler,NoFeaturePreprocessing | ShapedMLPBackbone,FullyConnectedHead,nn.Sequential | 0.04 |
117+
| 12 | SimpleImputer,OneHotEncoder,StandardScaler,NoFeaturePreprocessing | ShapedMLPBackbone,FullyConnectedHead,nn.Sequential | 0.04 |
118+
| 13 | SimpleImputer,OneHotEncoder,StandardScaler,NoFeaturePreprocessing | ShapedMLPBackbone,FullyConnectedHead,nn.Sequential | 0.02 |
119+
| 14 | SimpleImputer,OrdinalEncoder,MinMaxScaler,KitchenSink | ShapedResNetBackbone,FullyConnectedHead,nn.Sequential | 0.02 |
120+
| 15 | None | LGBMClassifier | 0.02 |
116121
117122
118123
@@ -204,7 +209,7 @@ with AutoPyTorch
204209
205210
.. rst-class:: sphx-glr-timing
206211

207-
**Total running time of the script:** ( 9 minutes 9.069 seconds)
212+
**Total running time of the script:** ( 9 minutes 14.253 seconds)
208213

209214

210215
.. _sphx_glr_download_examples_example_tabular_classification.py:

refactor_development/_sources/examples/example_tabular_regression.rst.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ with AutoPyTorch
3636

3737
.. code-block:: none
3838
39-
<smac.runhistory.runhistory.RunHistory object at 0x7f66821e6b50> [TrajEntry(train_perf=2147483648, incumbent_id=1, incumbent=Configuration:
39+
<smac.runhistory.runhistory.RunHistory object at 0x7f54d3b68e80> [TrajEntry(train_perf=2147483648, incumbent_id=1, incumbent=Configuration:
4040
data_loader:batch_size, Value: 32
4141
encoder:__choice__, Value: 'NoEncoder'
4242
imputer:numerical_strategy, Value: 'mean'
@@ -64,7 +64,7 @@ with AutoPyTorch
6464
optimizer:__choice__, Value: 'AdamOptimizer'
6565
scaler:__choice__, Value: 'StandardScaler'
6666
trainer:__choice__, Value: 'StandardTrainer'
67-
, ta_runs=0, ta_time_used=0.0, wallclock_time=0.0017652511596679688, budget=0), TrajEntry(train_perf=0.005070456150329972, incumbent_id=1, incumbent=Configuration:
67+
, ta_runs=0, ta_time_used=0.0, wallclock_time=0.001291036605834961, budget=0), TrajEntry(train_perf=0.10009877564640612, incumbent_id=1, incumbent=Configuration:
6868
data_loader:batch_size, Value: 32
6969
encoder:__choice__, Value: 'NoEncoder'
7070
imputer:numerical_strategy, Value: 'mean'
@@ -92,8 +92,8 @@ with AutoPyTorch
9292
optimizer:__choice__, Value: 'AdamOptimizer'
9393
scaler:__choice__, Value: 'StandardScaler'
9494
trainer:__choice__, Value: 'StandardTrainer'
95-
, ta_runs=1, ta_time_used=7.408640384674072, wallclock_time=10.797286748886108, budget=5.555555555555555)]
96-
{'r2': 0.9996077661516851}
95+
, ta_runs=1, ta_time_used=5.635250568389893, wallclock_time=8.393784761428833, budget=5.555555555555555)]
96+
{'r2': 0.99947544408583}
9797
9898
9999
@@ -216,7 +216,7 @@ with AutoPyTorch
216216
217217
.. rst-class:: sphx-glr-timing
218218

219-
**Total running time of the script:** ( 8 minutes 28.738 seconds)
219+
**Total running time of the script:** ( 8 minutes 25.576 seconds)
220220

221221

222222
.. _sphx_glr_download_examples_example_tabular_regression.py:

refactor_development/_sources/examples/sg_execution_times.rst.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
Computation times
77
=================
8-
**17:46.141** total execution time for **examples** files:
8+
**17:46.278** total execution time for **examples** files:
99

1010
+----------------------------------------------------------------------------------------------------+-----------+--------+
11-
| :ref:`sphx_glr_examples_example_tabular_classification.py` (``example_tabular_classification.py``) | 09:09.069 | 0.0 MB |
11+
| :ref:`sphx_glr_examples_example_tabular_classification.py` (``example_tabular_classification.py``) | 09:14.253 | 0.0 MB |
1212
+----------------------------------------------------------------------------------------------------+-----------+--------+
13-
| :ref:`sphx_glr_examples_example_tabular_regression.py` (``example_tabular_regression.py``) | 08:28.738 | 0.0 MB |
13+
| :ref:`sphx_glr_examples_example_tabular_regression.py` (``example_tabular_regression.py``) | 08:25.576 | 0.0 MB |
1414
+----------------------------------------------------------------------------------------------------+-----------+--------+
15-
| :ref:`sphx_glr_examples_example_image_classification.py` (``example_image_classification.py``) | 00:08.334 | 0.0 MB |
15+
| :ref:`sphx_glr_examples_example_image_classification.py` (``example_image_classification.py``) | 00:06.450 | 0.0 MB |
1616
+----------------------------------------------------------------------------------------------------+-----------+--------+

refactor_development/examples/example_image_classification.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3939,23 +3939,23 @@
39393939
Pipeline Random Config:
39403940
________________________________________
39413941
Configuration:
3942-
image_augmenter:GaussianBlur:sigma_min, Value: 0.8480354370981031
3943-
image_augmenter:GaussianBlur:sigma_offset, Value: 1.8662941407999276
3942+
image_augmenter:GaussianBlur:sigma_min, Value: 1.7036821970866085
3943+
image_augmenter:GaussianBlur:sigma_offset, Value: 0.5101116362011204
39443944
image_augmenter:GaussianBlur:use_augmenter, Value: True
39453945
image_augmenter:GaussianNoise:use_augmenter, Value: False
39463946
image_augmenter:RandomAffine:use_augmenter, Value: False
3947-
image_augmenter:RandomCutout:p, Value: 0.3656551312711466
3947+
image_augmenter:RandomCutout:p, Value: 0.20861972651678756
39483948
image_augmenter:RandomCutout:use_augmenter, Value: True
39493949
image_augmenter:Resize:use_augmenter, Value: False
3950-
image_augmenter:ZeroPadAndCrop:percent, Value: 0.4929042351991033
3951-
normalizer:__choice__, Value: &#39;NoNormalizer&#39;
3950+
image_augmenter:ZeroPadAndCrop:percent, Value: 0.30771906150929457
3951+
normalizer:__choice__, Value: &#39;ImageNormalizer&#39;
39523952

39533953
Fitting the pipeline...
39543954
________________________________________
39553955
ImageClassificationPipeline
39563956
________________________________________
39573957
0-) normalizer:
3958-
NoNormalizer
3958+
ImageNormalizer
39593959

39603960
1-) preprocessing:
39613961
EarlyPreprocessing
@@ -4020,7 +4020,7 @@
40204020
<span class="nb">print</span><span class="p">(</span><span class="n">pipeline</span><span class="p">)</span>
40214021
</pre></div>
40224022
</div>
4023-
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 8.334 seconds)</p>
4023+
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 6.450 seconds)</p>
40244024
<div class="sphx-glr-footer class sphx-glr-footer-example docutils container" id="sphx-glr-download-examples-example-image-classification-py">
40254025
<div class="binder-badge docutils container">
40264026
<a class="reference external image-reference" href="https://mybinder.org/v2/gh/automl/Auto-PyTorch/refactor_development?urlpath=lab/tree/notebooks/examples/example_image_classification.ipynb"><img alt="Launch binder" src="../_images/binder_badge_logo.svg" width="150px" /></a>

0 commit comments

Comments
 (0)