Skip to content

Commit 83634fe

Browse files
Circle CICircle CI
Circle CI
authored and
Circle CI
committed
CircleCI update of dev docs (2612).
1 parent f952c0a commit 83634fe

File tree

182 files changed

+732944
-732863
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

+732944
-732863
lines changed
Binary file not shown.
Binary file not shown.
-335 Bytes
Loading
812 Bytes
Loading
-13 Bytes
Loading
Loading
276 Bytes
Loading
Loading
279 Bytes
Loading
Loading
Loading
Loading
Loading
Loading
Loading
-388 Bytes
Loading
Loading
Loading
-204 Bytes
Loading
Loading
Loading
Loading
Loading
779 Bytes
Loading
Loading
Loading
Loading
Loading
Loading
Loading
196 Bytes
Loading
-126 Bytes
Loading
Loading

master/_modules/ot/partial.html

+9-6
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,15 @@ <h1>Source code for ot.partial</h1><div class="highlight"><pre>
9191
<span class="sd">&quot;&quot;&quot;</span>
9292

9393
<span class="c1"># Author: Laetitia Chapel &lt;[email protected]&gt;</span>
94-
<span class="c1"># License: MIT License</span>
94+
<span class="c1"># Yikun Bai &lt; [email protected] &gt;</span>
95+
<span class="c1"># Cédric Vincent-Cuaz &lt;[email protected]&gt;</span>
9596

96-
<span class="kn">import</span> <span class="nn">numpy</span> <span class="k">as</span> <span class="nn">np</span>
97-
<span class="kn">from</span> <span class="nn">.lp</span> <span class="kn">import</span> <span class="n">emd</span>
98-
<span class="kn">from</span> <span class="nn">.backend</span> <span class="kn">import</span> <span class="n">get_backend</span>
9997
<span class="kn">from</span> <span class="nn">.utils</span> <span class="kn">import</span> <span class="n">list_to_array</span>
98+
<span class="kn">from</span> <span class="nn">.backend</span> <span class="kn">import</span> <span class="n">get_backend</span>
99+
<span class="kn">from</span> <span class="nn">.lp</span> <span class="kn">import</span> <span class="n">emd</span>
100+
<span class="kn">import</span> <span class="nn">numpy</span> <span class="k">as</span> <span class="nn">np</span>
101+
102+
<span class="c1"># License: MIT License</span>
100103

101104

102105
<div class="viewcode-block" id="partial_wasserstein_lagrange">
@@ -685,7 +688,7 @@ <h1>Source code for ot.partial</h1><div class="highlight"><pre>
685688
<span class="s2">&quot; equal than min(|a|_1, |b|_1).&quot;</span><span class="p">)</span>
686689

687690
<span class="k">if</span> <span class="n">G0</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
688-
<span class="n">G0</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">outer</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">q</span><span class="p">)</span>
691+
<span class="n">G0</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">outer</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">q</span><span class="p">)</span> <span class="o">*</span> <span class="n">m</span> <span class="o">/</span> <span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">sum</span><span class="p">(</span><span class="n">p</span><span class="p">)</span> <span class="o">*</span> <span class="n">np</span><span class="o">.</span><span class="n">sum</span><span class="p">(</span><span class="n">q</span><span class="p">))</span> <span class="c1"># make sure |G0|=m, G01_m\leq p, G0.T1_n\leq q.</span>
689692

690693
<span class="n">dim_G_extended</span> <span class="o">=</span> <span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">p</span><span class="p">)</span> <span class="o">+</span> <span class="n">nb_dummies</span><span class="p">,</span> <span class="nb">len</span><span class="p">(</span><span class="n">q</span><span class="p">)</span> <span class="o">+</span> <span class="n">nb_dummies</span><span class="p">)</span>
691694
<span class="n">q_extended</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">q</span><span class="p">,</span> <span class="p">[(</span><span class="n">np</span><span class="o">.</span><span class="n">sum</span><span class="p">(</span><span class="n">p</span><span class="p">)</span> <span class="o">-</span> <span class="n">m</span><span class="p">)</span> <span class="o">/</span> <span class="n">nb_dummies</span><span class="p">]</span> <span class="o">*</span> <span class="n">nb_dummies</span><span class="p">)</span>
@@ -701,7 +704,7 @@ <h1>Source code for ot.partial</h1><div class="highlight"><pre>
701704

702705
<span class="n">Gprev</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">copy</span><span class="p">(</span><span class="n">G0</span><span class="p">)</span>
703706

704-
<span class="n">M</span> <span class="o">=</span> <span class="n">gwgrad_partial</span><span class="p">(</span><span class="n">C1</span><span class="p">,</span> <span class="n">C2</span><span class="p">,</span> <span class="n">G0</span><span class="p">)</span>
707+
<span class="n">M</span> <span class="o">=</span> <span class="mf">0.5</span> <span class="o">*</span> <span class="n">gwgrad_partial</span><span class="p">(</span><span class="n">C1</span><span class="p">,</span> <span class="n">C2</span><span class="p">,</span> <span class="n">G0</span><span class="p">)</span> <span class="c1"># rescaling the gradient with 0.5 for line-search while not changing Gc</span>
705708
<span class="n">M_emd</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span><span class="n">dim_G_extended</span><span class="p">)</span>
706709
<span class="n">M_emd</span><span class="p">[:</span><span class="nb">len</span><span class="p">(</span><span class="n">p</span><span class="p">),</span> <span class="p">:</span><span class="nb">len</span><span class="p">(</span><span class="n">q</span><span class="p">)]</span> <span class="o">=</span> <span class="n">M</span>
707710
<span class="n">M_emd</span><span class="p">[</span><span class="o">-</span><span class="n">nb_dummies</span><span class="p">:,</span> <span class="o">-</span><span class="n">nb_dummies</span><span class="p">:]</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">max</span><span class="p">(</span><span class="n">M</span><span class="p">)</span> <span class="o">*</span> <span class="mf">1e2</span>

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

+40-40
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.20204949002249403
199-
Iter: 10, loss=-19.551107159946092
200-
Iter: 20, loss=-32.123839901628024
201-
Iter: 30, loss=-36.940664116171
202-
Iter: 40, loss=-40.03489446590721
203-
Iter: 50, loss=-42.17637976107136
204-
Iter: 60, loss=-43.1834917369902
205-
Iter: 70, loss=-43.469236138819014
206-
Iter: 80, loss=-43.61806696879967
207-
Iter: 90, loss=-43.67796282200493
208-
Iter: 100, loss=-43.700087076578285
209-
Iter: 110, loss=-43.710467877462726
210-
Iter: 120, loss=-43.714445212715916
211-
Iter: 130, loss=-43.716936716927314
212-
Iter: 140, loss=-43.718408156825426
213-
Iter: 150, loss=-43.719383886047595
214-
Iter: 160, loss=-43.72005046669278
215-
Iter: 170, loss=-43.720540500316126
216-
Iter: 180, loss=-43.72091116792597
217-
Iter: 190, loss=-43.72119758456282
198+
Iter: 0, loss=0.20204949002247768
199+
Iter: 10, loss=-19.421076011030973
200+
Iter: 20, loss=-31.01347922399722
201+
Iter: 30, loss=-35.30574692843582
202+
Iter: 40, loss=-38.25482934417789
203+
Iter: 50, loss=-39.94700713622043
204+
Iter: 60, loss=-40.590722404951016
205+
Iter: 70, loss=-40.876517772427746
206+
Iter: 80, loss=-40.981766342058656
207+
Iter: 90, loss=-41.01925620581441
208+
Iter: 100, loss=-41.035667717719626
209+
Iter: 110, loss=-41.04408524749168
210+
Iter: 120, loss=-41.048123660089196
211+
Iter: 130, loss=-41.05044871731107
212+
Iter: 140, loss=-41.052037008940786
213+
Iter: 150, loss=-41.053131804726945
214+
Iter: 160, loss=-41.05392342805668
215+
Iter: 170, loss=-41.05451081324624
216+
Iter: 180, loss=-41.05495492130819
217+
Iter: 190, loss=-41.05529685460488
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.55444372310591
323-
Iter: 20, loss=-31.82508719397455
324-
Iter: 30, loss=-36.73124069065788
325-
Iter: 40, loss=-39.80632209911891
326-
Iter: 50, loss=-41.90918504839524
327-
Iter: 60, loss=-42.98670159091879
328-
Iter: 70, loss=-43.288838093463525
329-
Iter: 80, loss=-43.47543632032131
330-
Iter: 90, loss=-43.54103654142782
331-
Iter: 100, loss=-43.568396593557175
332-
Iter: 110, loss=-43.58197663105146
333-
Iter: 120, loss=-43.58843119615174
334-
Iter: 130, loss=-43.59203350781738
335-
Iter: 140, loss=-43.59416513265756
336-
Iter: 150, loss=-43.59561976515732
337-
Iter: 160, loss=-43.596533431804446
338-
Iter: 170, loss=-43.59716892761811
339-
Iter: 180, loss=-43.597616524183444
340-
Iter: 190, loss=-43.59793393828832
322+
Iter: 10, loss=-19.443925220396057
323+
Iter: 20, loss=-30.922727653081377
324+
Iter: 30, loss=-35.012935936676605
325+
Iter: 40, loss=-38.162807293250054
326+
Iter: 50, loss=-39.67309868070093
327+
Iter: 60, loss=-40.40184169424428
328+
Iter: 70, loss=-40.69792460462322
329+
Iter: 80, loss=-40.83866091755958
330+
Iter: 90, loss=-40.889707794245346
331+
Iter: 100, loss=-40.91011324230527
332+
Iter: 110, loss=-40.921533554889265
333+
Iter: 120, loss=-40.926797175066206
334+
Iter: 130, loss=-40.92995805175755
335+
Iter: 140, loss=-40.932105252547856
336+
Iter: 150, loss=-40.93356100320511
337+
Iter: 160, loss=-40.934598491958205
338+
Iter: 170, loss=-40.93532662271355
339+
Iter: 180, loss=-40.93581813825356
340+
Iter: 190, loss=-40.9361241965941
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 13.099 seconds)
383+
**Total running time of the script:** (0 minutes 9.560 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

+2-2
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 0x7fb6f1c6b4c0>
398+
<matplotlib.colorbar.Colorbar object at 0x7f9c5a94f400>
399399
400400
401401
402402
403403
.. rst-class:: sphx-glr-timing
404404

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

407407

408408
.. _sphx_glr_download_auto_examples_backends_plot_optim_gromov_pytorch.py:

0 commit comments

Comments
 (0)