Merge branch 'master' into use_dpctl_bitwise_op

IntelPython · Aug 9, 2023 · d2cd551 · d2cd551
2 parents 6333985 + 2f235bf
commit d2cd551
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,8 +45,8 @@ include(GNUInstallDirs)
 include(FetchContent)
 FetchContent_Declare(
   pybind11
-  URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.2.tar.gz
-  URL_HASH SHA256=93bd1e625e43e03028a3ea7389bba5d3f9f2596abc074b068e70f4ef9b1314ae
+  URL https://github.com/pybind/pybind11/archive/refs/tags/v2.11.1.tar.gz
+  URL_HASH SHA256=d475978da0cdc2d43b73f30910786759d593a9d8ee05b1b6846d1eb16c6d2e0c
 )
 FetchContent_MakeAvailable(pybind11)
 

diff --git a/dpnp/backend/kernels/dpnp_krnl_common.cpp b/dpnp/backend/kernels/dpnp_krnl_common.cpp
@@ -851,17 +851,18 @@ DPCTLSyclEventRef dpnp_matmul_c(DPCTLSyclQueueRef q_ref,
                   std::is_same<_DataType, float>::value)
     {
         // using std::max for these ldx variables is required by math library
-        const std::int64_t lda =
-            std::max<size_t>(1UL, size_k); // First dimensions of array_1
-        const std::int64_t ldb =
+        const std::int64_t ld_array_2 =
             std::max<size_t>(1UL, size_n); // First dimensions of array_2
-        const std::int64_t ldc =
+        const std::int64_t ld_array_1 =
+            std::max<size_t>(1UL, size_k); // First dimensions of array_1
+        const std::int64_t ld_result =
             std::max<size_t>(1UL, size_n); // Fast dimensions of result
 
         event = mkl_blas::gemm(q, oneapi::mkl::transpose::nontrans,
                                oneapi::mkl::transpose::nontrans, size_n, size_m,
-                               size_k, _DataType(1), array_2, ldb, array_1, lda,
-                               _DataType(0), result, ldc, dep_events);
+                               size_k, _DataType(1), array_2, ld_array_2,
+                               array_1, ld_array_1, _DataType(0), result,
+                               ld_result, dep_events);
     }
     else {
         // input1: M x K