Skip to content

Commit e03c5c7

Browse files
authored
Fix a typo in generate_interfaces.jl (#482)
1 parent 129adee commit e03c5c7

File tree

3 files changed

+36
-2
lines changed

3 files changed

+36
-2
lines changed

deps/generate_interfaces.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ version_types_header = Dict{Char, String}('S' => "float",
2525
comments = ["namespace", "#", "}", "/*", "*", "//", "[[", "ONEMKL_DECLARE_", "ONEMKL_INLINE_DECLARE"]
2626

2727
void_output = ["init_matrix_handle", "init_matmat_descr", "release_matmat_descr", "set_matmat_data",
28-
"get_matmat_data", "init_omatadd_descr", "init_omatconvert_desc"]
28+
"get_matmat_data", "init_omatadd_descr", "init_omatconvert_descr"]
2929

3030
function generate_headers(library::String, filename::Vector{String}, output::String; pattern::String="")
3131
routines = Dict{String,Int}()
@@ -66,6 +66,9 @@ function generate_headers(library::String, filename::Vector{String}, output::Str
6666
occursin("release_matrix_handle(matrix_handle_t", header) && continue # SPARSE routine
6767
occursin("get_matmat_data", header) && continue # SPARSE routine
6868
occursin("matmat(", header) && continue # SPARSE routine
69+
bool = occursin("release", header) || occursin("init", header)
70+
(library == "sparse") && occursin("omatconvert", header) && !bool && continue # SPARSE routine
71+
(library == "sparse") && occursin("omatadd", header) && !bool && continue # SPARSE routine
6972
occursin("gemm_bias", header) && continue # BLAS routine
7073
occursin("getri_batch", header) && occursin("ldainv", header) && continue # LAPACK routine
7174

@@ -249,7 +252,6 @@ function generate_headers(library::String, filename::Vector{String}, output::Str
249252
(version == 'C') && (header = replace(header, "std::complex " => "float _Complex "))
250253
(version == 'Z') && (header = replace(header, "std::complex " => "double _Complex "))
251254
end
252-
header = replace(header, "omatconvert (" => "omatconvert(")
253255
header = replace(header, "transpose " => "onemklTranspose ")
254256
header = replace(header, "uplo " => "onemklUplo ")
255257
header = replace(header, "diag " => "onemklDiag ")

deps/src/onemkl.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3973,6 +3973,26 @@ extern "C" int onemklXsparse_release_matmat_descr(matmat_descr_t *p_desc) {
39733973
return 0;
39743974
}
39753975

3976+
extern "C" int onemklXsparse_init_omatconvert_descr(syclQueue_t device_queue, omatconvert_descr_t *p_descr) {
3977+
oneapi::mkl::sparse::init_omatconvert_descr(device_queue->val, (oneapi::mkl::sparse::omatconvert_descr_t*) p_descr);
3978+
return 0;
3979+
}
3980+
3981+
extern "C" int onemklXsparse_release_omatconvert_descr(syclQueue_t device_queue, omatconvert_descr_t descr) {
3982+
auto status = oneapi::mkl::sparse::release_omatconvert_descr(device_queue->val, (oneapi::mkl::sparse::omatconvert_descr_t) descr, {});
3983+
return 0;
3984+
}
3985+
3986+
extern "C" int onemklXsparse_init_omatadd_descr(syclQueue_t device_queue, omatadd_descr_t *p_omatadd_desc) {
3987+
oneapi::mkl::sparse::init_omatadd_descr(device_queue->val, (oneapi::mkl::sparse::omatadd_descr_t*) p_omatadd_desc);
3988+
return 0;
3989+
}
3990+
3991+
extern "C" int onemklXsparse_release_omatadd_descr(syclQueue_t device_queue, omatadd_descr_t omatadd_desc) {
3992+
auto status = oneapi::mkl::sparse::release_omatadd_descr(device_queue->val, (oneapi::mkl::sparse::omatadd_descr_t) omatadd_desc, {});
3993+
return 0;
3994+
}
3995+
39763996
extern "C" int onemklXsparse_omatcopy(syclQueue_t device_queue, onemklTranspose transpose_val, matrix_handle_t spMat_in, matrix_handle_t spMat_out) {
39773997
auto status = oneapi::mkl::sparse::omatcopy(device_queue->val, convert(transpose_val), (oneapi::mkl::sparse::matrix_handle_t) spMat_in, (oneapi::mkl::sparse::matrix_handle_t) spMat_out, {});
39783998
return 0;

deps/src/onemkl.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2804,6 +2804,18 @@ int onemklXsparse_init_matmat_descr(matmat_descr_t *p_desc);
28042804

28052805
int onemklXsparse_release_matmat_descr(matmat_descr_t *p_desc);
28062806

2807+
int onemklXsparse_init_omatconvert_descr(syclQueue_t device_queue, omatconvert_descr_t
2808+
*p_descr);
2809+
2810+
int onemklXsparse_release_omatconvert_descr(syclQueue_t device_queue, omatconvert_descr_t
2811+
descr);
2812+
2813+
int onemklXsparse_init_omatadd_descr(syclQueue_t device_queue, omatadd_descr_t
2814+
*p_omatadd_desc);
2815+
2816+
int onemklXsparse_release_omatadd_descr(syclQueue_t device_queue, omatadd_descr_t
2817+
omatadd_desc);
2818+
28072819
int onemklXsparse_omatcopy(syclQueue_t device_queue, onemklTranspose transpose_val,
28082820
matrix_handle_t spMat_in, matrix_handle_t spMat_out);
28092821

0 commit comments

Comments
 (0)