Deploying to main from @ AMReX-Codes/amrex@292e9ab 🚀

Author: WeiqunZhang

amrex/docs_html/_downloads/008eb6dbfab802633dff40122ece848c/amrex.pdf

@@ -511,7 +511,7 @@
 <div class="line"><a id="l00402" name="l00402"></a><span class="lineno">  402</span>        strides[0] = 0;</div>
 <div class="line"><a id="l00403" name="l00403"></a><span class="lineno">  403</span>        strides[ndims] = 1;</div>
 <div class="line"><a id="l00404" name="l00404"></a><span class="lineno">  404</span>        <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i = ndims-1; i &gt;= 1; --i) {</div>
-<div class="line"><a id="l00405" name="l00405"></a><span class="lineno">  405</span>            strides[i] = strides[i+1] * len[ndims-1-i];</div>
+<div class="line"><a id="l00405" name="l00405"></a><span class="lineno">  405</span>            strides[i] = strides[i+1] * len[i];</div>
 <div class="line"><a id="l00406" name="l00406"></a><span class="lineno">  406</span>        }</div>
 <div class="line"><a id="l00407" name="l00407"></a><span class="lineno">  407</span><span class="preprocessor">#ifndef AMREX_USE_MKL_DFTI_2024</span></div>
 <div class="line"><a id="l00408" name="l00408"></a><span class="lineno">  408</span>        <a class="code hl_variable" href="AMReX__HypreIJIface_8cpp.html#a0f759ac05320ca5b06c49fd9501b9135">pp</a>-&gt;set_value(oneapi::mkl::dft::config_param::FWD_STRIDES, strides);</div>

amrex/docs_html/doxygen/AMReX__FFT__Helper_8H_source.html

@@ -276,44 +276,48 @@
 <div class="line"><a id="l00171" name="l00171"></a><span class="lineno">  171</span> </div>
 <div class="line"><a id="l00172" name="l00172"></a><span class="lineno">  172</span>    <a class="code hl_function" href="namespaceamrex.html#a0a525af3444a2814c6dbda9e71a965a5">amrex::ignore_unused</a>(nnz);</div>
 <div class="line"><a id="l00173" name="l00173"></a><span class="lineno">  173</span>    mkl::sparse::matrix_handle_t handle{};</div>
-<div class="line"><a id="l00174" name="l00174"></a><span class="lineno">  174</span> </div>
-<div class="line"><a id="l00175" name="l00175"></a><span class="lineno">  175</span><span class="preprocessor">#if defined(INTEL_MKL_VERSION) &amp;&amp; (INTEL_MKL_VERSION &lt; 20250300)</span></div>
-<div class="line"><a id="l00176" name="l00176"></a><span class="lineno">  176</span>    mkl::sparse::set_csr_data(Gpu::Device::streamQueue(), handle, nrows, ncols,</div>
-<div class="line"><a id="l00177" name="l00177"></a><span class="lineno">  177</span>                              mkl::index_base::zero, (Long*)row, (Long*)col, (T*)mat);</div>
-<div class="line"><a id="l00178" name="l00178"></a><span class="lineno">  178</span><span class="preprocessor">#else</span></div>
-<div class="line"><a id="l00179" name="l00179"></a><span class="lineno">  179</span>    mkl::sparse::set_csr_data(Gpu::Device::streamQueue(), handle, nrows, ncols, nnz,</div>
-<div class="line"><a id="l00180" name="l00180"></a><span class="lineno">  180</span>                              mkl::index_base::zero, (Long*)row, (Long*)col, (T*)mat);</div>
-<div class="line"><a id="l00181" name="l00181"></a><span class="lineno">  181</span><span class="preprocessor">#endif</span></div>
-<div class="line"><a id="l00182" name="l00182"></a><span class="lineno">  182</span>    mkl::sparse::gemv(Gpu::Device::streamQueue(), mkl::transpose::nontrans,</div>
-<div class="line"><a id="l00183" name="l00183"></a><span class="lineno">  183</span>                      T(1), handle, px, T(0), py);</div>
-<div class="line"><a id="l00184" name="l00184"></a><span class="lineno">  184</span> </div>
-<div class="line"><a id="l00185" name="l00185"></a><span class="lineno">  185</span><span class="preprocessor">#endif</span></div>
-<div class="line"><a id="l00186" name="l00186"></a><span class="lineno">  186</span> </div>
-<div class="line"><a id="l00187" name="l00187"></a><span class="lineno">  187</span>    <a class="code hl_define" href="AMReX__GpuError_8H.html#aff2d29ad26ba217734430c3d36f42dd1">AMREX_GPU_ERROR_CHECK</a>();</div>
+<div class="line"><a id="l00174" name="l00174"></a><span class="lineno">  174</span>    mkl::sparse::init_matrix_handle(&amp;handle);</div>
+<div class="line"><a id="l00175" name="l00175"></a><span class="lineno">  175</span> </div>
+<div class="line"><a id="l00176" name="l00176"></a><span class="lineno">  176</span><span class="preprocessor">#if defined(INTEL_MKL_VERSION) &amp;&amp; (INTEL_MKL_VERSION &lt; 20250300)</span></div>
+<div class="line"><a id="l00177" name="l00177"></a><span class="lineno">  177</span>    mkl::sparse::set_csr_data(Gpu::Device::streamQueue(), handle, nrows, ncols,</div>
+<div class="line"><a id="l00178" name="l00178"></a><span class="lineno">  178</span>                              mkl::index_base::zero, (Long*)row, (Long*)col, (T*)mat);</div>
+<div class="line"><a id="l00179" name="l00179"></a><span class="lineno">  179</span><span class="preprocessor">#else</span></div>
+<div class="line"><a id="l00180" name="l00180"></a><span class="lineno">  180</span>    mkl::sparse::set_csr_data(Gpu::Device::streamQueue(), handle, nrows, ncols, nnz,</div>
+<div class="line"><a id="l00181" name="l00181"></a><span class="lineno">  181</span>                              mkl::index_base::zero, (Long*)row, (Long*)col, (T*)mat);</div>
+<div class="line"><a id="l00182" name="l00182"></a><span class="lineno">  182</span><span class="preprocessor">#endif</span></div>
+<div class="line"><a id="l00183" name="l00183"></a><span class="lineno">  183</span>    mkl::sparse::gemv(Gpu::Device::streamQueue(), mkl::transpose::nontrans,</div>
+<div class="line"><a id="l00184" name="l00184"></a><span class="lineno">  184</span>                      T(1), handle, px, T(0), py);</div>
+<div class="line"><a id="l00185" name="l00185"></a><span class="lineno">  185</span> </div>
+<div class="line"><a id="l00186" name="l00186"></a><span class="lineno">  186</span>    <span class="keyword">auto</span> ev = mkl::sparse::release_matrix_handle(Gpu::Device::streamQueue(), &amp;handle);</div>
+<div class="line"><a id="l00187" name="l00187"></a><span class="lineno">  187</span>    ev.wait();</div>
 <div class="line"><a id="l00188" name="l00188"></a><span class="lineno">  188</span> </div>
-<div class="line"><a id="l00189" name="l00189"></a><span class="lineno">  189</span><span class="preprocessor">#else</span></div>
+<div class="line"><a id="l00189" name="l00189"></a><span class="lineno">  189</span><span class="preprocessor">#endif</span></div>
 <div class="line"><a id="l00190" name="l00190"></a><span class="lineno">  190</span> </div>
-<div class="line"><a id="l00191" name="l00191"></a><span class="lineno">  191</span>    Long <span class="keyword">const</span> ny = <a class="code hl_enumvalue" href="namespaceamrex.html#a8de829410ed15dbc56e4dafc9bc6ea69a415290769594460e2e485922904f345d">y</a>.numLocalRows();</div>
-<div class="line"><a id="l00192" name="l00192"></a><span class="lineno">  192</span>    <span class="keywordflow">for</span> (Long i = 0; i &lt; ny; ++i) {</div>
-<div class="line"><a id="l00193" name="l00193"></a><span class="lineno">  193</span>        T <a class="code hl_enumvalue" href="namespaceamrex.html#a2b273526dd4d27047e455ab7a5a8dcd3a4b43b0aee35624cd95b910189b3dc231">r</a> = 0;</div>
-<div class="line"><a id="l00194" name="l00194"></a><span class="lineno">  194</span><span class="preprocessor">#ifdef AMREX_USE_OMP</span></div>
-<div class="line"><a id="l00195" name="l00195"></a><span class="lineno">  195</span><span class="preprocessor">#pragma omp parallel for reduction(+:r)</span></div>
-<div class="line"><a id="l00196" name="l00196"></a><span class="lineno">  196</span><span class="preprocessor">#endif</span></div>
-<div class="line"><a id="l00197" name="l00197"></a><span class="lineno">  197</span>        <span class="keywordflow">for</span> (Long j = row[i]; j &lt; row[i+1]; ++j) {</div>
-<div class="line"><a id="l00198" name="l00198"></a><span class="lineno">  198</span>            <a class="code hl_enumvalue" href="namespaceamrex.html#a2b273526dd4d27047e455ab7a5a8dcd3a4b43b0aee35624cd95b910189b3dc231">r</a> += mat[j] * px[col[j]];</div>
-<div class="line"><a id="l00199" name="l00199"></a><span class="lineno">  199</span>        }</div>
-<div class="line"><a id="l00200" name="l00200"></a><span class="lineno">  200</span>        py[i] = <a class="code hl_enumvalue" href="namespaceamrex.html#a2b273526dd4d27047e455ab7a5a8dcd3a4b43b0aee35624cd95b910189b3dc231">r</a>;</div>
-<div class="line"><a id="l00201" name="l00201"></a><span class="lineno">  201</span>    }</div>
-<div class="line"><a id="l00202" name="l00202"></a><span class="lineno">  202</span> </div>
-<div class="line"><a id="l00203" name="l00203"></a><span class="lineno">  203</span><span class="preprocessor">#endif</span></div>
-<div class="line"><a id="l00204" name="l00204"></a><span class="lineno">  204</span> </div>
-<div class="line"><a id="l00205" name="l00205"></a><span class="lineno">  205</span>    <span class="keyword">const_cast&lt;</span><a class="code hl_class" href="classamrex_1_1SpMatrix.html">SpMatrix&lt;T&gt;</a>&amp;<span class="keyword">&gt;</span>(A).finishComm(<a class="code hl_enumvalue" href="namespaceamrex.html#a8de829410ed15dbc56e4dafc9bc6ea69a415290769594460e2e485922904f345d">y</a>);</div>
-<div class="line"><a id="l00206" name="l00206"></a><span class="lineno">  206</span>}</div>
+<div class="line"><a id="l00191" name="l00191"></a><span class="lineno">  191</span>    <a class="code hl_define" href="AMReX__GpuError_8H.html#aff2d29ad26ba217734430c3d36f42dd1">AMREX_GPU_ERROR_CHECK</a>();</div>
+<div class="line"><a id="l00192" name="l00192"></a><span class="lineno">  192</span> </div>
+<div class="line"><a id="l00193" name="l00193"></a><span class="lineno">  193</span><span class="preprocessor">#else</span></div>
+<div class="line"><a id="l00194" name="l00194"></a><span class="lineno">  194</span> </div>
+<div class="line"><a id="l00195" name="l00195"></a><span class="lineno">  195</span>    Long <span class="keyword">const</span> ny = <a class="code hl_enumvalue" href="namespaceamrex.html#a8de829410ed15dbc56e4dafc9bc6ea69a415290769594460e2e485922904f345d">y</a>.numLocalRows();</div>
+<div class="line"><a id="l00196" name="l00196"></a><span class="lineno">  196</span>    <span class="keywordflow">for</span> (Long i = 0; i &lt; ny; ++i) {</div>
+<div class="line"><a id="l00197" name="l00197"></a><span class="lineno">  197</span>        T <a class="code hl_enumvalue" href="namespaceamrex.html#a2b273526dd4d27047e455ab7a5a8dcd3a4b43b0aee35624cd95b910189b3dc231">r</a> = 0;</div>
+<div class="line"><a id="l00198" name="l00198"></a><span class="lineno">  198</span><span class="preprocessor">#ifdef AMREX_USE_OMP</span></div>
+<div class="line"><a id="l00199" name="l00199"></a><span class="lineno">  199</span><span class="preprocessor">#pragma omp parallel for reduction(+:r)</span></div>
+<div class="line"><a id="l00200" name="l00200"></a><span class="lineno">  200</span><span class="preprocessor">#endif</span></div>
+<div class="line"><a id="l00201" name="l00201"></a><span class="lineno">  201</span>        <span class="keywordflow">for</span> (Long j = row[i]; j &lt; row[i+1]; ++j) {</div>
+<div class="line"><a id="l00202" name="l00202"></a><span class="lineno">  202</span>            <a class="code hl_enumvalue" href="namespaceamrex.html#a2b273526dd4d27047e455ab7a5a8dcd3a4b43b0aee35624cd95b910189b3dc231">r</a> += mat[j] * px[col[j]];</div>
+<div class="line"><a id="l00203" name="l00203"></a><span class="lineno">  203</span>        }</div>
+<div class="line"><a id="l00204" name="l00204"></a><span class="lineno">  204</span>        py[i] = <a class="code hl_enumvalue" href="namespaceamrex.html#a2b273526dd4d27047e455ab7a5a8dcd3a4b43b0aee35624cd95b910189b3dc231">r</a>;</div>
+<div class="line"><a id="l00205" name="l00205"></a><span class="lineno">  205</span>    }</div>
+<div class="line"><a id="l00206" name="l00206"></a><span class="lineno">  206</span> </div>
+<div class="line"><a id="l00207" name="l00207"></a><span class="lineno">  207</span><span class="preprocessor">#endif</span></div>
+<div class="line"><a id="l00208" name="l00208"></a><span class="lineno">  208</span> </div>
+<div class="line"><a id="l00209" name="l00209"></a><span class="lineno">  209</span>    <span class="keyword">const_cast&lt;</span><a class="code hl_class" href="classamrex_1_1SpMatrix.html">SpMatrix&lt;T&gt;</a>&amp;<span class="keyword">&gt;</span>(A).finishComm(<a class="code hl_enumvalue" href="namespaceamrex.html#a8de829410ed15dbc56e4dafc9bc6ea69a415290769594460e2e485922904f345d">y</a>);</div>
+<div class="line"><a id="l00210" name="l00210"></a><span class="lineno">  210</span>}</div>
 </div>
-<div class="line"><a id="l00207" name="l00207"></a><span class="lineno">  207</span> </div>
-<div class="line"><a id="l00208" name="l00208"></a><span class="lineno">  208</span>}</div>
-<div class="line"><a id="l00209" name="l00209"></a><span class="lineno">  209</span> </div>
-<div class="line"><a id="l00210" name="l00210"></a><span class="lineno">  210</span><span class="preprocessor">#endif</span></div>
+<div class="line"><a id="l00211" name="l00211"></a><span class="lineno">  211</span> </div>
+<div class="line"><a id="l00212" name="l00212"></a><span class="lineno">  212</span>}</div>
+<div class="line"><a id="l00213" name="l00213"></a><span class="lineno">  213</span> </div>
+<div class="line"><a id="l00214" name="l00214"></a><span class="lineno">  214</span><span class="preprocessor">#endif</span></div>
 <div class="ttc" id="aAMReX__AlgVector_8H_html"><div class="ttname"><a href="AMReX__AlgVector_8H.html">AMReX_AlgVector.H</a></div></div>
 <div class="ttc" id="aAMReX__BLassert_8H_html_abd471ebf6086189835e778f06c053833"><div class="ttname"><a href="AMReX__BLassert_8H.html#abd471ebf6086189835e778f06c053833">AMREX_ALWAYS_ASSERT</a></div><div class="ttdeci">#define AMREX_ALWAYS_ASSERT(EX)</div><div class="ttdef"><b>Definition</b> AMReX_BLassert.H:50</div></div>
 <div class="ttc" id="aAMReX__Extension_8H_html_a97eafbdde3320b2e8981a1d1d3936f58"><div class="ttname"><a href="AMReX__Extension_8H.html#a97eafbdde3320b2e8981a1d1d3936f58">AMREX_RESTRICT</a></div><div class="ttdeci">#define AMREX_RESTRICT</div><div class="ttdef"><b>Definition</b> AMReX_Extension.H:37</div></div>

amrex/docs_html/doxygen/AMReX__SpMV_8H_source.html

@@ -2632,7 +2632,7 @@
 <codeline lineno="402"><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>strides[0]<sp/>=<sp/>0;</highlight></codeline>
 <codeline lineno="403"><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>strides[ndims]<sp/>=<sp/>1;</highlight></codeline>
 <codeline lineno="404"><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal"><sp/>(</highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>i<sp/>=<sp/>ndims-1;<sp/>i<sp/>&gt;=<sp/>1;<sp/>--i)<sp/>{</highlight></codeline>
-<codeline lineno="405"><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>strides[i]<sp/>=<sp/>strides[i+1]<sp/>*<sp/>len[ndims-1-i];</highlight></codeline>
+<codeline lineno="405"><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>strides[i]<sp/>=<sp/>strides[i+1]<sp/>*<sp/>len[i];</highlight></codeline>
 <codeline lineno="406"><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>}</highlight></codeline>
 <codeline lineno="407"><highlight class="normal"></highlight><highlight class="preprocessor">#ifndef<sp/>AMREX_USE_MKL_DFTI_2024</highlight><highlight class="normal"></highlight></codeline>
 <codeline lineno="408"><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/><ref refid="AMReX__HypreIJIface_8cpp_1a0f759ac05320ca5b06c49fd9501b9135" kindref="member">pp</ref>-&gt;set_value(oneapi::mkl::dft::config_param::FWD_STRIDES,<sp/>strides);</highlight></codeline>