Skip to content

Commit f8b2abe

Browse files
Circle CICircle CI
Circle CI
authored and
Circle CI
committed
CircleCI update of dev docs (2671).
1 parent 7c4aadb commit f8b2abe

File tree

182 files changed

+733733
-732215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+733733
-732215
lines changed
Binary file not shown.
Binary file not shown.
-134 Bytes
Loading
-266 Bytes
Loading
Loading
Loading
-92 Bytes
Loading
Loading
-87 Bytes
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
-373 Bytes
Loading
237 Bytes
Loading
Loading
Loading
Loading
Loading
Loading
-206 Bytes
Loading
319 Bytes
Loading
Loading

master/_modules/ot/backend.html

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ <h1>Source code for ot.backend</h1><div class="highlight"><pre>
207207
<span class="kn">import</span> <span class="nn">jax.scipy.special</span> <span class="k">as</span> <span class="nn">jspecial</span>
208208
<span class="kn">from</span> <span class="nn">jax.lib</span> <span class="kn">import</span> <span class="n">xla_bridge</span>
209209
<span class="n">jax_type</span> <span class="o">=</span> <span class="n">jax</span><span class="o">.</span><span class="n">numpy</span><span class="o">.</span><span class="n">ndarray</span>
210+
<span class="n">jax_new_version</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="s1">&#39;.&#39;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">jax</span><span class="o">.</span><span class="n">__version__</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s1">&#39;.&#39;</span><span class="p">)[</span><span class="mi">1</span><span class="p">:]))</span> <span class="o">&gt;</span> <span class="mf">4.24</span>
210211
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
211212
<span class="n">jax</span> <span class="o">=</span> <span class="kc">False</span>
212213
<span class="n">jax_type</span> <span class="o">=</span> <span class="nb">float</span>
@@ -2035,11 +2036,19 @@ <h1>Source code for ot.backend</h1><div class="highlight"><pre>
20352036
<span class="n">jax</span><span class="o">.</span><span class="n">device_put</span><span class="p">(</span><span class="n">jnp</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">dtype</span><span class="o">=</span><span class="n">jnp</span><span class="o">.</span><span class="n">float64</span><span class="p">),</span> <span class="n">d</span><span class="p">)</span>
20362037
<span class="p">]</span>
20372038

2039+
<span class="bp">self</span><span class="o">.</span><span class="n">jax_new_version</span> <span class="o">=</span> <span class="n">jax_new_version</span>
2040+
20382041
<span class="k">def</span> <span class="nf">_to_numpy</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">a</span><span class="p">):</span>
20392042
<span class="k">return</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">a</span><span class="p">)</span>
20402043

2044+
<span class="k">def</span> <span class="nf">_get_device</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">a</span><span class="p">):</span>
2045+
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">jax_new_version</span><span class="p">:</span>
2046+
<span class="k">return</span> <span class="nb">list</span><span class="p">(</span><span class="n">a</span><span class="o">.</span><span class="n">devices</span><span class="p">())[</span><span class="mi">0</span><span class="p">]</span>
2047+
<span class="k">else</span><span class="p">:</span>
2048+
<span class="k">return</span> <span class="n">a</span><span class="o">.</span><span class="n">device_buffer</span><span class="o">.</span><span class="n">device</span><span class="p">()</span>
2049+
20412050
<span class="k">def</span> <span class="nf">_change_device</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">a</span><span class="p">,</span> <span class="n">type_as</span><span class="p">):</span>
2042-
<span class="k">return</span> <span class="n">jax</span><span class="o">.</span><span class="n">device_put</span><span class="p">(</span><span class="n">a</span><span class="p">,</span> <span class="n">type_as</span><span class="o">.</span><span class="n">device_buffer</span><span class="o">.</span><span class="n">device</span><span class="p">())</span>
2051+
<span class="k">return</span> <span class="n">jax</span><span class="o">.</span><span class="n">device_put</span><span class="p">(</span><span class="n">a</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">_get_device</span><span class="p">(</span><span class="n">type_as</span><span class="p">))</span>
20432052

20442053
<span class="k">def</span> <span class="nf">_from_numpy</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">a</span><span class="p">,</span> <span class="n">type_as</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
20452054
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">a</span><span class="p">,</span> <span class="nb">float</span><span class="p">):</span>
@@ -2457,7 +2466,10 @@ <h1>Source code for ot.backend</h1><div class="highlight"><pre>
24572466
<div class="viewcode-block" id="JaxBackend.dtype_device">
24582467
<a class="viewcode-back" href="../../gen_modules/ot.backend.html#ot.backend.JaxBackend.dtype_device">[docs]</a>
24592468
<span class="k">def</span> <span class="nf">dtype_device</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">a</span><span class="p">):</span>
2460-
<span class="k">return</span> <span class="n">a</span><span class="o">.</span><span class="n">dtype</span><span class="p">,</span> <span class="n">a</span><span class="o">.</span><span class="n">device_buffer</span><span class="o">.</span><span class="n">device</span><span class="p">()</span></div>
2469+
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">jax_new_version</span><span class="p">:</span>
2470+
<span class="k">return</span> <span class="n">a</span><span class="o">.</span><span class="n">dtype</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">a</span><span class="o">.</span><span class="n">devices</span><span class="p">())[</span><span class="mi">0</span><span class="p">]</span>
2471+
<span class="k">else</span><span class="p">:</span>
2472+
<span class="k">return</span> <span class="n">a</span><span class="o">.</span><span class="n">dtype</span><span class="p">,</span> <span class="n">a</span><span class="o">.</span><span class="n">device_buffer</span><span class="o">.</span><span class="n">device</span><span class="p">()</span></div>
24612473

24622474

24632475
<div class="viewcode-block" id="JaxBackend.assert_same_dtype_device">

master/_sources/auto_examples/backends/plot_dual_ot_pytorch.rst.txt

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -195,26 +195,26 @@ Estimating dual variables for entropic OT
195195

196196
.. code-block:: none
197197
198-
Iter: 0, loss=0.20204949002249922
199-
Iter: 10, loss=-19.47584556587466
200-
Iter: 20, loss=-31.429525660329517
201-
Iter: 30, loss=-36.70549589151293
202-
Iter: 40, loss=-40.104393854466224
203-
Iter: 50, loss=-41.71970632953193
204-
Iter: 60, loss=-42.48323308041214
205-
Iter: 70, loss=-42.825683674928264
206-
Iter: 80, loss=-42.94068528401017
207-
Iter: 90, loss=-42.97380108266532
208-
Iter: 100, loss=-42.98796115314187
209-
Iter: 110, loss=-42.99433008352598
210-
Iter: 120, loss=-42.996860587404996
211-
Iter: 130, loss=-42.99834253338184
212-
Iter: 140, loss=-42.999047253425104
213-
Iter: 150, loss=-42.9995070985144
214-
Iter: 160, loss=-42.999839261612365
215-
Iter: 170, loss=-43.000076556643705
216-
Iter: 180, loss=-43.00026730268771
217-
Iter: 190, loss=-43.00041914898498
198+
Iter: 0, loss=0.2020494900224745
199+
Iter: 10, loss=-19.57618259614961
200+
Iter: 20, loss=-31.66301265244961
201+
Iter: 30, loss=-36.50666181688356
202+
Iter: 40, loss=-39.95100518352593
203+
Iter: 50, loss=-41.47867745038081
204+
Iter: 60, loss=-42.40982244225048
205+
Iter: 70, loss=-42.75576775807454
206+
Iter: 80, loss=-42.96194349519
207+
Iter: 90, loss=-43.010399265246384
208+
Iter: 100, loss=-43.04617124235882
209+
Iter: 110, loss=-43.05966450080063
210+
Iter: 120, loss=-43.06794354289777
211+
Iter: 130, loss=-43.073006381620885
212+
Iter: 140, loss=-43.076636666041324
213+
Iter: 150, loss=-43.079366227386934
214+
Iter: 160, loss=-43.08154681843257
215+
Iter: 170, loss=-43.08329470262464
216+
Iter: 180, loss=-43.08470031156932
217+
Iter: 190, loss=-43.08581430429776
218218
219219
220220
@@ -319,25 +319,25 @@ Estimating dual variables for quadratic OT
319319
.. code-block:: none
320320
321321
Iter: 0, loss=-0.0018442196020623663
322-
Iter: 10, loss=-19.61387664621203
323-
Iter: 20, loss=-31.373114762444427
324-
Iter: 30, loss=-36.549940622056816
325-
Iter: 40, loss=-39.715819804778995
326-
Iter: 50, loss=-41.61567235919983
327-
Iter: 60, loss=-42.279493349784346
328-
Iter: 70, loss=-42.68091682263879
329-
Iter: 80, loss=-42.79426450444149
330-
Iter: 90, loss=-42.84497179793894
331-
Iter: 100, loss=-42.86443425295894
332-
Iter: 110, loss=-42.8729932791931
333-
Iter: 120, loss=-42.87708688048491
334-
Iter: 130, loss=-42.87881265031169
335-
Iter: 140, loss=-42.87980692585934
336-
Iter: 150, loss=-42.88040226246206
337-
Iter: 160, loss=-42.880774215111146
338-
Iter: 170, loss=-42.88101077690173
339-
Iter: 180, loss=-42.88116300490077
340-
Iter: 190, loss=-42.881270999159455
322+
Iter: 10, loss=-19.544292446025445
323+
Iter: 20, loss=-31.280524158660008
324+
Iter: 30, loss=-36.19856648665331
325+
Iter: 40, loss=-39.62982578094831
326+
Iter: 50, loss=-41.171229459917676
327+
Iter: 60, loss=-42.12753723269981
328+
Iter: 70, loss=-42.55976656784887
329+
Iter: 80, loss=-42.761741861484026
330+
Iter: 90, loss=-42.86048643148755
331+
Iter: 100, loss=-42.896210186167515
332+
Iter: 110, loss=-42.912518604496654
333+
Iter: 120, loss=-42.92196834252769
334+
Iter: 130, loss=-42.92766529649812
335+
Iter: 140, loss=-42.93143626004543
336+
Iter: 150, loss=-42.93430243457384
337+
Iter: 160, loss=-42.93669507664405
338+
Iter: 170, loss=-42.93876197077028
339+
Iter: 180, loss=-42.94043926818304
340+
Iter: 190, loss=-42.941767213471
341341
342342
343343
@@ -380,7 +380,7 @@ Plot the estimated quadratic OT plan
380380
381381
.. rst-class:: sphx-glr-timing
382382

383-
**Total running time of the script:** (0 minutes 12.396 seconds)
383+
**Total running time of the script:** (0 minutes 8.564 seconds)
384384

385385

386386
.. _sphx_glr_download_auto_examples_backends_plot_dual_ot_pytorch.py:

master/_sources/auto_examples/backends/plot_optim_gromov_pytorch.rst.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,14 +395,14 @@ classes
395395
Estimated weights : [0.29985821 0.18926744 0.51087435]
396396
True proportions : [0.5 0.3 0.2]
397397
398-
<matplotlib.colorbar.Colorbar object at 0x7f2ec3daa650>
398+
<matplotlib.colorbar.Colorbar object at 0x7f60c09e69e0>
399399
400400
401401
402402
403403
.. rst-class:: sphx-glr-timing
404404

405-
**Total running time of the script:** (0 minutes 9.062 seconds)
405+
**Total running time of the script:** (0 minutes 8.575 seconds)
406406

407407

408408
.. _sphx_glr_download_auto_examples_backends_plot_optim_gromov_pytorch.py:

0 commit comments

Comments
 (0)