Remove global constants for library names (#307)

Author: odow

ext/SCSSCS_GPU_jllExt.jl

@@ -6,9 +6,7 @@
 module SCSSCS_GPU_jllExt
 
 import SCS
-import SCS_GPU_jll
-
-global gpuindirect = SCS_GPU_jll.libscsgpuindir
+import SCS_GPU_jll: libscsgpuindir
 
 SCS.is_available(::Type{SCS.GpuIndirectSolver}) = true
 
@@ -18,7 +16,7 @@ function SCS.scs_set_default_settings(
     ::Type{SCS.GpuIndirectSolver},
     stgs::SCS.ScsSettings{I},
 ) where {I<:Cint}
-    return @ccall gpuindirect.scs_set_default_settings(
+    return @ccall libscsgpuindir.scs_set_default_settings(
         stgs::Ref{SCS.ScsSettings{I}},
     )::Cvoid
 end
@@ -29,7 +27,7 @@ function SCS.scs_init(
     cone::SCS.ScsCone{I},
     stgs::SCS.ScsSettings{I},
 ) where {I<:Cint}
-    return @ccall gpuindirect.scs_init(
+    return @ccall libscsgpuindir.scs_init(
         data::Ref{SCS.ScsData{I}},
         cone::Ref{SCS.ScsCone{I}},
         stgs::Ref{SCS.ScsSettings{I}},
@@ -56,7 +54,7 @@ function SCS.scs_solve(
     info::SCS.ScsInfo{I},
     warm_start::Integer,
 ) where {I<:Cint}
-    return @ccall gpuindirect.scs_solve(
+    return @ccall libscsgpuindir.scs_solve(
         work::Ptr{Cvoid},
         solution::Ref{SCS.ScsSolution},
         info::Ref{SCS.ScsInfo{I}},
@@ -65,11 +63,11 @@ function SCS.scs_solve(
 end
 
 function SCS.scs_finish(::Type{SCS.GpuIndirectSolver}, work::Ptr{Cvoid})
-    return @ccall gpuindirect.scs_finish(work::Ptr{Cvoid})::Cvoid
+    return @ccall libscsgpuindir.scs_finish(work::Ptr{Cvoid})::Cvoid
 end
 
 function SCS.scs_version(::Type{SCS.GpuIndirectSolver})
-    return unsafe_string(@ccall gpuindirect.scs_version()::Cstring)
+    return unsafe_string(@ccall libscsgpuindir.scs_version()::Cstring)
 end
 
 end  # module

ext/SCSSCS_MKL_jllExt.jl

@@ -6,9 +6,7 @@
 module SCSSCS_MKL_jllExt
 
 import SCS
-import SCS_MKL_jll
-
-global mkldirect = SCS_MKL_jll.libscsmkl
+import SCS_MKL_jll: libscsmkl
 
 SCS.is_available(::Type{SCS.MKLDirectSolver}) = true
 
@@ -19,7 +17,7 @@ function SCS.scs_set_default_settings(
     stgs::SCS.ScsSettings{I},
 ) where {I<:Clonglong}
     return @ccall(
-        mkldirect.scs_set_default_settings(stgs::Ref{SCS.ScsSettings{I}})::Cvoid,
+        libscsmkl.scs_set_default_settings(stgs::Ref{SCS.ScsSettings{I}})::Cvoid,
     )
 end
 
@@ -29,7 +27,7 @@ function SCS.scs_init(
     cone::SCS.ScsCone{I},
     stgs::SCS.ScsSettings{I},
 ) where {I<:Clonglong}
-    return @ccall mkldirect.scs_init(
+    return @ccall libscsmkl.scs_init(
         data::Ref{SCS.ScsData{I}},
         cone::Ref{SCS.ScsCone{I}},
         stgs::Ref{SCS.ScsSettings{I}},
@@ -42,7 +40,7 @@ function SCS.scs_update(
     b::Vector{Float64},
     c::Vector{Float64},
 )
-    return @ccall mkldirect.scs_update(
+    return @ccall libscsmkl.scs_update(
         work::Ptr{Cvoid},
         b::Ref{Float64},
         c::Ref{Float64},
@@ -56,7 +54,7 @@ function SCS.scs_solve(
     info::SCS.ScsInfo{I},
     warm_start::Integer,
 ) where {I<:Clonglong}
-    return @ccall mkldirect.scs_solve(
+    return @ccall libscsmkl.scs_solve(
         work::Ptr{Cvoid},
         solution::Ref{SCS.ScsSolution},
         info::Ref{SCS.ScsInfo{I}},
@@ -65,11 +63,11 @@ function SCS.scs_solve(
 end
 
 function SCS.scs_finish(::Type{SCS.MKLDirectSolver}, work::Ptr{Cvoid})
-    return @ccall mkldirect.scs_finish(work::Ptr{Cvoid})::Cvoid
+    return @ccall libscsmkl.scs_finish(work::Ptr{Cvoid})::Cvoid
 end
 
 function SCS.scs_version(::Type{SCS.MKLDirectSolver})
-    return unsafe_string(@ccall mkldirect.scs_version()::Cstring)
+    return unsafe_string(@ccall libscsmkl.scs_version()::Cstring)
 end
 
 end  # module

src/SCS.jl

@@ -6,7 +6,7 @@
 module SCS
 
 import MathOptInterface as MOI
-import SCS_jll
+import SCS_jll: libscsdir, libscsindir
 import SparseArrays
 
 abstract type LinearSolver end

src/linear_solvers/direct.jl

@@ -3,8 +3,6 @@
 # Use of this source code is governed by an MIT-style license that can be found
 # in the LICENSE.md file or at https://opensource.org/licenses/MIT.
 
-global direct = SCS_jll.libscsdir
-
 struct DirectSolver <: LinearSolver end
 
 is_available(::Type{DirectSolver}) = true
@@ -16,7 +14,7 @@ function scs_set_default_settings(
     stgs::ScsSettings{I},
 ) where {I<:Clonglong}
     return @ccall(
-        direct.scs_set_default_settings(stgs::Ref{ScsSettings{I}})::Cvoid,
+        libscsdir.scs_set_default_settings(stgs::Ref{ScsSettings{I}})::Cvoid,
     )
 end
 
@@ -26,7 +24,7 @@ function scs_init(
     cone::ScsCone{I},
     stgs::ScsSettings{I},
 ) where {I<:Clonglong}
-    return @ccall direct.scs_init(
+    return @ccall libscsdir.scs_init(
         data::Ref{ScsData{I}},
         cone::Ref{ScsCone{I}},
         stgs::Ref{ScsSettings{I}},
@@ -39,7 +37,7 @@ function scs_update(
     b::Vector{Float64},
     c::Vector{Float64},
 )
-    return @ccall direct.scs_update(
+    return @ccall libscsdir.scs_update(
         work::Ptr{Cvoid},
         b::Ref{Float64},
         c::Ref{Float64},
@@ -53,7 +51,7 @@ function scs_solve(
     info::ScsInfo{I},
     warm_start::Integer,
 ) where {I<:Clonglong}
-    return @ccall direct.scs_solve(
+    return @ccall libscsdir.scs_solve(
         work::Ptr{Cvoid},
         solution::Ref{ScsSolution},
         info::Ref{ScsInfo{I}},
@@ -62,11 +60,11 @@ function scs_solve(
 end
 
 function scs_finish(::Type{DirectSolver}, work::Ptr{Cvoid})
-    return @ccall direct.scs_finish(work::Ptr{Cvoid})::Cvoid
+    return @ccall libscsdir.scs_finish(work::Ptr{Cvoid})::Cvoid
 end
 
 function scs_version(::Type{DirectSolver})
-    return unsafe_string(@ccall direct.scs_version()::Cstring)
+    return unsafe_string(@ccall libscsdir.scs_version()::Cstring)
 end
 
 scs_version() = scs_version(DirectSolver)

src/linear_solvers/indirect.jl

@@ -3,8 +3,6 @@
 # Use of this source code is governed by an MIT-style license that can be found
 # in the LICENSE.md file or at https://opensource.org/licenses/MIT.
 
-global indirect = SCS_jll.libscsindir
-
 struct IndirectSolver <: LinearSolver end
 
 is_available(::Type{IndirectSolver}) = true
@@ -16,7 +14,7 @@ function scs_set_default_settings(
     stgs::ScsSettings{I},
 ) where {I<:Clonglong}
     return @ccall(
-        indirect.scs_set_default_settings(stgs::Ref{ScsSettings{I}})::Cvoid,
+        libscsindir.scs_set_default_settings(stgs::Ref{ScsSettings{I}})::Cvoid,
     )
 end
 
@@ -26,7 +24,7 @@ function scs_init(
     cone::ScsCone{I},
     stgs::ScsSettings{I},
 ) where {I<:Clonglong}
-    return @ccall indirect.scs_init(
+    return @ccall libscsindir.scs_init(
         data::Ref{ScsData{I}},
         cone::Ref{ScsCone{I}},
         stgs::Ref{ScsSettings{I}},
@@ -53,7 +51,7 @@ function scs_solve(
     info::ScsInfo{I},
     warm_start::Integer,
 ) where {I<:Clonglong}
-    return @ccall indirect.scs_solve(
+    return @ccall libscsindir.scs_solve(
         work::Ptr{Cvoid},
         solution::Ref{ScsSolution},
         info::Ref{ScsInfo{I}},
@@ -62,9 +60,9 @@ function scs_solve(
 end
 
 function scs_finish(::Type{IndirectSolver}, work::Ptr{Cvoid})
-    return @ccall indirect.scs_finish(work::Ptr{Cvoid})::Cvoid
+    return @ccall libscsindir.scs_finish(work::Ptr{Cvoid})::Cvoid
 end
 
 function scs_version(::Type{IndirectSolver})
-    return unsafe_string(@ccall indirect.scs_version()::Cstring)
+    return unsafe_string(@ccall libscsindir.scs_version()::Cstring)
 end