Skip to content

Commit

Permalink
Regenerate libmklsparse.jl for MKL_jll.jl v2024.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
amontoison committed Apr 28, 2024
1 parent 4d12ffe commit 29a19f4
Show file tree
Hide file tree
Showing 4 changed files with 950 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"

[compat]
julia = "1.6"
MKL_jll = "2022.2.0"
MKL_jll = "2024.1.0"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
13 changes: 5 additions & 8 deletions gen/rewriter.jl
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
type_modifications = Dict("Cint" => "BlasInt",
"Cfloat" => "Float32",
"Cdouble" => "Float64",
"MKL_Complex8" => "ComplexF32",
"MKL_Complex16" => "ComplexF64")
type_modifications = Dict("Cint" => "BlasInt",
"Cfloat" => "Float32",
"Cdouble" => "Float64",
"MKL_Complex8" => "ComplexF32",
"MKL_Complex16" => "ComplexF64")

function rewrite!(path::String)
text = read(path, String)
for (keys, vals) in type_modifications
text = replace(text, keys => vals)
end
for (keys, vals) in cstring_modifications
text = replace(text, keys => vals)
end
# Note: `job` and `idiag` are vectors in some cases, we must be careful with these two arguments.
for argument in ("job", "m", "n", "k", "job", "nnz", "nnzmax", "lval",
"lb", "mblk", "idiag", "ldabsr", "ndiag", "ldAbsr", "sort",
Expand Down
6 changes: 3 additions & 3 deletions gen/wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ function wrapper(name::String, headers::Vector{String}, optimized::Bool=false)
ignore_list = ["MKL_Complex8", "MKL_Complex16", "MKLVersion", "MKL_INT64",
"MKL_INT", "MKL_UINT", "MKL_UINT8", "MKL_INT8", "MKL_INT16", "MKL_BF16", "MKL_INT32",
"MKL_F16", "MKL_DOMAIN_ALL", "MKL_DOMAIN_BLAS", "MKL_DOMAIN_FFT", "MKL_DOMAIN_VML",
"MKL_DOMAIN_PARDISO", "MKL_DOMAIN_LAPACK", "MKL_CBWR_BRANCH", "MKL_CBWR_ALL",
"MKL_DOMAIN_PARDISO", "MKL_DOMAIN_LAPACK", "MKL_CBWR_BRANCH", "MKL_CBWR_ALL", "MKL_UINT64",
"MKL_CBWR_STRICT", "MKL_CBWR_OFF", "MKL_CBWR_UNSET_ALL", "MKL_CBWR_BRANCH_OFF",
"MKL_CBWR_AUTO", "MKL_CBWR_COMPATIBLE", "MKL_CBWR_SSE2", "MKL_CBWR_SSSE3",
"MKL_CBWR_AUTO", "MKL_CBWR_COMPATIBLE", "MKL_CBWR_SSE2", "MKL_CBWR_SSSE3", "_MKL_Complex8",
"MKL_CBWR_SSE4_1", "MKL_CBWR_SSE4_2", "MKL_CBWR_AVX", "MKL_CBWR_AVX2", "MKL_CBWR_AVX512_MIC",
"MKL_CBWR_AVX512", "MKL_CBWR_AVX512_MIC_E1", "MKL_CBWR_AVX512_E1", "MKL_CBWR_SUCCESS",
"MKL_CBWR_ERR_INVALID_SETTINGS", "MKL_CBWR_ERR_INVALID_INPUT", "MKL_CBWR_ERR_UNSUPPORTED_BRANCH",
"MKL_CBWR_ERR_UNKNOWN_BRANCH", "MKL_CBWR_ERR_MODE_CHANGE_FAILURE", "MKL_CBWR_SSE3"]
"MKL_CBWR_ERR_UNKNOWN_BRANCH", "MKL_CBWR_ERR_MODE_CHANGE_FAILURE", "MKL_CBWR_SSE3", "_MKL_Complex16"]
optimized && (options["general"]["output_ignorelist"] = ignore_list)

args = get_default_args()
Expand Down
Loading

0 comments on commit 29a19f4

Please sign in to comment.