remove allocations in qrm_set for Julia 1.12 (#136)

Author: MaxenceGollier

src/QRMumps.jl

@@ -595,7 +595,7 @@ Set control parameters that define the behavior of `qr_mumps`.
 #### Input Arguments :
 
 * `spfct`: a sparse factorization object of type `qrm_spfct`.
-* `str`: a string describing the parameter to set.
+* `str`: either a string or a symbol describing the parameter to set. 
 * `val`: the parameter value.
 """
 function qrm_set end
@@ -609,7 +609,7 @@ Returns the value of a control parameter or an information parameter.
 #### Input Arguments :
 
 * `spfct`: a sparse factorization object of type `qrm_spfct`.
-* `str`: a string describing the parameter to get.
+* `str`: either a string or a symbol describing the parameter to get.
 """
 function qrm_get end
 

src/wrapper/qr_mumps_api.jl

@@ -815,10 +815,14 @@ for (fname, elty, subty) in ((:sqrm_residual_orth_c, :Float32   , :Float32),
     end
 end
 
+function qrm_set(sym :: Symbol, val :: Real)
+    qrm_set(String(sym), val)
+end
+
 function qrm_set(str :: String, val :: Number)
-    if (str ∈ GICNTL) || (str ∈ PICNTL)
+    if (Symbol(str) ∈ GICNTL) || (Symbol(str) ∈ PICNTL)
         err = qrm_glob_set_i4_c(str, val)
-    elseif str ∈ RCNTL
+    elseif Symbol(str) ∈ RCNTL
         err = qrm_glob_set_r4_c(str, val)
     else
         err = Int32(23)
@@ -832,10 +836,13 @@ for (finame, frname, elty) in ((:sqrm_spfct_set_i4_c, :sqrm_spfct_set_r4_c, :Flo
                                (:cqrm_spfct_set_i4_c, :cqrm_spfct_set_r4_c, :ComplexF32),
                                (:zqrm_spfct_set_i4_c, :zqrm_spfct_set_r4_c, :ComplexF64))
     @eval begin
+        function qrm_set(spfct :: qrm_spfct{$elty}, sym :: Symbol, val :: Real)
+            qrm_set(spfct, String(sym), val)
+        end
         function qrm_set(spfct :: qrm_spfct{$elty}, str :: String, val :: Real)
-            if str ∈ PICNTL
+            if Symbol(str) ∈ PICNTL
                 err = $finame(spfct, str, val)
-            elseif str ∈ RCNTL
+            elseif Symbol(str) ∈ RCNTL
                 err = $frname(spfct, str, val)
             else
                 err = Int32(23)
@@ -846,11 +853,15 @@ for (finame, frname, elty) in ((:sqrm_spfct_set_i4_c, :sqrm_spfct_set_r4_c, :Flo
     end
 end
 
+function qrm_get(sym :: Symbol)
+    return qrm_get(String(sym))
+end
+
 function qrm_get(str :: String)
-    if (str ∈ GICNTL) || (str ∈ PICNTL)
+    if (Symbol(str) ∈ GICNTL) || (Symbol(str) ∈ PICNTL)
         val = Ref{Clonglong}(0)
         err = qrm_glob_get_i8_c(str, val)
-    elseif str ∈ RCNTL
+    elseif Symbol(str) ∈ RCNTL
         val = Ref{Float32}(0)
         err = qrm_glob_get_r4_c(str, val)
     else
@@ -865,11 +876,14 @@ for (finame, frname, elty) in ((:sqrm_spfct_get_i8_c, :sqrm_spfct_get_r4_c, :Flo
                                (:cqrm_spfct_get_i8_c, :cqrm_spfct_get_r4_c, :ComplexF32),
                                (:zqrm_spfct_get_i8_c, :zqrm_spfct_get_r4_c, :ComplexF64))
     @eval begin
+        function qrm_get(spfct :: qrm_spfct{$elty}, sym :: Symbol)
+            return qrm_get(spfct, String(sym))
+        end
         function qrm_get(spfct :: qrm_spfct{$elty}, str :: String)
-            if (str ∈ PICNTL) || (str ∈ STATS)
+            if (Symbol(str) ∈ PICNTL) || (Symbol(str) ∈ STATS)
                 val = spfct.ref_int
                 err = $finame(spfct, str, val)
-            elseif str ∈ RCNTL
+            elseif Symbol(str) ∈ RCNTL
                 val = spfct.ref_float
                 err = $frname(spfct, str, val)
             else

src/wrapper/qr_mumps_common.jl

@@ -118,10 +118,10 @@ function Base.show(io :: IO, ::MIME"text/plain", spfct :: qrm_spfct)
   println(io, "Sparse factorization -- qrm_spfct")
 end
 
-const GICNTL = ("qrm_eunit", "qrm_print_etree", "qrm_ounit", "qrm_dunit", "qrm_ncpu", "qrm_ngpu", "qrm_max_mem", "qrm_tot_mem")
-const PICNTL = ("qrm_ordering", "qrm_minamalg", "qrm_mb", "qrm_nb", "qrm_ib", "qrm_bh", "qrm_keeph", "qrm_rhsnb", "qrm_nlz", "qrm_pinth")
-const RCNTL  = ("qrm_amalgth", "qrm_mem_relax", "qrm_rd_eps")
-const STATS  = ("qrm_e_nnz_r", "qrm_e_nnz_h", "qrm_e_facto_flops", "qrm_e_facto_mempeak", "qrm_nnz_r", "qrm_nnz_h", "qrm_facto_flops", "qrm_rd_num")
+const GICNTL = (:qrm_eunit, :qrm_print_etree, :qrm_ounit, :qrm_dunit, :qrm_ncpu, :qrm_ngpu, :qrm_max_mem, :qrm_tot_mem)
+const PICNTL = (:qrm_ordering, :qrm_minamalg, :qrm_mb, :qrm_nb, :qrm_ib, :qrm_bh, :qrm_keeph, :qrm_rhsnb, :qrm_nlz, :qrm_pinth)
+const RCNTL  = (:qrm_amalgth, :qrm_mem_relax, :qrm_rd_eps)
+const STATS  = (:qrm_e_nnz_r, :qrm_e_nnz_h, :qrm_e_facto_flops, :qrm_e_facto_mempeak, :qrm_nnz_r, :qrm_nnz_h, :qrm_facto_flops, :qrm_rd_num)
 
 function error_handling(err :: Cint)
   status = "Unknown qr_mumps error: $err"

test/test_qrm.jl

@@ -4,6 +4,16 @@ n = 100
 p = 5
 d = Dict(0 => "auto", 1 => "natural", 2 => "given", 3 => "colamd", 4 => "metis", 5 => "scotch")
 
+macro wrappedallocs(expr) # Makes allocation tests more stable on some versions of Julia
+  argnames = [gensym() for a in expr.args]
+  quote
+    function g($(argnames...))
+      @allocated $(Expr(expr.head, argnames...))
+    end
+    $(Expr(:call, :g, [esc(a) for a in expr.args]...))
+  end
+end
+
 @testset "least-squares problems" begin
   @testset "$T" for T in (Float32, Float64, ComplexF32, ComplexF64)
 
@@ -700,9 +710,12 @@ end
       spfct = qrm_spfct_init(spmat)
 
       qrm_set(spfct, "qrm_rd_eps", tol)
+      nbits = @wrappedallocs qrm_set(spfct, "qrm_rd_eps", tol)
+      @test nbits == 0
       qrm_analyse!(spmat, spfct)
       qrm_factorize!(spmat, spfct)
-      nbits = @allocated qrm_get(spfct, "qrm_rd_num")
+      qrm_get(spfct, "qrm_rd_num")
+      nbits = @wrappedallocs qrm_get(spfct, "qrm_rd_num")
       @test nbits == 0
     end
   end