Skip to content

Commit 8665fb4

Browse files
Supporting order arg to asnumpy (#2980)
Fixed `dpnp.asnumpy` and `dpnp.ndarray.asnumpy` ignoring the `order` arg Fixes: #2568 8588c5a
1 parent 244b7fb commit 8665fb4

6 files changed

Lines changed: 42 additions & 16 deletions

File tree

_modules/dpnp/dpnp_array.html

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,11 +1971,21 @@ <h1>Source code for dpnp.dpnp_array</h1><div class="highlight"><pre>
19711971

19721972
<div class="viewcode-block" id="dpnp_array.asnumpy">
19731973
<a class="viewcode-back" href="../../reference/generated/dpnp.dpnp_array.dpnp_array.asnumpy.html#dpnp.dpnp_array.dpnp_array.asnumpy">[docs]</a>
1974-
<span class="k">def</span><span class="w"> </span><span class="nf">asnumpy</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
1974+
<span class="k">def</span><span class="w"> </span><span class="nf">asnumpy</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">order</span><span class="o">=</span><span class="s2">&quot;C&quot;</span><span class="p">):</span>
19751975
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
19761976
<span class="sd"> Copy content of the array into :class:`numpy.ndarray` instance of</span>
19771977
<span class="sd"> the same shape and data type.</span>
19781978

1979+
<span class="sd"> Parameters</span>
1980+
<span class="sd"> ----------</span>
1981+
<span class="sd"> order : {None, &#39;C&#39;, &#39;F&#39;, &#39;A&#39;, &#39;K&#39;}, optional</span>
1982+
<span class="sd"> The desired memory layout of the converted array.</span>
1983+
<span class="sd"> When `order` is ``&#39;A&#39;``, it uses ``&#39;F&#39;`` if the array is</span>
1984+
<span class="sd"> column-major and uses ``&#39;C&#39;`` otherwise. And when `order` is</span>
1985+
<span class="sd"> ``&#39;K&#39;``, it keeps strides as closely as possible.</span>
1986+
1987+
<span class="sd"> Default: ``&#39;C&#39;``.</span>
1988+
19791989
<span class="sd"> Returns</span>
19801990
<span class="sd"> -------</span>
19811991
<span class="sd"> out : numpy.ndarray</span>
@@ -1984,7 +1994,7 @@ <h1>Source code for dpnp.dpnp_array</h1><div class="highlight"><pre>
19841994

19851995
<span class="sd"> &quot;&quot;&quot;</span>
19861996

1987-
<span class="k">return</span> <span class="n">dpt</span><span class="o">.</span><span class="n">asnumpy</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_array_obj</span><span class="p">)</span></div>
1997+
<span class="k">return</span> <span class="n">dpt</span><span class="o">.</span><span class="n">asnumpy</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_array_obj</span><span class="p">,</span> <span class="n">order</span><span class="o">=</span><span class="n">order</span><span class="p">)</span></div>
19881998

19891999

19902000
<div class="viewcode-block" id="dpnp_array.astype">

_modules/dpnp/dpnp_iface.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,10 +1166,10 @@ <h1>Source code for dpnp.dpnp_iface</h1><div class="highlight"><pre>
11661166
<span class="sd"> &quot;&quot;&quot;</span>
11671167

11681168
<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="n">dpnp_array</span><span class="p">):</span>
1169-
<span class="k">return</span> <span class="n">a</span><span class="o">.</span><span class="n">asnumpy</span><span class="p">()</span>
1169+
<span class="k">return</span> <span class="n">a</span><span class="o">.</span><span class="n">asnumpy</span><span class="p">(</span><span class="n">order</span><span class="o">=</span><span class="n">order</span><span class="p">)</span>
11701170

11711171
<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="n">dpt</span><span class="o">.</span><span class="n">usm_ndarray</span><span class="p">):</span>
1172-
<span class="k">return</span> <span class="n">dpt</span><span class="o">.</span><span class="n">asnumpy</span><span class="p">(</span><span class="n">a</span><span class="p">)</span>
1172+
<span class="k">return</span> <span class="n">dpt</span><span class="o">.</span><span class="n">asnumpy</span><span class="p">(</span><span class="n">a</span><span class="p">,</span> <span class="n">order</span><span class="o">=</span><span class="n">order</span><span class="p">)</span>
11731173

11741174
<span class="k">return</span> <span class="n">numpy</span><span class="o">.</span><span class="n">asarray</span><span class="p">(</span><span class="n">a</span><span class="p">,</span> <span class="n">order</span><span class="o">=</span><span class="n">order</span><span class="p">)</span></div>
11751175

reference/comparison.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@
10401040
<h1>Comparison Table NumPy/ DPNP/ CuPy<a class="headerlink" href="#comparison-table-numpy-dpnp-cupy" title="Link to this heading">¶</a></h1>
10411041
<p>Here is a list of NumPy and CuPy APIs and its corresponding DPNP implementations.</p>
10421042
<p><code class="docutils literal notranslate"><span class="pre">-</span></code> in DPNP column means that DPNP implementation is not provided yet.</p>
1043-
<p><strong>NumPy(v2.5.0) / DPNP(v0.21.0dev2+7.gf60cdfe6c72) / CuPy(v14.1.1) APIs</strong></p>
1043+
<p><strong>NumPy(v2.5.0) / DPNP(v0.21.0dev2+8.g8588c5abe1b) / CuPy(v14.1.1) APIs</strong></p>
10441044
<section id="summary">
10451045
<h2>Summary<a class="headerlink" href="#summary" title="Link to this heading">¶</a></h2>
10461046
<div class="table-wrapper docutils container">

reference/generated/dpnp.dpnp_array.dpnp_array.asnumpy.html

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,16 +1041,24 @@ <h1>dpnp.dpnp_array.dpnp_array.asnumpy<a class="headerlink" href="#dpnp-dpnp-arr
10411041
<p>method</p>
10421042
<dl class="py method">
10431043
<dt class="sig sig-object py" id="dpnp.dpnp_array.dpnp_array.asnumpy">
1044-
<span class="sig-prename descclassname"><span class="pre">dpnp_array.</span></span><span class="sig-name descname"><span class="pre">asnumpy</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="reference internal" href="../../_modules/dpnp/dpnp_array.html#dpnp_array.asnumpy"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#dpnp.dpnp_array.dpnp_array.asnumpy" title="Link to this definition"></a></dt>
1044+
<span class="sig-prename descclassname"><span class="pre">dpnp_array.</span></span><span class="sig-name descname"><span class="pre">asnumpy</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">order</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">'C'</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../../_modules/dpnp/dpnp_array.html#dpnp_array.asnumpy"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#dpnp.dpnp_array.dpnp_array.asnumpy" title="Link to this definition"></a></dt>
10451045
<dd><p>Copy content of the array into <a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v2.5)"><code class="xref py py-class docutils literal notranslate"><span class="pre">numpy.ndarray</span></code></a> instance of
10461046
the same shape and data type.</p>
10471047
<dl class="field-list simple">
1048-
<dt class="field-odd">Returns<span class="colon">:</span></dt>
1049-
<dd class="field-odd"><p><strong>out</strong> -- An instance of <a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v2.5)"><code class="xref py py-class docutils literal notranslate"><span class="pre">numpy.ndarray</span></code></a> populated with the array
1048+
<dt class="field-odd">Parameters<span class="colon">:</span></dt>
1049+
<dd class="field-odd"><p><strong>order</strong> (<em>{None</em><em>, </em><em>'C'</em><em>, </em><em>'F'</em><em>, </em><em>'A'</em><em>, </em><em>'K'}</em><em>, </em><em>optional</em>) -- <p>The desired memory layout of the converted array.
1050+
When <cite>order</cite> is <code class="docutils literal notranslate"><span class="pre">'A'</span></code>, it uses <code class="docutils literal notranslate"><span class="pre">'F'</span></code> if the array is
1051+
column-major and uses <code class="docutils literal notranslate"><span class="pre">'C'</span></code> otherwise. And when <cite>order</cite> is
1052+
<code class="docutils literal notranslate"><span class="pre">'K'</span></code>, it keeps strides as closely as possible.</p>
1053+
<p>Default: <code class="docutils literal notranslate"><span class="pre">'C'</span></code>.</p>
1054+
</p>
1055+
</dd>
1056+
<dt class="field-even">Returns<span class="colon">:</span></dt>
1057+
<dd class="field-even"><p><strong>out</strong> -- An instance of <a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v2.5)"><code class="xref py py-class docutils literal notranslate"><span class="pre">numpy.ndarray</span></code></a> populated with the array
10501058
content.</p>
10511059
</dd>
1052-
<dt class="field-even">Return type<span class="colon">:</span></dt>
1053-
<dd class="field-even"><p><a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v2.5)">numpy.ndarray</a></p>
1060+
<dt class="field-odd">Return type<span class="colon">:</span></dt>
1061+
<dd class="field-odd"><p><a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v2.5)">numpy.ndarray</a></p>
10541062
</dd>
10551063
</dl>
10561064
</dd></dl>

reference/generated/dpnp.ndarray.asnumpy.html

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,16 +1041,24 @@ <h1>dpnp.ndarray.asnumpy<a class="headerlink" href="#dpnp-ndarray-asnumpy" title
10411041
<p>method</p>
10421042
<dl class="py method">
10431043
<dt class="sig sig-object py" id="dpnp.ndarray.asnumpy">
1044-
<span class="sig-prename descclassname"><span class="pre">ndarray.</span></span><span class="sig-name descname"><span class="pre">asnumpy</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#dpnp.ndarray.asnumpy" title="Link to this definition"></a></dt>
1044+
<span class="sig-prename descclassname"><span class="pre">ndarray.</span></span><span class="sig-name descname"><span class="pre">asnumpy</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">order</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">'C'</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#dpnp.ndarray.asnumpy" title="Link to this definition"></a></dt>
10451045
<dd><p>Copy content of the array into <a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v2.5)"><code class="xref py py-class docutils literal notranslate"><span class="pre">numpy.ndarray</span></code></a> instance of
10461046
the same shape and data type.</p>
10471047
<dl class="field-list simple">
1048-
<dt class="field-odd">Returns<span class="colon">:</span></dt>
1049-
<dd class="field-odd"><p><strong>out</strong> -- An instance of <a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v2.5)"><code class="xref py py-class docutils literal notranslate"><span class="pre">numpy.ndarray</span></code></a> populated with the array
1048+
<dt class="field-odd">Parameters<span class="colon">:</span></dt>
1049+
<dd class="field-odd"><p><strong>order</strong> (<em>{None</em><em>, </em><em>'C'</em><em>, </em><em>'F'</em><em>, </em><em>'A'</em><em>, </em><em>'K'}</em><em>, </em><em>optional</em>) -- <p>The desired memory layout of the converted array.
1050+
When <cite>order</cite> is <code class="docutils literal notranslate"><span class="pre">'A'</span></code>, it uses <code class="docutils literal notranslate"><span class="pre">'F'</span></code> if the array is
1051+
column-major and uses <code class="docutils literal notranslate"><span class="pre">'C'</span></code> otherwise. And when <cite>order</cite> is
1052+
<code class="docutils literal notranslate"><span class="pre">'K'</span></code>, it keeps strides as closely as possible.</p>
1053+
<p>Default: <code class="docutils literal notranslate"><span class="pre">'C'</span></code>.</p>
1054+
</p>
1055+
</dd>
1056+
<dt class="field-even">Returns<span class="colon">:</span></dt>
1057+
<dd class="field-even"><p><strong>out</strong> -- An instance of <a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v2.5)"><code class="xref py py-class docutils literal notranslate"><span class="pre">numpy.ndarray</span></code></a> populated with the array
10501058
content.</p>
10511059
</dd>
1052-
<dt class="field-even">Return type<span class="colon">:</span></dt>
1053-
<dd class="field-even"><p><a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v2.5)">numpy.ndarray</a></p>
1060+
<dt class="field-odd">Return type<span class="colon">:</span></dt>
1061+
<dd class="field-odd"><p><a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.ndarray.html#numpy.ndarray" title="(in NumPy v2.5)">numpy.ndarray</a></p>
10541062
</dd>
10551063
</dl>
10561064
</dd></dl>

searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)