Skip to content

Commit

Permalink
Update from google/jaxopt@08ec55f
Browse files Browse the repository at this point in the history
  • Loading branch information
jaxopt committed Jan 28, 2024
1 parent d648e53 commit 45021da
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 29 deletions.
2 changes: 1 addition & 1 deletion dev/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: cbc49bfa4c9d600d4961481c9104abd0
config: ab01527ff0c84c2c7f97229ab90c5fb4
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion dev/_modules/jaxopt/_src/bfgs.html
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ <h1>Source code for jaxopt._src.bfgs</h1><div class="highlight"><pre>
<span class="n">max_stepsize</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">max_stepsize</span><span class="p">,</span>
<span class="n">jit</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">jit</span><span class="p">,</span>
<span class="n">unroll</span><span class="o">=</span><span class="n">unroll</span><span class="p">,</span>
<span class="n">verbose</span><span class="o">=</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span><span class="o">-</span><span class="mi">1</span>
<span class="n">verbose</span><span class="o">=</span><span class="nb">max</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span><span class="o">-</span><span class="mi">1</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
<span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">run_ls</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">linesearch_solver</span><span class="o">.</span><span class="n">run</span>

Expand Down
2 changes: 1 addition & 1 deletion dev/_modules/jaxopt/_src/broyden.html
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ <h1>Source code for jaxopt._src.broyden</h1><div class="highlight"><pre>
<span class="n">jit</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">jit</span><span class="p">,</span>
<span class="n">unroll</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">unroll</span><span class="p">,</span>
<span class="n">has_aux</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
<span class="n">verbose</span><span class="o">=</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span><span class="o">-</span><span class="mi">1</span><span class="p">,</span>
<span class="n">verbose</span><span class="o">=</span><span class="nb">max</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span><span class="o">-</span><span class="mi">1</span><span class="p">,</span> <span class="mi">0</span><span class="p">),</span>
<span class="n">tol</span><span class="o">=</span><span class="mf">1e-2</span><span class="p">)</span>
<span class="n">init_stepsize</span> <span class="o">=</span> <span class="n">jnp</span><span class="o">.</span><span class="n">where</span><span class="p">(</span><span class="n">state</span><span class="o">.</span><span class="n">stepsize</span> <span class="o">&lt;=</span> <span class="bp">self</span><span class="o">.</span><span class="n">min_stepsize</span><span class="p">,</span>
<span class="c1"># If stepsize became too small, we restart it.</span>
Expand Down
2 changes: 1 addition & 1 deletion dev/_modules/jaxopt/_src/lbfgs.html
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ <h1>Source code for jaxopt._src.lbfgs</h1><div class="highlight"><pre>
<span class="n">max_stepsize</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">max_stepsize</span><span class="p">,</span>
<span class="n">jit</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">jit</span><span class="p">,</span>
<span class="n">unroll</span><span class="o">=</span><span class="n">unroll</span><span class="p">,</span>
<span class="n">verbose</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">,</span>
<span class="n">verbose</span><span class="o">=</span><span class="nb">max</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span><span class="o">-</span><span class="mi">1</span><span class="p">,</span> <span class="mi">0</span><span class="p">),</span>
<span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">run_ls</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">linesearch_solver</span><span class="o">.</span><span class="n">run</span>

Expand Down
2 changes: 1 addition & 1 deletion dev/_modules/jaxopt/_src/lbfgsb.html
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ <h1>Source code for jaxopt._src.lbfgsb</h1><div class="highlight"><pre>
<span class="n">max_stepsize</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">max_stepsize</span><span class="p">,</span>
<span class="n">jit</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">jit</span><span class="p">,</span>
<span class="n">unroll</span><span class="o">=</span><span class="n">unroll</span><span class="p">,</span>
<span class="n">verbose</span><span class="o">=</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span><span class="o">-</span><span class="mi">1</span><span class="p">,</span>
<span class="n">verbose</span><span class="o">=</span><span class="nb">max</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span><span class="o">-</span><span class="mi">1</span><span class="p">,</span> <span class="mi">0</span><span class="p">),</span>
<span class="p">)</span>

<span class="bp">self</span><span class="o">.</span><span class="n">run_ls</span> <span class="o">=</span> <span class="n">linesearch_solver</span><span class="o">.</span><span class="n">run</span>
Expand Down
2 changes: 1 addition & 1 deletion dev/_modules/jaxopt/_src/nonlinear_cg.html
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ <h1>Source code for jaxopt._src.nonlinear_cg</h1><div class="highlight"><pre>
<span class="n">max_stepsize</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">max_stepsize</span><span class="p">,</span>
<span class="n">jit</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">jit</span><span class="p">,</span>
<span class="n">unroll</span><span class="o">=</span><span class="n">unroll</span><span class="p">,</span>
<span class="n">verbose</span><span class="o">=</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span><span class="o">-</span><span class="mi">1</span>
<span class="n">verbose</span><span class="o">=</span><span class="nb">max</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span><span class="o">-</span><span class="mi">1</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
<span class="p">)</span>

<span class="bp">self</span><span class="o">.</span><span class="n">run_ls</span> <span class="o">=</span> <span class="n">linesearch_solver</span><span class="o">.</span><span class="n">run</span>
Expand Down
3 changes: 3 additions & 0 deletions dev/_modules/jaxopt/_src/osqp.html
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,9 @@ <h1>Source code for jaxopt._src.osqp</h1><div class="highlight"><pre>
<span class="n">dual_residuals</span><span class="o">=</span><span class="n">dual_residuals</span><span class="p">,</span>
<span class="n">rho_bar</span><span class="o">=</span><span class="n">rho_bar</span><span class="p">,</span>
<span class="n">solver_state</span><span class="o">=</span><span class="n">solver_state</span><span class="p">)</span>

<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">log_info</span><span class="p">(</span><span class="n">state</span><span class="p">)</span>
<span class="k">return</span> <span class="n">base</span><span class="o">.</span><span class="n">OptStep</span><span class="p">(</span><span class="n">params</span><span class="o">=</span><span class="n">sol</span><span class="p">,</span> <span class="n">state</span><span class="o">=</span><span class="n">state</span><span class="p">)</span></div>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Computation times
=================
**01:12.988** total execution time for 3 files **from auto_examples/deep_learning**:
**01:13.861** total execution time for 3 files **from auto_examples/deep_learning**:

.. container::

Expand All @@ -33,7 +33,7 @@ Computation times
- Time
- Mem (MB)
* - :ref:`sphx_glr_auto_examples_deep_learning_plot_sgd_solvers.py` (``plot_sgd_solvers.py``)
- 01:12.988
- 01:13.861
- 0.0
* - :ref:`sphx_glr_auto_examples_deep_learning_distributed_flax_imagenet.py` (``distributed_flax_imagenet.py``)
- 00:00.000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Computation times
=================
**00:10.088** total execution time for 4 files **from auto_examples/fixed_point**:
**00:10.130** total execution time for 4 files **from auto_examples/fixed_point**:

.. container::

Expand All @@ -33,13 +33,13 @@ Computation times
- Time
- Mem (MB)
* - :ref:`sphx_glr_auto_examples_fixed_point_plot_picard_ode.py` (``plot_picard_ode.py``)
- 00:05.673
- 00:05.715
- 0.0
* - :ref:`sphx_glr_auto_examples_fixed_point_plot_anderson_wrapper_cd.py` (``plot_anderson_wrapper_cd.py``)
- 00:02.341
- 00:02.332
- 0.0
* - :ref:`sphx_glr_auto_examples_fixed_point_plot_anderson_accelerate_gd.py` (``plot_anderson_accelerate_gd.py``)
- 00:02.075
- 00:02.084
- 0.0
* - :ref:`sphx_glr_auto_examples_fixed_point_deep_equilibrium_model.py` (``deep_equilibrium_model.py``)
- 00:00.000
Expand Down
10 changes: 5 additions & 5 deletions dev/_sources/sg_execution_times.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Computation times
=================
**01:23.075** total execution time for 13 files **from all galleries**:
**01:23.991** total execution time for 13 files **from all galleries**:

.. container::

Expand All @@ -33,16 +33,16 @@ Computation times
- Time
- Mem (MB)
* - :ref:`sphx_glr_auto_examples_deep_learning_plot_sgd_solvers.py` (``../examples/deep_learning/plot_sgd_solvers.py``)
- 01:12.988
- 01:13.861
- 0.0
* - :ref:`sphx_glr_auto_examples_fixed_point_plot_picard_ode.py` (``../examples/fixed_point/plot_picard_ode.py``)
- 00:05.673
- 00:05.715
- 0.0
* - :ref:`sphx_glr_auto_examples_fixed_point_plot_anderson_wrapper_cd.py` (``../examples/fixed_point/plot_anderson_wrapper_cd.py``)
- 00:02.341
- 00:02.332
- 0.0
* - :ref:`sphx_glr_auto_examples_fixed_point_plot_anderson_accelerate_gd.py` (``../examples/fixed_point/plot_anderson_accelerate_gd.py``)
- 00:02.075
- 00:02.084
- 0.0
* - :ref:`sphx_glr_auto_examples_constrained_binary_kernel_svm_with_intercept.py` (``../examples/constrained/binary_kernel_svm_with_intercept.py``)
- 00:00.000
Expand Down
4 changes: 2 additions & 2 deletions dev/auto_examples/deep_learning/sg_execution_times.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@

<section id="computation-times">
<span id="sphx-glr-auto-examples-deep-learning-sg-execution-times"></span><h1>Computation times<a class="headerlink" href="#computation-times" title="Link to this heading"></a></h1>
<p><strong>01:12.988</strong> total execution time for 3 files <strong>from auto_examples/deep_learning</strong>:</p>
<p><strong>01:13.861</strong> total execution time for 3 files <strong>from auto_examples/deep_learning</strong>:</p>
<div class="docutils container">
<style scoped>
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.0/css/bootstrap.min.css" rel="stylesheet" />
Expand All @@ -135,7 +135,7 @@
</thead>
<tbody>
<tr class="row-even"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_deep_learning_plot_sgd_solvers.py</span> (<code class="docutils literal notranslate"><span class="pre">plot_sgd_solvers.py</span></code>)</p></td>
<td><p>01:12.988</p></td>
<td><p>01:13.861</p></td>
<td><p>0.0</p></td>
</tr>
<tr class="row-odd"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_deep_learning_distributed_flax_imagenet.py</span> (<code class="docutils literal notranslate"><span class="pre">distributed_flax_imagenet.py</span></code>)</p></td>
Expand Down
8 changes: 4 additions & 4 deletions dev/auto_examples/fixed_point/sg_execution_times.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@

<section id="computation-times">
<span id="sphx-glr-auto-examples-fixed-point-sg-execution-times"></span><h1>Computation times<a class="headerlink" href="#computation-times" title="Link to this heading"></a></h1>
<p><strong>00:10.088</strong> total execution time for 4 files <strong>from auto_examples/fixed_point</strong>:</p>
<p><strong>00:10.130</strong> total execution time for 4 files <strong>from auto_examples/fixed_point</strong>:</p>
<div class="docutils container">
<style scoped>
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.0/css/bootstrap.min.css" rel="stylesheet" />
Expand All @@ -135,15 +135,15 @@
</thead>
<tbody>
<tr class="row-even"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_fixed_point_plot_picard_ode.py</span> (<code class="docutils literal notranslate"><span class="pre">plot_picard_ode.py</span></code>)</p></td>
<td><p>00:05.673</p></td>
<td><p>00:05.715</p></td>
<td><p>0.0</p></td>
</tr>
<tr class="row-odd"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_fixed_point_plot_anderson_wrapper_cd.py</span> (<code class="docutils literal notranslate"><span class="pre">plot_anderson_wrapper_cd.py</span></code>)</p></td>
<td><p>00:02.341</p></td>
<td><p>00:02.332</p></td>
<td><p>0.0</p></td>
</tr>
<tr class="row-even"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_fixed_point_plot_anderson_accelerate_gd.py</span> (<code class="docutils literal notranslate"><span class="pre">plot_anderson_accelerate_gd.py</span></code>)</p></td>
<td><p>00:02.075</p></td>
<td><p>00:02.084</p></td>
<td><p>0.0</p></td>
</tr>
<tr class="row-odd"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_fixed_point_deep_equilibrium_model.py</span> (<code class="docutils literal notranslate"><span class="pre">deep_equilibrium_model.py</span></code>)</p></td>
Expand Down
2 changes: 1 addition & 1 deletion dev/searchindex.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dev/sg_execution_times.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@

<section id="computation-times">
<span id="sphx-glr-sg-execution-times"></span><h1>Computation times<a class="headerlink" href="#computation-times" title="Link to this heading"></a></h1>
<p><strong>01:23.075</strong> total execution time for 13 files <strong>from all galleries</strong>:</p>
<p><strong>01:23.991</strong> total execution time for 13 files <strong>from all galleries</strong>:</p>
<div class="docutils container">
<style scoped>
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.0/css/bootstrap.min.css" rel="stylesheet" />
Expand All @@ -135,19 +135,19 @@
</thead>
<tbody>
<tr class="row-even"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_deep_learning_plot_sgd_solvers.py</span> (<code class="docutils literal notranslate"><span class="pre">../examples/deep_learning/plot_sgd_solvers.py</span></code>)</p></td>
<td><p>01:12.988</p></td>
<td><p>01:13.861</p></td>
<td><p>0.0</p></td>
</tr>
<tr class="row-odd"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_fixed_point_plot_picard_ode.py</span> (<code class="docutils literal notranslate"><span class="pre">../examples/fixed_point/plot_picard_ode.py</span></code>)</p></td>
<td><p>00:05.673</p></td>
<td><p>00:05.715</p></td>
<td><p>0.0</p></td>
</tr>
<tr class="row-even"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_fixed_point_plot_anderson_wrapper_cd.py</span> (<code class="docutils literal notranslate"><span class="pre">../examples/fixed_point/plot_anderson_wrapper_cd.py</span></code>)</p></td>
<td><p>00:02.341</p></td>
<td><p>00:02.332</p></td>
<td><p>0.0</p></td>
</tr>
<tr class="row-odd"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_fixed_point_plot_anderson_accelerate_gd.py</span> (<code class="docutils literal notranslate"><span class="pre">../examples/fixed_point/plot_anderson_accelerate_gd.py</span></code>)</p></td>
<td><p>00:02.075</p></td>
<td><p>00:02.084</p></td>
<td><p>0.0</p></td>
</tr>
<tr class="row-even"><td><p><span class="xref std std-ref">sphx_glr_auto_examples_constrained_binary_kernel_svm_with_intercept.py</span> (<code class="docutils literal notranslate"><span class="pre">../examples/constrained/binary_kernel_svm_with_intercept.py</span></code>)</p></td>
Expand Down

0 comments on commit 45021da

Please sign in to comment.