[oneMKL] Interface sparse_optimize_* routines

Author: amontoison

deps/src/onemkl.cpp

@@ -4146,7 +4146,6 @@ extern "C" int onemklZsparse_update_diagonal_values(syclQueue_t device_queue, ma
 
 extern "C" int onemklXsparse_optimize_gemv(syclQueue_t device_queue, onemklTranspose opA, matrix_handle_t A) {
    auto status = oneapi::mkl::sparse::optimize_gemv(device_queue->val, convert(opA), (oneapi::mkl::sparse::matrix_handle_t) A, {});
-   __FORCE_MKL_FLUSH__(status);
    return 0;
 }
 

lib/mkl/wrappers_sparse.jl

@@ -57,6 +57,12 @@ for (fname, elty) in ((:onemklSsparse_gemv, :Float32),
     end
 end
 
+function sparse_optimize_gemv!(trans::Char, A::oneSparseMatrixCSR)
+    queue = global_queue(context(A.nzVal), device(A.nzVal))
+    onemklXsparse_optimize_gemv(sycl_queue(queue), trans, A.handle)
+    return A
+end
+
 for (fname, elty) in ((:onemklSsparse_gemm, :Float32),
                       (:onemklDsparse_gemm, :Float64),
                       (:onemklCsparse_gemm, :ComplexF32),
@@ -124,6 +130,12 @@ for (fname, elty) in ((:onemklSsparse_trmv, :Float32),
     end
 end
 
+function sparse_optimize_trmv!(uplo::Char, trans::Char, diag::Char, A::oneSparseMatrixCSR)
+    queue = global_queue(context(A.nzVal), device(A.nzVal))
+    onemklXsparse_optimize_trmv(sycl_queue(queue), uplo, trans, diag, A.handle)
+    return A
+end
+
 for (fname, elty) in ((:onemklSsparse_trsv, :Float32),
                       (:onemklDsparse_trsv, :Float64),
                       (:onemklCsparse_trsv, :ComplexF32),
@@ -142,3 +154,9 @@ for (fname, elty) in ((:onemklSsparse_trsv, :Float32),
         end
     end
 end
+
+function sparse_optimize_trsv!(uplo::Char, trans::Char, diag::Char, A::oneSparseMatrixCSR)
+    queue = global_queue(context(A.nzVal), device(A.nzVal))
+    onemklXsparse_optimize_trsv(sycl_queue(queue), uplo, trans, diag, A.handle)
+    return A
+end

test/onemkl.jl

@@ -1100,6 +1100,7 @@ end
 
                 alpha = rand(T)
                 beta = rand(T)
+                oneMKL.sparse_optimize_gemv!(transa, dA)
                 oneMKL.sparse_gemv!(transa, alpha, dA, dx, beta, dy)
                 # @test alpha * opa(A) * x + beta * y ≈ collect(dy)
             end
@@ -1160,6 +1161,8 @@ end
 
                     alpha = rand(T)
                     beta = rand(T)
+
+                    oneMKL.sparse_optimize_trmv!(uplo, transa, diag, dA)
                     oneMKL.sparse_trmv!(uplo, transa, diag, alpha, dA, dx, beta, dy)
                     @test alpha * wrapper(opa(A)) * x + beta * y ≈ collect(dy)
                 end
@@ -1182,6 +1185,7 @@ end
                     dx = oneVector{T}(x)
                     dy = oneVector{T}(y)
 
+                    oneMKL.sparse_optimize_trsv!(uplo, transa, diag, dA)
                     oneMKL.sparse_trsv!(uplo, transa, diag, dA, dx, dy)
                     y = wrapper(opa(A)) \ x
                     @test y ≈ collect(dy)