Merge branch 'master' into update-math-tests

Author: vtavana

.github/workflows/openssf-scorecard.yml

@@ -68,6 +68,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -11,9 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added implementation of `dpnp.hamming` [#2341](https://github.com/IntelPython/dpnp/pull/2341), [#2357](https://github.com/IntelPython/dpnp/pull/2357)
 * Added implementation of `dpnp.hanning` [#2358](https://github.com/IntelPython/dpnp/pull/2358)
 * Added implementation of `dpnp.blackman` [#2363](https://github.com/IntelPython/dpnp/pull/2363)
+* Added implementation of `dpnp.bartlett` [#2366](https://github.com/IntelPython/dpnp/pull/2366)
 
 ### Changed
 
+* Allowed input array of `uint64` dtype in `dpnp.bincount` [#2361](https://github.com/IntelPython/dpnp/pull/2361)
+
 ### Fixed
 
 

doc/reference/math.rst

@@ -232,5 +232,3 @@ Miscellaneous
    dpnp.real_if_close
 
    dpnp.interp
-
-   dpnp.bitwise_count

dpnp/backend/extensions/fft/CMakeLists.txt

@@ -27,8 +27,6 @@
 set(python_module_name _fft_impl)
 set(_module_src
     ${CMAKE_CURRENT_SOURCE_DIR}/fft_py.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/in_place.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/out_of_place.cpp
 )
 
 pybind11_add_module(${python_module_name} MODULE ${_module_src})

dpnp/backend/extensions/fft/in_place.hpp

@@ -42,3 +42,5 @@ std::pair<sycl::event, sycl::event>
                          const std::vector<sycl::event> &depends);
 
 } // namespace dpnp::extensions::fft
+
+#include "in_place.tpp" // Include template definition

dpnp/backend/extensions/fft/in_place.cpp dpnp/backend/extensions/fft/in_place.tppdpnp/backend/extensions/fft/in_place.cpp renamed to dpnp/backend/extensions/fft/in_place.tpp

@@ -23,6 +23,7 @@
 // THE POSSIBILITY OF SUCH DAMAGE.
 //*****************************************************************************
 
+#pragma once
 #include <stdexcept>
 
 #include <oneapi/mkl.hpp>
@@ -32,7 +33,6 @@
 
 #include "common.hpp"
 #include "fft_utils.hpp"
-#include "in_place.hpp"
 // dpctl tensor headers
 #include "utils/output_validation.hpp"
 
@@ -107,21 +107,4 @@ std::pair<sycl::event, sycl::event>
     return std::make_pair(fft_event, args_ev);
 }
 
-// Explicit instantiations
-// single precision c2c FFT
-template std::pair<sycl::event, sycl::event> compute_fft_in_place(
-    DescriptorWrapper<mkl_dft::precision::SINGLE, mkl_dft::domain::COMPLEX>
-        &descr,
-    const dpctl::tensor::usm_ndarray &in_out,
-    const bool is_forward,
-    const std::vector<sycl::event> &depends);
-
-// double precision c2c FFT
-template std::pair<sycl::event, sycl::event> compute_fft_in_place(
-    DescriptorWrapper<mkl_dft::precision::DOUBLE, mkl_dft::domain::COMPLEX>
-        &descr,
-    const dpctl::tensor::usm_ndarray &in_out,
-    const bool is_forward,
-    const std::vector<sycl::event> &depends);
-
 } // namespace dpnp::extensions::fft

dpnp/backend/extensions/fft/out_of_place.hpp

@@ -43,3 +43,5 @@ std::pair<sycl::event, sycl::event>
                              const std::vector<sycl::event> &depends);
 
 } // namespace dpnp::extensions::fft
+
+#include "out_of_place.tpp" // Include template definition

…/backend/extensions/fft/out_of_place.cpp …/backend/extensions/fft/out_of_place.tppdpnp/backend/extensions/fft/out_of_place.cpp renamed to dpnp/backend/extensions/fft/out_of_place.tpp dpnp/backend/extensions/fft/out_of_place.cpp renamed to dpnp/backend/extensions/fft/out_of_place.tpp

@@ -23,6 +23,7 @@
 // THE POSSIBILITY OF SUCH DAMAGE.
 //*****************************************************************************
 
+#pragma once
 #include <stdexcept>
 
 #include <oneapi/mkl.hpp>
@@ -32,7 +33,6 @@
 
 #include "common.hpp"
 #include "fft_utils.hpp"
-#include "out_of_place.hpp"
 // dpctl tensor headers
 #include "utils/memory_overlap.hpp"
 #include "utils/output_validation.hpp"
@@ -167,38 +167,4 @@ std::pair<sycl::event, sycl::event>
     return std::make_pair(fft_event, args_ev);
 }
 
-// Explicit instantiations
-// single precision c2c FFT
-template std::pair<sycl::event, sycl::event> compute_fft_out_of_place(
-    DescriptorWrapper<mkl_dft::precision::SINGLE, mkl_dft::domain::COMPLEX>
-        &descr,
-    const dpctl::tensor::usm_ndarray &in,
-    const dpctl::tensor::usm_ndarray &out,
-    const bool is_forward,
-    const std::vector<sycl::event> &depends);
-
-// double precision c2c FFT
-template std::pair<sycl::event, sycl::event> compute_fft_out_of_place(
-    DescriptorWrapper<mkl_dft::precision::DOUBLE, mkl_dft::domain::COMPLEX>
-        &descr,
-    const dpctl::tensor::usm_ndarray &in,
-    const dpctl::tensor::usm_ndarray &out,
-    const bool is_forward,
-    const std::vector<sycl::event> &depends);
-
-// single precision r2c/c2r FFT
-template std::pair<sycl::event, sycl::event> compute_fft_out_of_place(
-    DescriptorWrapper<mkl_dft::precision::SINGLE, mkl_dft::domain::REAL> &descr,
-    const dpctl::tensor::usm_ndarray &in,
-    const dpctl::tensor::usm_ndarray &out,
-    const bool is_forward,
-    const std::vector<sycl::event> &depends);
-
-// double precision r2c/c2r FFT
-template std::pair<sycl::event, sycl::event> compute_fft_out_of_place(
-    DescriptorWrapper<mkl_dft::precision::DOUBLE, mkl_dft::domain::REAL> &descr,
-    const dpctl::tensor::usm_ndarray &in,
-    const dpctl::tensor::usm_ndarray &out,
-    const bool is_forward,
-    const std::vector<sycl::event> &depends);
 } // namespace dpnp::extensions::fft

dpnp/backend/extensions/lapack/gesv.cpp

@@ -144,6 +144,16 @@ static sycl::event gesv_impl(sycl::queue &exec_q,
         is_exception_caught = true;
         gesv_utils::handle_lapack_exc(exec_q, lda, a, scratchpad_size,
                                       scratchpad, ipiv, e, error_msg);
+    } catch (oneapi::mkl::computation_error const &e) {
+        // TODO: remove this catch when gh-642(oneMath) is fixed
+        // Workaround for oneMath interfaces
+        // oneapi::mkl::computation_error is thrown instead of
+        // oneapi::mkl::lapack::computation_error.
+        if (scratchpad != nullptr)
+            sycl_free_noexcept(scratchpad, exec_q);
+        if (ipiv != nullptr)
+            sycl_free_noexcept(ipiv, exec_q);
+        throw LinAlgError("The input coefficient matrix is singular.");
     } catch (sycl::exception const &e) {
         is_exception_caught = true;
         error_msg << "Unexpected SYCL exception caught during getrf() or "

dpnp/backend/extensions/lapack/gesvd.cpp

@@ -95,12 +95,12 @@ static sycl::event gesvd_impl(sycl::queue &exec_q,
             exec_q,
             jobu,  // Character specifying how to compute the matrix U:
                    // 'A' computes all columns of U,
-                   // 'S' computes the first min(m,n) columns of U,
+                   // 'S' computes the first min(m, n) columns of U,
                    // 'O' overwrites A with the columns of U,
                    // 'N' does not compute U.
             jobvt, // Character specifying how to compute the matrix VT:
                    // 'A' computes all rows of VT,
-                   // 'S' computes the first min(m,n) rows of VT,
+                   // 'S' computes the first min(m, n) rows of VT,
                    // 'O' overwrites A with the rows of VT,
                    // 'N' does not compute VT.
             m,     // The number of rows in the input matrix A (0 <= m).