Using libflint from LoadFlint instead of :libflint

oscar-system · Jul 17, 2020 · 26e6b53 · 26e6b53
1 parent c764ef0
commit 26e6b53
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 11 deletions.
diff --git a/src/LibSingular.jl b/src/LibSingular.jl
@@ -3,6 +3,8 @@ module libSingular
 import Libdl
 using CxxWrap
 
+import ..Singular: libflint, libantic
+
 const libsingularwrap_path = joinpath(@__DIR__, "..", "deps", "usr",
                 "lib", "libsingularwrap." * Libdl.dlext)
 if !isfile(libsingularwrap_path)

diff --git a/src/Singular.jl b/src/Singular.jl
@@ -55,6 +55,10 @@ const pkgdir = realpath(joinpath(dirname(@__FILE__), ".."))
 const prefix = joinpath(pkgdir, "deps", "usr")
 const libsingular = joinpath(prefix, "lib", "libSingular")
 const binSingular = joinpath(prefix, "bin", "Singular")
+
+const libflint = Nemo.libflint
+const libantic = Nemo.libantic
+
 if !isfile(binSingular)
     error("""Singular.jl needs to be compiled; please run `using Pkg; Pkg.build("Singular")`""")
 end

diff --git a/src/libsingular/antic/nf_elem.jl b/src/libsingular/antic/nf_elem.jl
@@ -63,7 +63,7 @@ end
 
 function nf_elemInpNeg(a::Ptr{Cvoid}, cf::Ptr{Cvoid})
    cf_ptr = get_coeff_data_void(cf)
-   ccall((:nf_elem_neg, :libantic), Cvoid,
+   ccall((:nf_elem_neg, libantic), Cvoid,
 	 (Ptr{Nemo.nf_elem}, Ptr{Nemo.nf_elem}, Ptr{Nemo.AnticNumberField}),
 	   a, a, cf_ptr)
    return a

diff --git a/src/libsingular/flint/fmpq.jl b/src/libsingular/flint/fmpq.jl
@@ -61,7 +61,7 @@ function fmpqNeg(a::Ptr{Cvoid}, cf::Ptr{Cvoid})
 end
 
 function fmpqInpNeg(a::Ptr{Cvoid}, cf::Ptr{Cvoid})
-    ccall((:fmpq_neg, :libflint), Cvoid, (Ptr{Nemo.fmpq}, Ptr{Nemo.fmpq}), a, a)
+    ccall((:fmpq_neg, libflint), Cvoid, (Ptr{Nemo.fmpq}, Ptr{Nemo.fmpq}), a, a)
     return a
 end
 

diff --git a/src/libsingular/flint/fmpz.jl b/src/libsingular/flint/fmpz.jl
@@ -61,7 +61,7 @@ function fmpzNeg(a::Ptr{Cvoid}, cf::Ptr{Cvoid})
 end
 
 function fmpzInpNeg(a::Ptr{Cvoid}, cf::Ptr{Cvoid})
-    ccall((:fmpz_neg, :libflint), Cvoid, (Ptr{Nemo.fmpz}, Ptr{Nemo.fmpz}), a, a)
+    ccall((:fmpz_neg, libflint), Cvoid, (Ptr{Nemo.fmpz}, Ptr{Nemo.fmpz}), a, a)
     return a
 end
 

diff --git a/src/libsingular/flint/fq.jl b/src/libsingular/flint/fq.jl
@@ -63,7 +63,7 @@ end
 
 function fqInpNeg(a::Ptr{Cvoid}, cf::Ptr{Cvoid})
    cf_ptr = get_coeff_data_void(cf)
-   ccall((:fq_neg, :libflint), Cvoid,
+   ccall((:fq_neg, libflint), Cvoid,
 	 (Ptr{Nemo.fq}, Ptr{Nemo.fq}, Ptr{Nemo.FqFiniteField}),
 	   a, a, cf_ptr)
    return a

diff --git a/src/libsingular/flint/fq_nmod.jl b/src/libsingular/flint/fq_nmod.jl
@@ -63,7 +63,7 @@ end
 
 function fq_nmodInpNeg(a::Ptr{Cvoid}, cf::Ptr{Cvoid})
    cf_ptr = get_coeff_data_void(cf)
-   ccall((:fq_nmod_neg, :libflint), Cvoid,
+   ccall((:fq_nmod_neg, libflint), Cvoid,
 	 (Ptr{Nemo.fq_nmod}, Ptr{Nemo.fq_nmod}, Ptr{Nemo.FqNmodFiniteField}),
 	   a, a, cf_ptr)
    return a

diff --git a/src/number/n_GF.jl b/src/number/n_GF.jl
@@ -333,7 +333,7 @@ end
 
 function (R::N_GField)(x::Nemo.fmpz)
    a = BigInt()
-   ccall((:flint_mpz_init_set_readonly, :libflint), Nothing,
+   ccall((:flint_mpz_init_set_readonly, libflint), Nothing,
          (Ptr{BigInt}, Ptr{fmpz}), Ref(a), Ref(x))
    z = R(libSingular.n_InitMPZ(a, R.ptr))
       z.parent = R

diff --git a/src/number/n_Q.jl b/src/number/n_Q.jl
@@ -362,7 +362,7 @@ promote_rule(C::Type{n_Q}, ::Type{n_Q}) = n_Z
 
 function (R::Rationals)(x::Nemo.fmpz)
    a = BigInt()
-   ccall((:flint_mpz_init_set_readonly, :libflint), Nothing,
+   ccall((:flint_mpz_init_set_readonly, libflint), Nothing,
          (Ptr{BigInt}, Ptr{fmpz}), Ref(a), Ref(x))
    return R(libSingular.n_InitMPZ(a, R.ptr))   
 end

diff --git a/src/number/n_Z.jl b/src/number/n_Z.jl
@@ -375,7 +375,7 @@ promote_rule(C::Type{n_Z}, ::Type{T}) where {T <: Integer} = n_Z
 
 function (R::Integers)(x::Nemo.fmpz)
    a = BigInt()
-   ccall((:flint_mpz_init_set_readonly, :libflint), Nothing,
+   ccall((:flint_mpz_init_set_readonly, libflint), Nothing,
          (Ptr{BigInt}, Ptr{fmpz}), Ref(a), Ref(x))
    return R(libSingular.n_InitMPZ(a, R.ptr))   
 end

diff --git a/src/number/n_Zn.jl b/src/number/n_Zn.jl
@@ -333,7 +333,7 @@ end
 
 function (R::N_ZnRing)(x::Nemo.fmpz)
    a = BigInt()
-   ccall((:flint_mpz_init_set_readonly, :libflint), Nothing,
+   ccall((:flint_mpz_init_set_readonly, libflint), Nothing,
          (Ptr{BigInt}, Ptr{fmpz}), Ref(a), Ref(x))
    z = R(libSingular.n_InitMPZ(a, R.ptr))
       z.parent = R

diff --git a/src/number/n_Zp.jl b/src/number/n_Zp.jl
@@ -321,7 +321,7 @@ end
 
 function (R::N_ZpField)(x::Nemo.fmpz)
    a = BigInt()
-   ccall((:flint_mpz_init_set_readonly, :libflint), Nothing,
+   ccall((:flint_mpz_init_set_readonly, libflint), Nothing,
          (Ptr{BigInt}, Ptr{fmpz}), Ref(a), Ref(x))
    z = R(libSingular.n_InitMPZ(a, R.ptr))
       z.parent = R

diff --git a/src/number/n_transExt.jl b/src/number/n_transExt.jl
@@ -353,7 +353,7 @@ end
 
 function (R::N_FField)(x::Nemo.fmpz)
    a = BigInt()
-   ccall((:flint_mpz_init_set_readonly, :libflint), Nothing,
+   ccall((:flint_mpz_init_set_readonly, libflint), Nothing,
          (Ptr{BigInt}, Ptr{fmpz}), Ref(a), Ref(x))
    z = R(libSingular.n_InitMPZ(a, R.ptr))
       z.parent = R