Merge branch 'sparse-7.6.0' into HEAD

mkoeppe · Aug 21, 2024 · d8c1166 · d8c1166
2 parents cb7c499 + c53fac1
commit d8c1166
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 976 deletions.
diff --git a/build/pkgs/cmake/spkg-configure.m4 b/build/pkgs/cmake/spkg-configure.m4
@@ -1,5 +1,5 @@
 SAGE_SPKG_CONFIGURE([cmake], [dnl
-        AC_CACHE_CHECK([for cmake >= 3.18], [ac_cv_path_CMAKE], [dnl
+        AC_CACHE_CHECK([for cmake >= 3.22], [ac_cv_path_CMAKE], [dnl
         dnl Do not accept cmake installed via https://pypi.org/project/cmake/
         dnl in the default user scheme; it will not work in our venv because
         dnl we set PYTHONUSERBASE in sage-env.
@@ -8,7 +8,7 @@ SAGE_SPKG_CONFIGURE([cmake], [dnl
                 cmake_version=`$ac_path_CMAKE --version 2>&1 \
                     | $SED -n -e 's/cmake version *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
                 AS_IF([test -n "$cmake_version"], [dnl
-                    AX_COMPARE_VERSION([$cmake_version], [ge], [3.18], [dnl
+                    AX_COMPARE_VERSION([$cmake_version], [ge], [3.22], [dnl
                         ac_cv_path_CMAKE="$ac_path_CMAKE"
                         ac_path_CMAKE_found=:
                     ])

diff --git a/build/pkgs/suitesparse/SPKG.rst b/build/pkgs/suitesparse/SPKG.rst
@@ -2,26 +2,19 @@ suitesparse: A suite of sparse matrix software
 ==============================================
 
 SuiteSparse is a collection of software to deal with sparse matrix. It is
-hosted at http://faculty.cse.tamu.edu/davis/suitesparse.html
+hosted at https://people.engr.tamu.edu/davis/suitesparse.html with source code
+now on github at https://github.com/DrTimothyAldenDavis/SuiteSparse
 
-This spkg does a minimal install of suitesparse disabling the following
+This spkg does a minimal install of suitesparse, only intalling the following
 
--  metis
--  GraphBLAS (need cmake)
--  Mongoose (need cmake)
+-  AMD
+-  CAMD
+-  COLAMD
+-  CCOLAMD
+-  CHOLMOD
+-  UMFPACK
 
-An external metis package can be used but we just disable its use.
-
-Patches:
-
--  The first patch disable the building of package using cmake.
--  The second patch make sure we use sage's blas/lapack on OS X. By
-   default
-   suitesparse discard any configurations to use the accelerate framework.
-
-The building of metis is diabled by passing MY_METIS_LIB=none to make
-(any value would have done) We also configure cholmod so it doesn't
-require metis by passing CHOLMOD_CONFIG=-DNPARTITION to make.
+Those are all the packages needed for cvxopt.
 
 Other configurations are self explanatory.
 

diff --git a/build/pkgs/suitesparse/checksums.ini b/build/pkgs/suitesparse/checksums.ini
@@ -1,4 +1,4 @@
 tarball=SuiteSparse-VERSION.tar.gz
-sha1=83dd96b32701e12b7577acb7d9aea80138d7e46e
-sha256=acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee
+sha1=aa2745d8e38d2c010e0a7256acd36eba1de19055
+sha256=8ea989f36be3646d0b0eecb06218698766ca06256c0de15a64350e993bf5c5f9
 upstream_url=https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/vVERSION.tar.gz
diff --git a/build/pkgs/suitesparse/dependencies b/build/pkgs/suitesparse/dependencies
@@ -1 +1 @@
-$(BLAS) gfortran mpfr $(MP_LIBRARY)
+$(BLAS) gfortran mpfr $(MP_LIBRARY) | cmake
diff --git a/build/pkgs/suitesparse/package-version.txt b/build/pkgs/suitesparse/package-version.txt
@@ -1 +1 @@
-5.10.1
+7.8.0
diff --git a/build/pkgs/suitesparse/patches/01-no_cmake_project.patch b/build/pkgs/suitesparse/patches/01-no_cmake_project.patch
diff --git a/build/pkgs/suitesparse/patches/02-darwin_blas.patch b/build/pkgs/suitesparse/patches/02-darwin_blas.patch
diff --git a/build/pkgs/suitesparse/patches/03-buildflags.patch b/build/pkgs/suitesparse/patches/03-buildflags.patch
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		$(BLAS) gfortran mpfr $(MP_LIBRARY)
		$(BLAS) gfortran mpfr $(MP_LIBRARY) \| cmake