Sarah Segel: Bugfix/replace deprecated configpsace methods (#1141)

automl · Sep 25, 2024 · c13316c · c13316c
1 parent 4f07ec6
commit c13316c
Show file tree

Hide file tree

Showing 176 changed files with 358 additions and 346 deletions.
diff --git a/development/.doctrees/environment.pickle b/development/.doctrees/environment.pickle
diff --git a/development/.doctrees/examples/1_basics/1_quadratic_function.doctree b/development/.doctrees/examples/1_basics/1_quadratic_function.doctree
diff --git a/development/.doctrees/examples/1_basics/2_svm_cv.doctree b/development/.doctrees/examples/1_basics/2_svm_cv.doctree
diff --git a/development/.doctrees/examples/1_basics/3_ask_and_tell.doctree b/development/.doctrees/examples/1_basics/3_ask_and_tell.doctree
diff --git a/development/.doctrees/examples/1_basics/4_callback.doctree b/development/.doctrees/examples/1_basics/4_callback.doctree
diff --git a/development/.doctrees/examples/1_basics/5_continue.doctree b/development/.doctrees/examples/1_basics/5_continue.doctree
diff --git a/development/.doctrees/examples/1_basics/6_priors.doctree b/development/.doctrees/examples/1_basics/6_priors.doctree
diff --git a/development/.doctrees/examples/1_basics/sg_execution_times.doctree b/development/.doctrees/examples/1_basics/sg_execution_times.doctree
diff --git a/development/.doctrees/examples/2_multi_fidelity/1_mlp_epochs.doctree b/development/.doctrees/examples/2_multi_fidelity/1_mlp_epochs.doctree
diff --git a/development/.doctrees/examples/2_multi_fidelity/2_sgd_datasets.doctree b/development/.doctrees/examples/2_multi_fidelity/2_sgd_datasets.doctree
diff --git a/development/.doctrees/examples/2_multi_fidelity/3_specify_HB_via_total_budget.doctree b/development/.doctrees/examples/2_multi_fidelity/3_specify_HB_via_total_budget.doctree
diff --git a/development/.doctrees/examples/2_multi_fidelity/sg_execution_times.doctree b/development/.doctrees/examples/2_multi_fidelity/sg_execution_times.doctree
diff --git a/development/.doctrees/examples/3_multi_objective/1_schaffer.doctree b/development/.doctrees/examples/3_multi_objective/1_schaffer.doctree
diff --git a/development/.doctrees/examples/3_multi_objective/2_parego.doctree b/development/.doctrees/examples/3_multi_objective/2_parego.doctree
diff --git a/development/.doctrees/examples/3_multi_objective/sg_execution_times.doctree b/development/.doctrees/examples/3_multi_objective/sg_execution_times.doctree
diff --git a/development/.doctrees/examples/5_commandline/1_call_target_function_script.doctree b/development/.doctrees/examples/5_commandline/1_call_target_function_script.doctree
diff --git a/development/.doctrees/examples/5_commandline/sg_execution_times.doctree b/development/.doctrees/examples/5_commandline/sg_execution_times.doctree
diff --git a/development/.doctrees/sg_execution_times.doctree b/development/.doctrees/sg_execution_times.doctree
diff --git a/development/_downloads/063faf88baea73dba8e7341bd337a200/1_quadratic_function.zip b/development/_downloads/063faf88baea73dba8e7341bd337a200/1_quadratic_function.zip
diff --git a/development/_downloads/1e0c944ace9c062b0d0e5384a117c0a9/2_sgd_datasets.zip b/development/_downloads/1e0c944ace9c062b0d0e5384a117c0a9/2_sgd_datasets.zip
diff --git a/development/_downloads/27a00d8d416eb0656332c9b4aa2106f2/1_schaffer.zip b/development/_downloads/27a00d8d416eb0656332c9b4aa2106f2/1_schaffer.zip
diff --git a/development/_downloads/3e10c4404a224fa5a1f640ee1420cee0/2_svm_cv.zip b/development/_downloads/3e10c4404a224fa5a1f640ee1420cee0/2_svm_cv.zip
diff --git a/development/_downloads/49ed3f530b360a5f903030f84d3fbc00/1_call_target_function_script.zip b/development/_downloads/49ed3f530b360a5f903030f84d3fbc00/1_call_target_function_script.zip
diff --git a/development/_downloads/5f7af4d241173fd9f4d4445891bb8995/1_mlp_epochs.zip b/development/_downloads/5f7af4d241173fd9f4d4445891bb8995/1_mlp_epochs.zip
diff --git a/development/_downloads/6d5784621a777b1b2116cd9e73c2fbb3/3_ask_and_tell.zip b/development/_downloads/6d5784621a777b1b2116cd9e73c2fbb3/3_ask_and_tell.zip
diff --git a/development/_downloads/8e591d0775f87f99196616171f815f56/4_callback.zip b/development/_downloads/8e591d0775f87f99196616171f815f56/4_callback.zip
diff --git a/development/_downloads/bc82bea3a5dd7bdba60b65220891d9e5/examples_python.zip b/development/_downloads/bc82bea3a5dd7bdba60b65220891d9e5/examples_python.zip
diff --git a/development/_downloads/c3274eae6f91897cdd95549b09a79a4e/3_specify_HB_via_total_budget.zip b/development/_downloads/c3274eae6f91897cdd95549b09a79a4e/3_specify_HB_via_total_budget.zip
diff --git a/development/_downloads/d198a13b3da9ac20be16998a6bf61983/6_priors.zip b/development/_downloads/d198a13b3da9ac20be16998a6bf61983/6_priors.zip
diff --git a/development/_downloads/d7d5ff2dd061059c0d350ef36825b902/5_continue.zip b/development/_downloads/d7d5ff2dd061059c0d350ef36825b902/5_continue.zip
diff --git a/development/_downloads/ed1a42934b5fbe7816cabd752552cf37/2_parego.zip b/development/_downloads/ed1a42934b5fbe7816cabd752552cf37/2_parego.zip
diff --git a/development/_downloads/fb625db3c50d423b1b7881136ffdeec8/examples_jupyter.zip b/development/_downloads/fb625db3c50d423b1b7881136ffdeec8/examples_jupyter.zip
diff --git a/development/_images/sphx_glr_1_mlp_epochs_001.png b/development/_images/sphx_glr_1_mlp_epochs_001.png
diff --git a/development/_images/sphx_glr_1_mlp_epochs_thumb.png b/development/_images/sphx_glr_1_mlp_epochs_thumb.png
diff --git a/development/_images/sphx_glr_2_parego_001.png b/development/_images/sphx_glr_2_parego_001.png
diff --git a/development/_images/sphx_glr_2_parego_thumb.png b/development/_images/sphx_glr_2_parego_thumb.png
diff --git a/development/_modules/smac/acquisition/maximizer/local_search.html b/development/_modules/smac/acquisition/maximizer/local_search.html
@@ -1176,7 +1176,10 @@ <h1>Source code for smac.acquisition.maximizer.local_search</h1><div class="high
         <span class="n">init_points</span> <span class="o">=</span> <span class="p">[]</span>
         <span class="n">n_init_points</span> <span class="o">=</span> <span class="n">n_points</span>
         <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">previous_configs</span><span class="p">)</span> <span class="o">&lt;</span> <span class="n">n_points</span><span class="p">:</span>
-            <span class="n">sampled_points</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">sample_configuration</span><span class="p">(</span><span class="n">size</span><span class="o">=</span><span class="n">n_points</span> <span class="o">-</span> <span class="nb">len</span><span class="p">(</span><span class="n">previous_configs</span><span class="p">))</span>
+            <span class="k">if</span> <span class="n">n_points</span> <span class="o">-</span> <span class="nb">len</span><span class="p">(</span><span class="n">previous_configs</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
+                <span class="n">sampled_points</span> <span class="o">=</span> <span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">sample_configuration</span><span class="p">()]</span>
+            <span class="k">else</span><span class="p">:</span>
+                <span class="n">sampled_points</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">sample_configuration</span><span class="p">(</span><span class="n">size</span><span class="o">=</span><span class="n">n_points</span> <span class="o">-</span> <span class="nb">len</span><span class="p">(</span><span class="n">previous_configs</span><span class="p">))</span>
             <span class="n">n_init_points</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="n">previous_configs</span><span class="p">)</span>
             <span class="k">if</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">sampled_points</span><span class="p">,</span> <span class="nb">list</span><span class="p">):</span>
                 <span class="n">sampled_points</span> <span class="o">=</span> <span class="p">[</span><span class="n">sampled_points</span><span class="p">]</span>

diff --git a/development/_modules/smac/acquisition/maximizer/random_search.html b/development/_modules/smac/acquisition/maximizer/random_search.html
@@ -1064,7 +1064,7 @@ <h1>Source code for smac.acquisition.maximizer.random_search</h1><div class="hig
         <span class="k">if</span> <span class="n">n_points</span> <span class="o">&gt;</span> <span class="mi">1</span><span class="p">:</span>
             <span class="n">rand_configs</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">sample_configuration</span><span class="p">(</span><span class="n">size</span><span class="o">=</span><span class="n">n_points</span><span class="p">)</span>
         <span class="k">else</span><span class="p">:</span>
-            <span class="n">rand_configs</span> <span class="o">=</span> <span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">sample_configuration</span><span class="p">(</span><span class="n">size</span><span class="o">=</span><span class="mi">1</span><span class="p">)]</span>
+            <span class="n">rand_configs</span> <span class="o">=</span> <span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">sample_configuration</span><span class="p">()]</span>
 
         <span class="k">if</span> <span class="n">_sorted</span><span class="p">:</span>
             <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">rand_configs</span><span class="p">)):</span>

diff --git a/development/_modules/smac/facade/blackbox_facade.html b/development/_modules/smac/facade/blackbox_facade.html
@@ -1140,11 +1140,11 @@ <h1>Source code for smac.facade.blackbox_facade</h1><div class="highlight"><pre>
         <span class="n">cont_dims</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">where</span><span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">types</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span>
         <span class="n">cat_dims</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">where</span><span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">types</span><span class="p">)</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span>
 
-        <span class="k">if</span> <span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">cont_dims</span><span class="p">)</span> <span class="o">+</span> <span class="nb">len</span><span class="p">(</span><span class="n">cat_dims</span><span class="p">))</span> <span class="o">!=</span> <span class="nb">len</span><span class="p">(</span><span class="n">scenario</span><span class="o">.</span><span class="n">configspace</span><span class="o">.</span><span class="n">get_hyperparameters</span><span class="p">()):</span>
+        <span class="k">if</span> <span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">cont_dims</span><span class="p">)</span> <span class="o">+</span> <span class="nb">len</span><span class="p">(</span><span class="n">cat_dims</span><span class="p">))</span> <span class="o">!=</span> <span class="nb">len</span><span class="p">(</span><span class="nb">list</span><span class="p">(</span><span class="n">scenario</span><span class="o">.</span><span class="n">configspace</span><span class="o">.</span><span class="n">values</span><span class="p">())):</span>
             <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span>
                 <span class="s2">&quot;The inferred number of continuous and categorical hyperparameters &quot;</span>
                 <span class="s2">&quot;must equal the total number of hyperparameters. Got &quot;</span>
-                <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">cont_dims</span><span class="p">)</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="nb">len</span><span class="p">(</span><span class="n">cat_dims</span><span class="p">))</span><span class="si">}</span><span class="s2"> != </span><span class="si">{</span><span class="nb">len</span><span class="p">(</span><span class="n">scenario</span><span class="o">.</span><span class="n">configspace</span><span class="o">.</span><span class="n">get_hyperparameters</span><span class="p">())</span><span class="si">}</span><span class="s2">.&quot;</span>
+                <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">cont_dims</span><span class="p">)</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="nb">len</span><span class="p">(</span><span class="n">cat_dims</span><span class="p">))</span><span class="si">}</span><span class="s2"> != </span><span class="si">{</span><span class="nb">len</span><span class="p">(</span><span class="nb">list</span><span class="p">(</span><span class="n">scenario</span><span class="o">.</span><span class="n">configspace</span><span class="o">.</span><span class="n">values</span><span class="p">()))</span><span class="si">}</span><span class="s2">.&quot;</span>
             <span class="p">)</span>
 
         <span class="c1"># Constant Kernel</span>

diff --git a/development/_modules/smac/initial_design/abstract_initial_design.html b/development/_modules/smac/initial_design/abstract_initial_design.html
@@ -1100,7 +1100,7 @@ <h1>Source code for smac.initial_design.abstract_initial_design</h1><div class="
 
         <span class="bp">self</span><span class="o">.</span><span class="n">_additional_configs</span> <span class="o">=</span> <span class="n">additional_configs</span>
 
-        <span class="n">n_params</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">get_hyperparameters</span><span class="p">())</span>
+        <span class="n">n_params</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="nb">list</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">values</span><span class="p">()))</span>
         <span class="k">if</span> <span class="n">n_configs</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
             <span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot;Using `n_configs` and ignoring `n_configs_per_hyperparameter`.&quot;</span><span class="p">)</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">_n_configs</span> <span class="o">=</span> <span class="n">n_configs</span>
@@ -1200,10 +1200,10 @@ <h1>Source code for smac.initial_design.abstract_initial_design</h1><div class="
 <span class="sd">        configs : list[Configuration]</span>
 <span class="sd">            Continuous transformed configs.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="n">params</span> <span class="o">=</span> <span class="n">configspace</span><span class="o">.</span><span class="n">get_hyperparameters</span><span class="p">()</span>
+        <span class="n">params</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="n">configspace</span><span class="o">.</span><span class="n">values</span><span class="p">())</span>
         <span class="k">for</span> <span class="n">idx</span><span class="p">,</span> <span class="n">param</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">params</span><span class="p">):</span>
             <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">param</span><span class="p">,</span> <span class="n">IntegerHyperparameter</span><span class="p">):</span>
-                <span class="n">design</span><span class="p">[:,</span> <span class="n">idx</span><span class="p">]</span> <span class="o">=</span> <span class="n">param</span><span class="o">.</span><span class="n">_inverse_transform</span><span class="p">(</span><span class="n">param</span><span class="o">.</span><span class="n">_transform</span><span class="p">(</span><span class="n">design</span><span class="p">[:,</span> <span class="n">idx</span><span class="p">]))</span>
+                <span class="n">design</span><span class="p">[:,</span> <span class="n">idx</span><span class="p">]</span> <span class="o">=</span> <span class="n">param</span><span class="o">.</span><span class="n">to_vector</span><span class="p">(</span><span class="n">param</span><span class="o">.</span><span class="n">to_value</span><span class="p">(</span><span class="n">design</span><span class="p">[:,</span> <span class="n">idx</span><span class="p">]))</span>
             <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">param</span><span class="p">,</span> <span class="n">NumericalHyperparameter</span><span class="p">):</span>
                 <span class="k">continue</span>
             <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">param</span><span class="p">,</span> <span class="n">Constant</span><span class="p">):</span>

diff --git a/development/_modules/smac/initial_design/factorial_design.html b/development/_modules/smac/initial_design/factorial_design.html
@@ -1045,7 +1045,7 @@ <h1>Source code for smac.initial_design.factorial_design</h1><div class="highlig
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;Factorial initial design to select corner and middle configurations.&quot;&quot;&quot;</span>
 
     <span class="k">def</span> <span class="nf">_select_configurations</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">list</span><span class="p">[</span><span class="n">Configuration</span><span class="p">]:</span>
-        <span class="n">params</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">get_hyperparameters</span><span class="p">()</span>
+        <span class="n">params</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">values</span><span class="p">())</span>
 
         <span class="n">values</span> <span class="o">=</span> <span class="p">[]</span>
         <span class="n">mid</span> <span class="o">=</span> <span class="p">[]</span>

diff --git a/development/_modules/smac/initial_design/latin_hypercube_design.html b/development/_modules/smac/initial_design/latin_hypercube_design.html
@@ -1039,7 +1039,7 @@ <h1>Source code for smac.initial_design.latin_hypercube_design</h1><div class="h
 <span class="sd">    &quot;&quot;&quot;</span>
 
     <span class="k">def</span> <span class="nf">_select_configurations</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">list</span><span class="p">[</span><span class="n">Configuration</span><span class="p">]:</span>
-        <span class="n">params</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">get_hyperparameters</span><span class="p">()</span>
+        <span class="n">params</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">values</span><span class="p">())</span>
 
         <span class="n">constants</span> <span class="o">=</span> <span class="mi">0</span>
         <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="n">params</span><span class="p">:</span>

diff --git a/development/_modules/smac/initial_design/random_design.html b/development/_modules/smac/initial_design/random_design.html
@@ -1035,9 +1035,10 @@ <h1>Source code for smac.initial_design.random_design</h1><div class="highlight"
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;Initial design that evaluates random configurations.&quot;&quot;&quot;</span>
 
     <span class="k">def</span> <span class="nf">_select_configurations</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">list</span><span class="p">[</span><span class="n">Configuration</span><span class="p">]:</span>
-        <span class="n">configs</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">sample_configuration</span><span class="p">(</span><span class="n">size</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_n_configs</span><span class="p">)</span>
         <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_n_configs</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
-            <span class="n">configs</span> <span class="o">=</span> <span class="p">[</span><span class="n">configs</span><span class="p">]</span>
+            <span class="n">configs</span> <span class="o">=</span> <span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">sample_configuration</span><span class="p">()]</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="n">configs</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_configspace</span><span class="o">.</span><span class="n">sample_configuration</span><span class="p">(</span><span class="n">size</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_n_configs</span><span class="p">)</span>
         <span class="k">for</span> <span class="n">config</span> <span class="ow">in</span> <span class="n">configs</span><span class="p">:</span>
             <span class="n">config</span><span class="o">.</span><span class="n">origin</span> <span class="o">=</span> <span class="s2">&quot;Initial Design: Random&quot;</span>
         <span class="k">return</span> <span class="n">configs</span></div>