MKL load fix

JuliaMath · Mar 25, 2024 · e24752b · e24752b
1 parent 01c3916
commit e24752b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ext/FFTWMKLExt.jl b/ext/FFTWMKLExt.jl
@@ -7,6 +7,8 @@ using FFTW
     import MKL_jll
     FFTW.libfftw3[] = MKL_jll.libmkl_rt_path
     FFTW.libfftw3f[] = MKL_jll.libmkl_rt_path
+    FFTW.version[] = VersionNumber(split(unsafe_string(cglobal(
+                                    (:fftw_version,FFTW.libfftw3[]), UInt8)), ['-', ' '])[2])
 end
 
 function __init__()
@@ -16,6 +18,8 @@ function __init__()
     @static if FFTW.fftw_provider == "mkl"
         FFTW.libfftw3[] = MKL_jll.libmkl_rt_path
         FFTW.libfftw3f[] = MKL_jll.libmkl_rt_path
+        FFTW.version[] = VersionNumber(split(unsafe_string(cglobal(
+                                (:fftw_version,FFTW.libfftw3[]), UInt8)), ['-', ' '])[2])
     end
 end
 

diff --git a/src/fft.jl b/src/fft.jl
@@ -54,10 +54,12 @@ correspond to [`r2r`](@ref) and [`r2r!`](@ref), respectively.
 function plan_r2r end
 
 ## FFT: Implement fft by calling fftw.
+const version = Ref{Union{Missing,VersionNumber}}(missing)
 
-const version = VersionNumber(split(unsafe_string(cglobal(
-    (:fftw_version,libfftw3[]), UInt8)), ['-', ' '])[2])
-
+@static if FFTW.fftw_provider == "fftw"
+    version[] = VersionNumber(split(unsafe_string(cglobal(
+                              (:fftw_version,libfftw3[]), UInt8)), ['-', ' '])[2])
+end
 ## Direction of FFT
 
 const FORWARD = -1
@@ -422,7 +424,7 @@ end
 
 # The sprint_plan function was released in FFTW 3.3.4, but MKL versions
 # claiming to be FFTW 3.3.4 still don't seem to have this function.
-const has_sprint_plan = version >= v"3.3.4" && fftw_provider == "fftw"
+const has_sprint_plan = fftw_provider == "fftw" && version[] >= v"3.3.4"
 
 @static if has_sprint_plan
     sprint_plan_(plan::FFTWPlan{<:fftwDouble}) =