Move OPENBLAS settings from Base to LinearAlgebra (JuliaLang#42473)

* Move OPENBLAS settings from Base to LinearAlgebra * Use __init__ of openblas for setting openblas env variables
pcjentsch · Oct 10, 2021 · a512f1a · a512f1a
1 parent 9a2e763
commit a512f1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/base/Base.jl b/base/Base.jl
@@ -461,10 +461,6 @@ end
 
 if is_primary_base_module
 function __init__()
- # try to ensuremake sure OpenBLAS does not set CPU affinity (#1070, #9639)
- if !haskey(ENV, "OPENBLAS_MAIN_FREE")
- ENV["OPENBLAS_MAIN_FREE"] = "1"
- end
  # for the few uses of Libc.rand in Base:
  Libc.srand()
  # Base library init

diff --git a/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl b/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl
@@ -32,6 +32,11 @@ else
 end
 
 function __init__()
+ # make sure OpenBLAS does not set CPU affinity (#1070, #9639)
+ if !haskey(ENV, "OPENBLAS_MAIN_FREE")
+ ENV["OPENBLAS_MAIN_FREE"] = "1"
+ end
+
  global libopenblas_handle = dlopen(libopenblas)
  global libopenblas_path = dlpath(libopenblas_handle)
  global artifact_dir = dirname(Sys.BINDIR)