Update oneAPI.jl for the release 2025.2.0

Author: amontoison

.gitignore

@@ -1,2 +1,8 @@
 LocalPreferences.toml
 Manifest.toml
+deps/onemkl_blas.cpp
+deps/onemkl_blas.h
+deps/onemkl_lapack.cpp
+deps/onemkl_lapack.h
+deps/onemkl_sparse.cpp
+deps/onemkl_sparse.h

deps/Project.toml

@@ -12,4 +12,4 @@ oneAPI_Level_Zero_Headers_jll = "f4bc562b-d309-54f8-9efb-476e56f0410d"
 oneAPI_Support_Headers_jll = "24f86df5-245d-5634-a4cc-32433d9800b3"
 
 [compat]
-oneAPI_Support_Headers_jll = "=2025.1.0"
+oneAPI_Support_Headers_jll = "=2025.2.0"

deps/generate_helpers.jl

@@ -1,6 +1,6 @@
 non_parametric_routines = ["init_matrix_handle", "release_matrix_handle", "set_matrix_property",
 "init_matmat_descr", "release_matmat_descr", "set_matmat_data", "get_matmat_data", "matmat",
-"omatcopy", "sort_matrix", "optimize_gemv", "optimize_trmv", "optimize_trsv", "optimize_trsm",
+"omatcopy", "sort_matrix", "optimize_gemv", "optimize_gemm", "optimize_trmv", "optimize_trsv", "optimize_trsm",
 "init_omatconvert_descr", "release_omatconvert_descr", "init_omatadd_descr", "release_omatadd_descr",
 "omatconvert_buffer_size", "omatconvert_analyze", "omatconvert_get_nnz", "omatconvert",
 "omatadd_buffer_size", "omatadd_analyze", "omatadd_get_nnz"]

deps/generate_interfaces.jl

@@ -241,6 +241,7 @@ function generate_headers(library::String, filename::Vector{String}, output::Str
         # The routine "optimize_trsm" has two versions.
         suffix = ""
         (name_routine == "optimize_trsm") && occursin("columns", header) && (suffix = "_advanced")
+        (name_routine == "optimize_gemm") && occursin("columns", header) && (suffix = "_advanced")
         name_routine ∈ ("set_csr_data", "set_coo_data") && occursin("int64_t", header) && (suffix = "_64")
         occursin("batch", name_routine) && !occursin("**", header) && (suffix = "_strided")
 

deps/src/onemkl.cpp

@@ -4038,6 +4038,16 @@ extern "C" int onemklXsparse_optimize_trsv(syclQueue_t device_queue, onemklUplo
    return 0;
 }
 
+extern "C" int onemklXsparse_optimize_gemm(syclQueue_t device_queue, onemklTranspose opA, matrix_handle_t A) {
+   auto status = oneapi::mkl::sparse::optimize_gemm(device_queue->val, convert(opA), (oneapi::mkl::sparse::matrix_handle_t) A, {});
+   return 0;
+}
+
+extern "C" int onemklXsparse_optimize_gemm_advanced(syclQueue_t device_queue, onemklLayout layout_val, onemklTranspose opA, onemklTranspose opB, matrix_handle_t A, int64_t columns) {
+   auto status = oneapi::mkl::sparse::optimize_gemm(device_queue->val, convert(layout_val), convert(opA), convert(opB), (oneapi::mkl::sparse::matrix_handle_t) A, columns, {});
+   return 0;
+}
+
 extern "C" int onemklXsparse_optimize_trsm(syclQueue_t device_queue, onemklUplo uplo_val, onemklTranspose opA, onemklDiag diag_val, matrix_handle_t A) {
    auto status = oneapi::mkl::sparse::optimize_trsm(device_queue->val, convert(uplo_val), convert(opA), convert(diag_val), (oneapi::mkl::sparse::matrix_handle_t) A, {});
    return 0;

deps/src/onemkl.h

@@ -2842,6 +2842,13 @@ int onemklXsparse_optimize_trmv(syclQueue_t device_queue, onemklUplo uplo_val, o
 int onemklXsparse_optimize_trsv(syclQueue_t device_queue, onemklUplo uplo_val, onemklTranspose
                                 opA, onemklDiag diag_val, matrix_handle_t A);
 
+int onemklXsparse_optimize_gemm(syclQueue_t device_queue, onemklTranspose opA, matrix_handle_t
+                                A);
+
+int onemklXsparse_optimize_gemm_advanced(syclQueue_t device_queue, onemklLayout layout_val,
+                                         onemklTranspose opA, onemklTranspose opB,
+                                         matrix_handle_t A, int64_t columns);
+
 int onemklXsparse_optimize_trsm(syclQueue_t device_queue, onemklUplo uplo_val, onemklTranspose
                                 opA, onemklDiag diag_val, matrix_handle_t A);
 

lib/mkl/wrappers_sparse.jl

@@ -127,6 +127,18 @@ for (fname, elty) in ((:onemklSsparse_gemm, :Float32),
     end
 end
 
+function sparse_optimize_gemm!(trans::Char, A::oneSparseMatrixCSR)
+    queue = global_queue(context(A.nzVal), device(A.nzVal))
+    onemklXsparse_optimize_gemm(sycl_queue(queue), trans, A.handle)
+    return A
+end
+
+function sparse_optimize_gemm!(trans::Char, transB::Char, nrhs::Int, A::oneSparseMatrixCSR)
+    queue = global_queue(context(A.nzVal), device(A.nzVal))
+    onemklXsparse_optimize_gemm_advanced(sycl_queue(queue), 'C', trans, transB, A.handle, nrhs)
+    return A
+end
+
 for (fname, elty) in ((:onemklSsparse_symv, :Float32),
                       (:onemklDsparse_symv, :Float64),
                       (:onemklCsparse_symv, :ComplexF32),

test/Project.toml

@@ -18,4 +18,5 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 libigc_jll = "94295238-5935-5bd7-bb0f-b00942e9bdd5"
+oneAPI = "8f75cd03-7ff8-4ecb-9b8f-daf728133b1b"
 oneAPI_Support_jll = "b049733a-a71d-5ed3-8eba-7d323ac00b36"

test/onemkl.jl

@@ -1132,6 +1132,7 @@ end
 
                     alpha = rand(T)
                     beta = rand(T)
+                    oneMKL.sparse_optimize_gemm!(transa, dA)
                     oneMKL.sparse_gemm!(transa, transb, alpha, dA, dB, beta, dC)
                     @test alpha * opa(A) * opb(B) + beta * C ≈ collect(dC)
                 end