diff options
Diffstat (limited to 'libre/sagemath/linbox-1.4.patch')
| -rw-r--r-- | libre/sagemath/linbox-1.4.patch | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/libre/sagemath/linbox-1.4.patch b/libre/sagemath/linbox-1.4.patch index 5897df763..b3955eb51 100644 --- a/libre/sagemath/linbox-1.4.patch +++ b/libre/sagemath/linbox-1.4.patch @@ -53,7 +53,7 @@ index a49ed36..7798cb8 100644 ) ######################################################### -@@ -85,12 +112,6 @@ except ValueError: +@@ -91,12 +118,6 @@ except ValueError: singular_libs = ['singular', 'flint', 'ntl', 'gmpxx', 'gmp', 'readline', 'm'] ######################################################### @@ -66,7 +66,7 @@ index a49ed36..7798cb8 100644 ### Library order ######################################################### -@@ -105,8 +126,7 @@ givaro_extra_compile_args =['-D__STDC_LIMIT_MACROS'] +@@ -111,8 +132,7 @@ givaro_extra_compile_args =['-D__STDC_LIMIT_MACROS'] # at the very end of the list. library_order_list = [ "singular", "ec", "ecm", @@ -75,8 +75,8 @@ index a49ed36..7798cb8 100644 +] + linbox_libs + gsl_libs + [ "pari", "flint", "ratpoints", "ecl", "glpk", "ppl", "arb", "fplll", "mpfi", "mpfr", "mpc", "gmp", "gmpxx", - "polybori", -@@ -593,13 +613,10 @@ ext_modules = [ + "brial", +@@ -611,13 +631,10 @@ ext_modules = [ Extension('sage.libs.linbox.linbox', sources = ['sage/libs/linbox/linbox.pyx'], @@ -92,7 +92,7 @@ index a49ed36..7798cb8 100644 Extension('sage.libs.lcalc.lcalc_Lfunction', sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'], -@@ -645,9 +662,8 @@ ext_modules = [ +@@ -665,9 +682,8 @@ ext_modules = [ Extension('sage.libs.singular.singular', sources = ['sage/libs/singular/singular.pyx'], @@ -104,7 +104,7 @@ index a49ed36..7798cb8 100644 Extension('sage.libs.singular.polynomial', sources = ['sage/libs/singular/polynomial.pyx'], -@@ -667,8 +683,7 @@ ext_modules = [ +@@ -687,8 +703,7 @@ ext_modules = [ Extension('sage.libs.singular.function', sources = ['sage/libs/singular/function.pyx'], libraries = singular_libs, @@ -114,7 +114,7 @@ index a49ed36..7798cb8 100644 Extension('sage.libs.singular.option', sources = ['sage/libs/singular/option.pyx'], -@@ -923,19 +938,17 @@ ext_modules = [ +@@ -944,19 +959,17 @@ ext_modules = [ Extension('sage.matrix.matrix_modn_dense_float', sources = ['sage/matrix/matrix_modn_dense_float.pyx'], language="c++", @@ -122,7 +122,7 @@ index a49ed36..7798cb8 100644 + libraries = linbox_libs + cblas_libs, library_dirs = cblas_library_dirs, - include_dirs = cblas_include_dirs, -- extra_compile_args = ['-DDISABLE_COMMENTATOR'] + givaro_extra_compile_args), +- extra_compile_args = nocxx11_args + ['-DDISABLE_COMMENTATOR'] + givaro_extra_compile_args), + include_dirs = cblas_include_dirs), Extension('sage.matrix.matrix_modn_dense_double', @@ -132,13 +132,13 @@ index a49ed36..7798cb8 100644 + libraries = linbox_libs + cblas_libs, library_dirs = cblas_library_dirs, include_dirs = cblas_include_dirs, -- extra_compile_args = ["-D_XPG6", "-DDISABLE_COMMENTATOR"] +- extra_compile_args = nocxx11_args + ["-D_XPG6", "-DDISABLE_COMMENTATOR"] - + m4ri_extra_compile_args + givaro_extra_compile_args), + extra_compile_args = ["-D_XPG6"]), Extension('sage.matrix.matrix_modn_sparse', sources = ['sage/matrix/matrix_modn_sparse.pyx']), -@@ -1374,8 +1387,7 @@ ext_modules = [ +@@ -1400,8 +1413,7 @@ ext_modules = [ Extension('sage.rings.finite_rings.element_givaro', sources = ["sage/rings/finite_rings/element_givaro.pyx"], libraries = ['givaro', 'ntl', 'gmpxx', 'gmp', 'm'], @@ -148,7 +148,7 @@ index a49ed36..7798cb8 100644 Extension('sage.rings.finite_rings.element_ntl_gf2e', sources = ['sage/rings/finite_rings/element_ntl_gf2e.pyx'], -@@ -1395,8 +1407,7 @@ ext_modules = [ +@@ -1421,8 +1433,7 @@ ext_modules = [ sources = ["sage/rings/finite_rings/hom_finite_field_givaro.pyx"], # this order is needed to compile under windows. libraries = ['givaro', 'ntl', 'gmpxx', 'gmp', 'm'], @@ -158,7 +158,7 @@ index a49ed36..7798cb8 100644 ################################ ## -@@ -1548,8 +1559,7 @@ ext_modules = [ +@@ -1574,8 +1585,7 @@ ext_modules = [ Extension('sage.rings.polynomial.plural', sources = ['sage/rings/polynomial/plural.pyx'], libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'], @@ -214,7 +214,7 @@ index e102004..01ab1b1 100644 +# distutils: libraries = FFLASFFPACK_LIBRARIES +# distutils: library_dirs = FFLASFFPACK_LIBDIR + - from modular cimport ModDoubleField, ModFloatField, ModDoubleFieldElement, ModFloatFieldElement + from .modular cimport ModDoubleField, ModFloatField, ModDoubleFieldElement, ModFloatFieldElement cdef extern from "fflas-ffpack/fflas-ffpack.h" namespace "std": diff --git a/src/sage/libs/linbox/linbox.pyx b/src/sage/libs/linbox/linbox.pyx @@ -264,7 +264,7 @@ diff --git a/src/sage/libs/singular/singular.pyx b/src/sage/libs/singular/singul index 33d7f7ec..77f6e0a 100644 --- a/src/sage/libs/singular/singular.pyx +++ b/src/sage/libs/singular/singular.pyx -@@ -22,6 +22,7 @@ cdef extern from "limits.h": +@@ -23,6 +23,7 @@ cdef extern from "limits.h": import os @@ -272,7 +272,7 @@ index 33d7f7ec..77f6e0a 100644 from sage.libs.singular.decl cimport intvec from sage.libs.singular.decl cimport SR_HDL, SR_INT, SR_TO_INT from sage.libs.singular.decl cimport singular_options, singular_verbose_options -@@ -155,7 +156,7 @@ cdef FFgivE si2sa_GFqGivaro(number *n, ring *_ring, Cache_givaro cache): +@@ -156,7 +157,7 @@ cdef FFgivE si2sa_GFqGivaro(number *n, ring *_ring, Cache_givaro cache): order = cache.objectptr.cardinality() - 1 while z: @@ -365,7 +365,7 @@ diff --git a/src/sage/rings/finite_rings/element_givaro.pyx b/src/sage/rings/fin index d32b5cf..f2afa44 100644 --- a/src/sage/rings/finite_rings/element_givaro.pyx +++ b/src/sage/rings/finite_rings/element_givaro.pyx -@@ -58,8 +58,9 @@ from sage.misc.randstate cimport randstate, current_randstate +@@ -59,8 +59,9 @@ from sage.misc.randstate cimport randstate, current_randstate from sage.rings.finite_rings.finite_field_base cimport FiniteField from sage.rings.ring cimport Ring from element_ext_pari import FiniteField_ext_pariElement @@ -376,7 +376,7 @@ index d32b5cf..f2afa44 100644 import operator import sage.arith.all import finite_field_constructor as finite_field -@@ -373,18 +374,16 @@ cdef class Cache_givaro(SageObject): +@@ -374,18 +375,16 @@ cdef class Cache_givaro(SageObject): elif isinstance(e, int) or \ isinstance(e, Integer) or \ isinstance(e, long) or is_IntegerMod(e): @@ -399,8 +399,8 @@ index d32b5cf..f2afa44 100644 elif isinstance(e, str): return self.parent(eval(e.replace("^","**"),self.parent.gens_dict())) -@@ -394,8 +393,8 @@ cdef class Cache_givaro(SageObject): - raise TypeError, "e.parent must match self.vector_space" +@@ -395,8 +394,8 @@ cdef class Cache_givaro(SageObject): + raise TypeError("e.parent must match self.vector_space") ret = self._zero_element for i in range(len(e)): - e_entry = e[i] % self.characteristic() @@ -410,8 +410,8 @@ index d32b5cf..f2afa44 100644 to_add = make_FiniteField_givaroElement(self, res) ret = ret + to_add*self.parent.gen()**i return ret -@@ -434,8 +433,8 @@ cdef class Cache_givaro(SageObject): - raise ValueError, "list is too long" +@@ -435,8 +434,8 @@ cdef class Cache_givaro(SageObject): + raise ValueError("list is too long") ret = self._zero_element for i in range(len(e)): - e_entry = e[i] % self.characteristic() @@ -421,7 +421,7 @@ index d32b5cf..f2afa44 100644 to_add = make_FiniteField_givaroElement(self, res) ret = ret + to_add*self.parent.gen()**i return ret -@@ -572,19 +571,17 @@ cdef class Cache_givaro(SageObject): +@@ -573,19 +572,17 @@ cdef class Cache_givaro(SageObject): cdef int ret = k.zero cdef int a = k.indeterminate() cdef int at = k.one @@ -431,7 +431,7 @@ index d32b5cf..f2afa44 100644 + cdef int t, i if n<0 or n>k.cardinality(): - raise TypeError, "n must be between 0 and self.order()" + raise TypeError("n must be between 0 and self.order()") - _n = n - @@ -449,7 +449,7 @@ diff --git a/src/sage/rings/finite_rings/finite_field_givaro.py b/src/sage/rings index adbaab3..c431f6d 100644 --- a/src/sage/rings/finite_rings/finite_field_givaro.py +++ b/src/sage/rings/finite_rings/finite_field_givaro.py -@@ -269,7 +269,8 @@ class FiniteField_givaro(FiniteField): +@@ -270,7 +270,8 @@ class FiniteField_givaro(FiniteField): sage: k(2) # indirect doctest 0 @@ -459,7 +459,7 @@ index adbaab3..c431f6d 100644 sage: k(float(2.0)) 0 -@@ -343,7 +344,7 @@ class FiniteField_givaro(FiniteField): +@@ -344,7 +345,7 @@ class FiniteField_givaro(FiniteField): sage: k(pari('Mod(1,2)')) 1 sage: k(pari('Mod(2,3)')) |