Mauricio Collares
3 years ago
parent
0aef6270cd
commit
cecbb55fb0
@ -0,0 +1,58 @@ |
||||
diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd
|
||||
index 7794c9edc3..1753277b1f 100644
|
||||
--- a/src/sage/libs/linbox/conversion.pxd
|
||||
+++ b/src/sage/libs/linbox/conversion.pxd
|
||||
@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in
|
||||
- v -- linbox vector
|
||||
"""
|
||||
cdef Vector_integer_dense res = P()
|
||||
- cdef cppvector[Integer] * vec = &v.refRep()
|
||||
cdef size_t i
|
||||
for i in range(<size_t> res._degree):
|
||||
- mpz_set(res._entries[i], vec[0][i].get_mpz_const())
|
||||
+ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const())
|
||||
|
||||
return res
|
||||
diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd
|
||||
index 9112d151f8..dcc482960c 100644
|
||||
--- a/src/sage/libs/linbox/linbox.pxd
|
||||
+++ b/src/sage/libs/linbox/linbox.pxd
|
||||
@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h":
|
||||
ctypedef Modular_double Field
|
||||
ctypedef double Element
|
||||
DenseMatrix_Modular_double(Field F, size_t m, size_t n)
|
||||
- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n)
|
||||
+ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*)
|
||||
void setEntry(size_t i, size_t j, Element& a)
|
||||
Element &getEntry(size_t i, size_t j)
|
||||
|
||||
@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h":
|
||||
ctypedef Modular_float Field
|
||||
ctypedef float Element
|
||||
DenseMatrix_Modular_float(Field F, size_t m, size_t n)
|
||||
- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n)
|
||||
+ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*)
|
||||
void setEntry(size_t i, size_t j, Element& a)
|
||||
Element &getEntry(size_t i, size_t j)
|
||||
|
||||
@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h":
|
||||
DenseVector_integer (Field &F)
|
||||
DenseVector_integer (Field &F, long& m)
|
||||
DenseVector_integer (Field &F, cppvector[Integer]&)
|
||||
- cppvector[Element]& refRep()
|
||||
size_t size()
|
||||
void resize(size_t)
|
||||
void resize(size_t n, const Element&)
|
||||
diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi
|
||||
index 010365d76f..3d60726ff9 100644
|
||||
--- a/src/sage/matrix/matrix_modn_dense_template.pxi
|
||||
+++ b/src/sage/matrix/matrix_modn_dense_template.pxi
|
||||
@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_
|
||||
return 0,[]
|
||||
|
||||
cdef ModField *F = new ModField(<long>modulus)
|
||||
- cdef DenseMatrix *A = new DenseMatrix(F[0], <ModField.Element*>entries,<Py_ssize_t>nrows, <Py_ssize_t>ncols)
|
||||
+ cdef DenseMatrix *A = new DenseMatrix(F[0], <Py_ssize_t>nrows, <Py_ssize_t>ncols, <ModField.Element*>entries)
|
||||
cdef Py_ssize_t r = reducedRowEchelonize(A[0])
|
||||
cdef Py_ssize_t i,j
|
||||
for i in range(nrows):
|
||||
@ -0,0 +1,28 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, sage-src |
||||
, sphinx |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
version = src.version; |
||||
pname = "sage-docbuild"; |
||||
src = sage-src; |
||||
|
||||
propagatedBuildInputs = [ |
||||
sphinx |
||||
]; |
||||
|
||||
preBuild = '' |
||||
cd pkgs/sage-docbuild |
||||
''; |
||||
|
||||
doCheck = false; # we will run tests in sagedoc.nix |
||||
|
||||
meta = with lib; { |
||||
description = "Build system of the Sage documentation"; |
||||
homepage = "https://www.sagemath.org"; |
||||
license = licenses.gpl2Plus; |
||||
maintainers = teams.sage.members; |
||||
}; |
||||
} |
||||
@ -0,0 +1,28 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, sage-src |
||||
, pkgconfig # the python module, not the pkg-config alias |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
version = src.version; |
||||
pname = "sage-setup"; |
||||
src = sage-src; |
||||
|
||||
buildInputs = [ |
||||
pkgconfig |
||||
]; |
||||
|
||||
preBuild = '' |
||||
cd pkgs/sage-setup |
||||
''; |
||||
|
||||
doCheck = false; # sagelib depends on sage-setup, but sage-setup's tests depend on sagelib |
||||
|
||||
meta = with lib; { |
||||
description = "Build system of the Sage library"; |
||||
homepage = "https://www.sagemath.org"; |
||||
license = licenses.gpl2Plus; |
||||
maintainers = teams.sage.members; |
||||
}; |
||||
} |
||||
@ -1,20 +0,0 @@ |
||||
{ buildPythonPackage |
||||
, sage-src |
||||
, sphinx |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
version = src.version; |
||||
pname = "sage_docbuild"; |
||||
src = sage-src; |
||||
|
||||
propagatedBuildInputs = [ |
||||
sphinx |
||||
]; |
||||
|
||||
preBuild = '' |
||||
cd build/pkgs/sage_docbuild/src |
||||
''; |
||||
|
||||
doCheck = false; # we will run tests in sagedoc.nix |
||||
} |
||||
Loading…
Reference in new issue