Skip to content

Commit 95373ce

Browse files
Circle CICircle CI
Circle CI
authored and
Circle CI
committed
CircleCI update of dev docs (2792).
1 parent fd1ff29 commit 95373ce

File tree

453 files changed

+733788
-733142
lines changed

Some content is hidden

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

453 files changed

+733788
-733142
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
-440 Bytes
-377 Bytes
-28 Bytes
-509 Bytes
-713 Bytes
-516 Bytes
-659 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
-132 Bytes
0 Bytes
0 Bytes
0 Bytes
-1.22 KB
-61 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
384 Bytes
308 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes

master/_modules/ot/lp/solver_1d.html

+14-9
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ <h1>Source code for ot.lp.solver_1d</h1><div class="highlight"><pre>
245245
<span class="sd"> - x_a and x_b are the samples</span>
246246
<span class="sd"> - a and b are the sample weights</span>
247247

248-
<span class="sd"> When &#39;minkowski&#39; is used as a metric, :math:`d(x, y) = |x - y|^p`.</span>
248+
<span class="sd"> This implementation only supports metrics</span>
249+
<span class="sd"> of the form :math:`d(x, y) = |x - y|^p`.</span>
249250

250251
<span class="sd"> Uses the algorithm detailed in [1]_</span>
251252

@@ -260,9 +261,8 @@ <h1>Source code for ot.lp.solver_1d</h1><div class="highlight"><pre>
260261
<span class="sd"> b : (nt,) ndarray, float64, optional</span>
261262
<span class="sd"> Target histogram (default is uniform weight)</span>
262263
<span class="sd"> metric: str, optional (default=&#39;sqeuclidean&#39;)</span>
263-
<span class="sd"> Metric to be used. Only strings listed in :func:`ot.dist` are accepted.</span>
264-
<span class="sd"> Due to implementation details, this function runs faster when</span>
265-
<span class="sd"> `&#39;sqeuclidean&#39;`, `&#39;cityblock&#39;`, or `&#39;euclidean&#39;` metrics are used.</span>
264+
<span class="sd"> Metric to be used. Only works with either of the strings</span>
265+
<span class="sd"> `&#39;sqeuclidean&#39;`, `&#39;minkowski&#39;`, `&#39;cityblock&#39;`, or `&#39;euclidean&#39;`.</span>
266266
<span class="sd"> p: float, optional (default=1.0)</span>
267267
<span class="sd"> The p-norm to apply for if metric=&#39;minkowski&#39;</span>
268268
<span class="sd"> dense: boolean, optional (default=True)</span>
@@ -327,6 +327,12 @@ <h1>Source code for ot.lp.solver_1d</h1><div class="highlight"><pre>
327327
<span class="s2">&quot;emd_1d should only be used with monodimensional data&quot;</span>
328328
<span class="k">assert</span> <span class="p">(</span><span class="n">x_b</span><span class="o">.</span><span class="n">ndim</span> <span class="o">==</span> <span class="mi">1</span> <span class="ow">or</span> <span class="n">x_b</span><span class="o">.</span><span class="n">ndim</span> <span class="o">==</span> <span class="mi">2</span> <span class="ow">and</span> <span class="n">x_b</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="mi">1</span><span class="p">),</span> \
329329
<span class="s2">&quot;emd_1d should only be used with monodimensional data&quot;</span>
330+
<span class="k">if</span> <span class="n">metric</span> <span class="ow">not</span> <span class="ow">in</span> <span class="p">[</span><span class="s1">&#39;sqeuclidean&#39;</span><span class="p">,</span> <span class="s1">&#39;minkowski&#39;</span><span class="p">,</span> <span class="s1">&#39;cityblock&#39;</span><span class="p">,</span> <span class="s1">&#39;euclidean&#39;</span><span class="p">]:</span>
331+
<span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span>
332+
<span class="s2">&quot;Solver for EMD in 1d only supports metrics &quot;</span> <span class="o">+</span>
333+
<span class="s2">&quot;from the following list: &quot;</span> <span class="o">+</span>
334+
<span class="s2">&quot;`[&#39;sqeuclidean&#39;, &#39;minkowski&#39;, &#39;cityblock&#39;, &#39;euclidean&#39;]`&quot;</span>
335+
<span class="p">)</span>
330336

331337
<span class="c1"># if empty array given then use uniform distributions</span>
332338
<span class="k">if</span> <span class="n">a</span> <span class="ow">is</span> <span class="kc">None</span> <span class="ow">or</span> <span class="n">a</span><span class="o">.</span><span class="n">ndim</span> <span class="o">==</span> <span class="mi">0</span> <span class="ow">or</span> <span class="nb">len</span><span class="p">(</span><span class="n">a</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
@@ -396,7 +402,8 @@ <h1>Source code for ot.lp.solver_1d</h1><div class="highlight"><pre>
396402
<span class="sd"> - x_a and x_b are the samples</span>
397403
<span class="sd"> - a and b are the sample weights</span>
398404

399-
<span class="sd"> When &#39;minkowski&#39; is used as a metric, :math:`d(x, y) = |x - y|^p`.</span>
405+
<span class="sd"> This implementation only supports metrics</span>
406+
<span class="sd"> of the form :math:`d(x, y) = |x - y|^p`.</span>
400407

401408
<span class="sd"> Uses the algorithm detailed in [1]_</span>
402409

@@ -411,10 +418,8 @@ <h1>Source code for ot.lp.solver_1d</h1><div class="highlight"><pre>
411418
<span class="sd"> b : (nt,) ndarray, float64, optional</span>
412419
<span class="sd"> Target histogram (default is uniform weight)</span>
413420
<span class="sd"> metric: str, optional (default=&#39;sqeuclidean&#39;)</span>
414-
<span class="sd"> Metric to be used. Only strings listed in :func:`ot.dist` are accepted.</span>
415-
<span class="sd"> Due to implementation details, this function runs faster when</span>
416-
<span class="sd"> `&#39;sqeuclidean&#39;`, `&#39;minkowski&#39;`, `&#39;cityblock&#39;`, or `&#39;euclidean&#39;` metrics</span>
417-
<span class="sd"> are used.</span>
421+
<span class="sd"> Metric to be used. Only works with either of the strings</span>
422+
<span class="sd"> `&#39;sqeuclidean&#39;`, `&#39;minkowski&#39;`, `&#39;cityblock&#39;`, or `&#39;euclidean&#39;`.</span>
418423
<span class="sd"> p: float, optional (default=1.0)</span>
419424
<span class="sd"> The p-norm to apply for if metric=&#39;minkowski&#39;</span>
420425
<span class="sd"> dense: boolean, optional (default=True)</span>

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

+40-40

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

+2-2

0 commit comments

Comments
 (0)