Update latest version of site

pytorch · Jan 22, 2025 · c64b2d7 · c64b2d7
1 parent 7a33c16
commit c64b2d7
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 44 deletions.
diff --git a/v/latest/api/_modules/botorch/acquisition/input_constructors.html b/v/latest/api/_modules/botorch/acquisition/input_constructors.html
@@ -1873,7 +1873,7 @@ <h1>Source code for botorch.acquisition.input_constructors</h1><div class="highl
             <span class="n">columns</span><span class="o">=</span><span class="nb">list</span><span class="p">(</span><span class="n">fixed_features</span><span class="o">.</span><span class="n">keys</span><span class="p">()),</span>
             <span class="n">values</span><span class="o">=</span><span class="nb">list</span><span class="p">(</span><span class="n">fixed_features</span><span class="o">.</span><span class="n">values</span><span class="p">()),</span>
         <span class="p">)</span>
-        <span class="n">free_feature_dims</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">range</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">bounds</span><span class="p">))</span> <span class="o">-</span> <span class="n">fixed_features</span><span class="o">.</span><span class="n">keys</span><span class="p">())</span>
+        <span class="n">free_feature_dims</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">range</span><span class="p">(</span><span class="n">bounds</span><span class="o">.</span><span class="n">shape</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span> <span class="o">-</span> <span class="n">fixed_features</span><span class="o">.</span><span class="n">keys</span><span class="p">())</span>
         <span class="n">free_feature_bounds</span> <span class="o">=</span> <span class="n">bounds</span><span class="p">[:,</span> <span class="n">free_feature_dims</span><span class="p">]</span>  <span class="c1"># (2, d' &lt;= d)</span>
     <span class="k">else</span><span class="p">:</span>
         <span class="n">free_feature_bounds</span> <span class="o">=</span> <span class="n">bounds</span>
@@ -1890,18 +1890,21 @@ <h1>Source code for botorch.acquisition.input_constructors</h1><div class="highl
             <span class="n">rhs</span> <span class="o">=</span> <span class="o">-</span><span class="n">b</span><span class="p">[</span><span class="n">i</span><span class="p">,</span> <span class="mi">0</span><span class="p">]</span>
             <span class="n">inequality_constraints</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">indices</span><span class="p">,</span> <span class="n">coefficients</span><span class="p">,</span> <span class="n">rhs</span><span class="p">))</span>
 
+    <span class="n">options</span> <span class="o">=</span> <span class="p">{</span>
+        <span class="s2">"batch_limit"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"batch_limit"</span><span class="p">,</span> <span class="mi">8</span><span class="p">),</span>
+        <span class="s2">"maxiter"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"maxiter"</span><span class="p">,</span> <span class="mi">200</span><span class="p">),</span>
+        <span class="s2">"nonnegative"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"nonnegative"</span><span class="p">,</span> <span class="kc">False</span><span class="p">),</span>
+    <span class="p">}</span>
+    <span class="k">if</span> <span class="s2">"method"</span> <span class="ow">in</span> <span class="n">optimizer_options</span><span class="p">:</span>
+        <span class="n">options</span><span class="p">[</span><span class="s2">"method"</span><span class="p">]</span> <span class="o">=</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">pop</span><span class="p">(</span><span class="s2">"method"</span><span class="p">)</span>
+
     <span class="k">return</span> <span class="n">optimize_acqf</span><span class="p">(</span>
         <span class="n">acq_function</span><span class="o">=</span><span class="n">acq_function</span><span class="p">,</span>
         <span class="n">bounds</span><span class="o">=</span><span class="n">free_feature_bounds</span><span class="p">,</span>
         <span class="n">q</span><span class="o">=</span><span class="n">q</span><span class="p">,</span>
         <span class="n">num_restarts</span><span class="o">=</span><span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"num_restarts"</span><span class="p">,</span> <span class="mi">60</span><span class="p">),</span>
         <span class="n">raw_samples</span><span class="o">=</span><span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"raw_samples"</span><span class="p">,</span> <span class="mi">1024</span><span class="p">),</span>
-        <span class="n">options</span><span class="o">=</span><span class="p">{</span>
-            <span class="s2">"batch_limit"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"batch_limit"</span><span class="p">,</span> <span class="mi">8</span><span class="p">),</span>
-            <span class="s2">"maxiter"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"maxiter"</span><span class="p">,</span> <span class="mi">200</span><span class="p">),</span>
-            <span class="s2">"nonnegative"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"nonnegative"</span><span class="p">,</span> <span class="kc">False</span><span class="p">),</span>
-            <span class="s2">"method"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"method"</span><span class="p">,</span> <span class="s2">"L-BFGS-B"</span><span class="p">),</span>
-        <span class="p">},</span>
+        <span class="n">options</span><span class="o">=</span><span class="n">options</span><span class="p">,</span>
         <span class="n">inequality_constraints</span><span class="o">=</span><span class="n">inequality_constraints</span><span class="p">,</span>
         <span class="n">fixed_features</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>  <span class="c1"># handled inside the acquisition function</span>
         <span class="n">post_processing_func</span><span class="o">=</span><span class="n">post_processing_func</span><span class="p">,</span>

diff --git a/v/latest/api/_modules/botorch/acquisition/input_constructors/index.html b/v/latest/api/_modules/botorch/acquisition/input_constructors/index.html
@@ -1873,7 +1873,7 @@ <h1>Source code for botorch.acquisition.input_constructors</h1><div class="highl
             <span class="n">columns</span><span class="o">=</span><span class="nb">list</span><span class="p">(</span><span class="n">fixed_features</span><span class="o">.</span><span class="n">keys</span><span class="p">()),</span>
             <span class="n">values</span><span class="o">=</span><span class="nb">list</span><span class="p">(</span><span class="n">fixed_features</span><span class="o">.</span><span class="n">values</span><span class="p">()),</span>
         <span class="p">)</span>
-        <span class="n">free_feature_dims</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">range</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">bounds</span><span class="p">))</span> <span class="o">-</span> <span class="n">fixed_features</span><span class="o">.</span><span class="n">keys</span><span class="p">())</span>
+        <span class="n">free_feature_dims</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">range</span><span class="p">(</span><span class="n">bounds</span><span class="o">.</span><span class="n">shape</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span> <span class="o">-</span> <span class="n">fixed_features</span><span class="o">.</span><span class="n">keys</span><span class="p">())</span>
         <span class="n">free_feature_bounds</span> <span class="o">=</span> <span class="n">bounds</span><span class="p">[:,</span> <span class="n">free_feature_dims</span><span class="p">]</span>  <span class="c1"># (2, d' &lt;= d)</span>
     <span class="k">else</span><span class="p">:</span>
         <span class="n">free_feature_bounds</span> <span class="o">=</span> <span class="n">bounds</span>
@@ -1890,18 +1890,21 @@ <h1>Source code for botorch.acquisition.input_constructors</h1><div class="highl
             <span class="n">rhs</span> <span class="o">=</span> <span class="o">-</span><span class="n">b</span><span class="p">[</span><span class="n">i</span><span class="p">,</span> <span class="mi">0</span><span class="p">]</span>
             <span class="n">inequality_constraints</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">indices</span><span class="p">,</span> <span class="n">coefficients</span><span class="p">,</span> <span class="n">rhs</span><span class="p">))</span>
 
+    <span class="n">options</span> <span class="o">=</span> <span class="p">{</span>
+        <span class="s2">"batch_limit"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"batch_limit"</span><span class="p">,</span> <span class="mi">8</span><span class="p">),</span>
+        <span class="s2">"maxiter"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"maxiter"</span><span class="p">,</span> <span class="mi">200</span><span class="p">),</span>
+        <span class="s2">"nonnegative"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"nonnegative"</span><span class="p">,</span> <span class="kc">False</span><span class="p">),</span>
+    <span class="p">}</span>
+    <span class="k">if</span> <span class="s2">"method"</span> <span class="ow">in</span> <span class="n">optimizer_options</span><span class="p">:</span>
+        <span class="n">options</span><span class="p">[</span><span class="s2">"method"</span><span class="p">]</span> <span class="o">=</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">pop</span><span class="p">(</span><span class="s2">"method"</span><span class="p">)</span>
+
     <span class="k">return</span> <span class="n">optimize_acqf</span><span class="p">(</span>
         <span class="n">acq_function</span><span class="o">=</span><span class="n">acq_function</span><span class="p">,</span>
         <span class="n">bounds</span><span class="o">=</span><span class="n">free_feature_bounds</span><span class="p">,</span>
         <span class="n">q</span><span class="o">=</span><span class="n">q</span><span class="p">,</span>
         <span class="n">num_restarts</span><span class="o">=</span><span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"num_restarts"</span><span class="p">,</span> <span class="mi">60</span><span class="p">),</span>
         <span class="n">raw_samples</span><span class="o">=</span><span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"raw_samples"</span><span class="p">,</span> <span class="mi">1024</span><span class="p">),</span>
-        <span class="n">options</span><span class="o">=</span><span class="p">{</span>
-            <span class="s2">"batch_limit"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"batch_limit"</span><span class="p">,</span> <span class="mi">8</span><span class="p">),</span>
-            <span class="s2">"maxiter"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"maxiter"</span><span class="p">,</span> <span class="mi">200</span><span class="p">),</span>
-            <span class="s2">"nonnegative"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"nonnegative"</span><span class="p">,</span> <span class="kc">False</span><span class="p">),</span>
-            <span class="s2">"method"</span><span class="p">:</span> <span class="n">optimizer_options</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">"method"</span><span class="p">,</span> <span class="s2">"L-BFGS-B"</span><span class="p">),</span>
-        <span class="p">},</span>
+        <span class="n">options</span><span class="o">=</span><span class="n">options</span><span class="p">,</span>
         <span class="n">inequality_constraints</span><span class="o">=</span><span class="n">inequality_constraints</span><span class="p">,</span>
         <span class="n">fixed_features</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>  <span class="c1"># handled inside the acquisition function</span>
         <span class="n">post_processing_func</span><span class="o">=</span><span class="n">post_processing_func</span><span class="p">,</span>