From 3be763a506671278a2bc1d73b8ce91acf162a547 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Mon, 27 Feb 2023 19:08:24 +0100 Subject: [PATCH 01/17] [SuiteSparse_jll] Update to v7.0.1 Update checksums --- Makefile | 2 +- base/Makefile | 2 + deps/checksums/suitesparse | 68 +++++++++---------- deps/libsuitesparse.mk | 67 +++++++----------- deps/libsuitesparse.version | 2 +- stdlib/SuiteSparse_jll/Project.toml | 2 +- stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl | 48 ++++++------- stdlib/SuiteSparse_jll/test/runtests.jl | 2 +- 8 files changed, 87 insertions(+), 106 deletions(-) diff --git a/Makefile b/Makefile index 5e9b4ccf5460a..1565014a0fa5e 100644 --- a/Makefile +++ b/Makefile @@ -196,7 +196,7 @@ else ifeq ($(JULIA_BUILD_MODE),debug) JL_PRIVATE_LIBS-0 += libjulia-internal-debug libjulia-codegen-debug endif ifeq ($(USE_GPL_LIBS), 1) -JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSUITESPARSE) += libamd libbtf libcamd libccolamd libcholmod libcolamd libklu libldl librbio libspqr libsuitesparseconfig libumfpack +JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSUITESPARSE) += libamd libbtf libcamd libccolamd libcholmod libcholmod_cuda libcolamd libklu libldl librbio libspqr libspqr_cuda libsuitesparseconfig libumfpack endif JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBBLASTRAMPOLINE) += libblastrampoline JL_PRIVATE_LIBS-$(USE_SYSTEM_PCRE) += libpcre2-8 diff --git a/base/Makefile b/base/Makefile index 493302af78b02..ad2bb6a63ccc0 100644 --- a/base/Makefile +++ b/base/Makefile @@ -269,9 +269,11 @@ $(eval $(call symlink_system_library,LIBSUITESPARSE,libamd)) $(eval $(call symlink_system_library,LIBSUITESPARSE,libcamd)) $(eval $(call symlink_system_library,LIBSUITESPARSE,libccolamd)) $(eval $(call symlink_system_library,LIBSUITESPARSE,libcholmod)) +$(eval $(call symlink_system_library,LIBSUITESPARSE,libcholmod_cuda)) $(eval $(call symlink_system_library,LIBSUITESPARSE,libcolamd)) $(eval $(call symlink_system_library,LIBSUITESPARSE,libumfpack)) $(eval $(call symlink_system_library,LIBSUITESPARSE,libspqr)) +$(eval $(call symlink_system_library,LIBSUITESPARSE,libspqr_cuda)) $(eval $(call symlink_system_library,LIBSUITESPARSE,libsuitesparseconfig)) # EXCLUDED LIBRARIES (installed/used, but not vendored for use with dlopen): # libunwind diff --git a/deps/checksums/suitesparse b/deps/checksums/suitesparse index 65db184c5cbca..e46b4b6181a90 100644 --- a/deps/checksums/suitesparse +++ b/deps/checksums/suitesparse @@ -1,36 +1,36 @@ -SuiteSparse-5.10.1.tar.gz/md5/68bb912f3cf3d2b01f30ebafef690302 -SuiteSparse-5.10.1.tar.gz/sha512/8f85c6d63b76cba95707dfa732c51200df7794cb4c2599dbd92100475747b8d02b05089a47096e85c60b89bc852a8e768e0670f24902a82d29494a80ccf2bb5f +SuiteSparse-7.0.1.tar.gz/md5/d31bbe2a26dced338b23e71f7c9b541a +SuiteSparse-7.0.1.tar.gz/sha512/af311efec01849d2c4445e163035a7013f3334a90edcda40f5dab0b35ad5d9a3e643c716c08a131ae99195bec016d1363623570058b05f3ee2a9ed4c483016db SuiteSparse-e8285dd13a6d5b5cf52d8124793fc4d622d07554.tar.gz/md5/46541001073d1c3c85e18d910f8308f3 SuiteSparse-e8285dd13a6d5b5cf52d8124793fc4d622d07554.tar.gz/sha512/f7470a447b934ca9315e216a07b97e363f11bc93186f9aa057b20b2d05092c58ae4f1b733de362de4a0730861c00be4ca5588d0b3ba65f018c1798b9122b9672 -SuiteSparse.v5.10.1+6.aarch64-apple-darwin.tar.gz/md5/14cc0d3c7b5271246eb45c495c7a4e79 -SuiteSparse.v5.10.1+6.aarch64-apple-darwin.tar.gz/sha512/a56da81a5165bcdf49d1913799bffcaea84efd6f8740dd002f700eb4070313cac64be5359ba88d1f39fe976944e34ee6ed6575ceade2ae2d97b850e6a1aee0ae -SuiteSparse.v5.10.1+6.aarch64-linux-gnu.tar.gz/md5/b93b047040e2db5e0277e52b9bd3feb7 -SuiteSparse.v5.10.1+6.aarch64-linux-gnu.tar.gz/sha512/e03a9ecafce9dcc6791dd202efac2f864bdf3a0a4524567801c092304c17ab15dae949abfb1fe2bc71b367a0e398260ccfdd91dad611860090df471b44e75ee3 -SuiteSparse.v5.10.1+6.aarch64-linux-musl.tar.gz/md5/22c44d9d82608724e1aa62d126fdf030 -SuiteSparse.v5.10.1+6.aarch64-linux-musl.tar.gz/sha512/39a3c11429cd3e6afa2f615dc4b0c8d16d7b94a423d76e598b3b48db2c47fe64d644233e2a672bd6654f8bd57da91dd7a787a3e4978f0f803237ab4ec6f97905 -SuiteSparse.v5.10.1+6.armv6l-linux-gnueabihf.tar.gz/md5/505ee3c0750a720ed1e4de670f81e220 -SuiteSparse.v5.10.1+6.armv6l-linux-gnueabihf.tar.gz/sha512/20fafbdd2df96427b95b730901663c255dafc415f3a8154e3364ec46ca2b205fa45a081f92272b81d7aed22b9f8373d2d4eee70ff8ab5ed8d1d80b6a340c8aad -SuiteSparse.v5.10.1+6.armv6l-linux-musleabihf.tar.gz/md5/8e1821668cbca9c2d3c5cee5ad1746c8 -SuiteSparse.v5.10.1+6.armv6l-linux-musleabihf.tar.gz/sha512/58fb4ec10a537d101e0be8417648a4d0127444b3fe8a32498320aaaefc747f5cac3c7503b70775c1d708b077034060fe5ed8609e73bf9be22f9a8729abc4c73d -SuiteSparse.v5.10.1+6.armv7l-linux-gnueabihf.tar.gz/md5/43d133a916e548ecae50671b92f64c6f -SuiteSparse.v5.10.1+6.armv7l-linux-gnueabihf.tar.gz/sha512/f7f767c0e7eb45afe10941513695bfcc9e0628195cb9245a9c24700967f9cfa7cd0030cdcfaf47a76400d5dd3eb908c1f9ea5e44efd3054ed7bba47e664279a2 -SuiteSparse.v5.10.1+6.armv7l-linux-musleabihf.tar.gz/md5/7c3b2e19d3296002b1aa72b951421eec -SuiteSparse.v5.10.1+6.armv7l-linux-musleabihf.tar.gz/sha512/7546ce844b03d0414168ab6d0925f848b14b35ed27cb545b41f2512bad44b7da4f39004e75657c7c572557ccb015177d3e0d346e2c3182b27a6ee602876ee0df -SuiteSparse.v5.10.1+6.i686-linux-gnu.tar.gz/md5/e00a73f0fad92a266dd8d3774707f9b1 -SuiteSparse.v5.10.1+6.i686-linux-gnu.tar.gz/sha512/9cc2332a78d0490170d722d2f062d6f660fb3bd9042dd177c3683675d0f44306b93bf882cb79c0707ab79318280d08582431eb1c92334f2bb50946e942be0b16 -SuiteSparse.v5.10.1+6.i686-linux-musl.tar.gz/md5/71fb647a76ecc9e547df903535011b5b -SuiteSparse.v5.10.1+6.i686-linux-musl.tar.gz/sha512/7806cd9179e46fa61b63a3f711b37289da72a48430912e564c88e3dcb4caaad8a9bd232d6f572f8270806d286e4a4eb9edfdcda29fe8d91dadb1b03d57eda76d -SuiteSparse.v5.10.1+6.i686-w64-mingw32.tar.gz/md5/d4e6c9aba53b2107469cda6de9ca2724 -SuiteSparse.v5.10.1+6.i686-w64-mingw32.tar.gz/sha512/c0c49641c6e7f3f0333e3fa44ce62dcd4ad5942c74b2429aaeb49fd0d7b8c13c872150ae4d54cc5cfaae07a65a24a7d4ea731adc78db3d9341a54e5edb5c80f0 -SuiteSparse.v5.10.1+6.powerpc64le-linux-gnu.tar.gz/md5/5432dca00f7e0f42b7dbd16083537318 -SuiteSparse.v5.10.1+6.powerpc64le-linux-gnu.tar.gz/sha512/61946a7faa2a49613ea2c08a01f064b619c9ec134f0d9509eb42a96bebf2a63f5fb57b14702f25618def410658da8334bb6aa5200280956e573aa944476efef2 -SuiteSparse.v5.10.1+6.x86_64-apple-darwin.tar.gz/md5/ca175d433a02f91407e2921872c2b67c -SuiteSparse.v5.10.1+6.x86_64-apple-darwin.tar.gz/sha512/14d9b01e2db8c04f9a1076bcbac022c6573728f708f31344825805fed53971e922aecebeb4b2f567a6b5f44ad27c0d66e142887ff4684c8679ab65b902538abf -SuiteSparse.v5.10.1+6.x86_64-linux-gnu.tar.gz/md5/6c271ced91dbb1bf748efbaace1dac10 -SuiteSparse.v5.10.1+6.x86_64-linux-gnu.tar.gz/sha512/5984db9c101ef80d63024bc3b51821268349450deedd5aaea5fade0fc5932992379a0133c4f91711af134014835afea1bde518ae1e7efd482d556a97e54b0238 -SuiteSparse.v5.10.1+6.x86_64-linux-musl.tar.gz/md5/c7d55069969dbb98997687c847ab643d -SuiteSparse.v5.10.1+6.x86_64-linux-musl.tar.gz/sha512/b54012765f7c7329125b41c3fb678e23888a858d3fd5a139c52bd980e383a308282238020754e795de6457fb312b61c39e6ab2d665ca5af95c65f52f0c354067 -SuiteSparse.v5.10.1+6.x86_64-unknown-freebsd.tar.gz/md5/e641be38c8205e362a7299c736aedad5 -SuiteSparse.v5.10.1+6.x86_64-unknown-freebsd.tar.gz/sha512/d55e85335bccb59210014c35233ad9e42f5d086f01a43fe0ee13f21cbb8555ea05f1d91c95a6d3f883477086851e123c4b0cde7cd2dcd8e08835fe9f685d5b25 -SuiteSparse.v5.10.1+6.x86_64-w64-mingw32.tar.gz/md5/45cad947fa962e1f192cb7b52a1f7b3c -SuiteSparse.v5.10.1+6.x86_64-w64-mingw32.tar.gz/sha512/e6545c681ba7d2346baf8fafabdf25f2faf6ea54763d999b14499f30d235e90f34fd4f83430ea7f17c01adea0699dff6c4d7ae3cb938c749d6a15f8bf4f1519f +SuiteSparse.v7.0.1+0.aarch64-apple-darwin.tar.gz/md5/a46b2ba38b460d259021f254f211b536 +SuiteSparse.v7.0.1+0.aarch64-apple-darwin.tar.gz/sha512/509cc94e99e799dfea53a2f0773e70274bc2d0611691289f2ac5c879a8ec52a2c7edaae3b3d8a19afb54f50d57a63adaa48b4ec40eb44f416e14d7129a74a1a3 +SuiteSparse.v7.0.1+0.aarch64-linux-gnu.tar.gz/md5/37eecb206e8fb30cfbda772460327609 +SuiteSparse.v7.0.1+0.aarch64-linux-gnu.tar.gz/sha512/ca9dba3afd9ab51d94d305fcf28a55fa741883d865b50237ddd83d197a0e4c42b0d2d12a0e8a71700553a9843270190d547da19e1424009ebc9eb81c54e36cf7 +SuiteSparse.v7.0.1+0.aarch64-linux-musl.tar.gz/md5/b57d52cebd6653d2eb5532b742bea455 +SuiteSparse.v7.0.1+0.aarch64-linux-musl.tar.gz/sha512/71133c32ff143ed9ddf821f5911650cfd9f036ab573043acdd002fcfc545433bc3bad9d47309d09e8a163015fdcba09e1aea7700b23194548e8cec4fc7488703 +SuiteSparse.v7.0.1+0.armv6l-linux-gnueabihf.tar.gz/md5/063bb5fa15abe461c3c0712f45969fab +SuiteSparse.v7.0.1+0.armv6l-linux-gnueabihf.tar.gz/sha512/72d9e8443461283fd04994e91c6a04e7fb39bce399025a16748c20efc3320369e890b021d0733c4070271ba9f8e2b7611560885aa523c13aa579589e7ec1614d +SuiteSparse.v7.0.1+0.armv6l-linux-musleabihf.tar.gz/md5/d7621f8f7e79c30026896b229334fde6 +SuiteSparse.v7.0.1+0.armv6l-linux-musleabihf.tar.gz/sha512/12bce1f5f39f17461b21b4afabf7d9aad7c2cd570c329a75b5e99cd5a300802a4aae3ae1100a0fe8616bd12a8fedeb154967616ad67c7aaedf302b7396b2fa49 +SuiteSparse.v7.0.1+0.armv7l-linux-gnueabihf.tar.gz/md5/16b20618a9443d222ca1dbcaee328fe7 +SuiteSparse.v7.0.1+0.armv7l-linux-gnueabihf.tar.gz/sha512/67924af6577fdb0704e03754f96e7d0bafd4cca37d0436cf996fab5ac43de606386ae3ea0a9979585fc1e2e950648768992d3ff555fdd93d380bd5578fd4e93e +SuiteSparse.v7.0.1+0.armv7l-linux-musleabihf.tar.gz/md5/1f496d19cb82623456e22b22922fc69d +SuiteSparse.v7.0.1+0.armv7l-linux-musleabihf.tar.gz/sha512/18b63deea2b3d0863d634f5de5d9ce529eed5c9ce07164d070da6d65c7a9a54fff69596e379f851fee1f57b8fdb9796e5afa812c117207120c7ef612c2bebe40 +SuiteSparse.v7.0.1+0.i686-linux-gnu.tar.gz/md5/0b7ff6e7be4985f73a7c86fe46de397e +SuiteSparse.v7.0.1+0.i686-linux-gnu.tar.gz/sha512/85242ce2163e5c838ccb8f4463bdb3bd5ace5b20e72916513d80b769c085ea2f178d6ec6e4c89208f6a5135515340c61fdf3f98de8b109b1db51fb93d821b536 +SuiteSparse.v7.0.1+0.i686-linux-musl.tar.gz/md5/09de2bb8f368952044ce99b23da2c175 +SuiteSparse.v7.0.1+0.i686-linux-musl.tar.gz/sha512/76c2b7f35e16bc525df1e7e26a216461f4f6f7a48caa3d2bca1daf64b26058b5b8ca09dcc996e1dd9c631ec08c3a85e09c67c69bd47de29fd0facd84fcde31df +SuiteSparse.v7.0.1+0.i686-w64-mingw32.tar.gz/md5/20e53a1777edcaab38cc2572de5b3a55 +SuiteSparse.v7.0.1+0.i686-w64-mingw32.tar.gz/sha512/9df0be5001aa05de08ada9500c1635deeb92f217b075c37d2e4c900acb1e75a98a49b76ab79cb8d7fb6c97cf74e5b67762e42b9b475b03c0e8bd7a4e74ef19d1 +SuiteSparse.v7.0.1+0.powerpc64le-linux-gnu.tar.gz/md5/934cd7c0db8ddefd02564830cfa2e059 +SuiteSparse.v7.0.1+0.powerpc64le-linux-gnu.tar.gz/sha512/a3c0748462c311b24e1de3c2ec5f7358c7694a2e30ce67ef58b7491f519d486aa64bffde1a88b77c347a44a7c89f5caeb73c16017951f5dfb25ac57b23482963 +SuiteSparse.v7.0.1+0.x86_64-apple-darwin.tar.gz/md5/bffa77fd8d37e6aad3e855f4edd79bdb +SuiteSparse.v7.0.1+0.x86_64-apple-darwin.tar.gz/sha512/54bee75edccac7934df68fbab2d35db755f80b32508c94c6fe1d93f9d4f9cf1f723fb034c5e1ca500f64be8b3911921a6fc57b9f84322a26ef51067e5d5be26c +SuiteSparse.v7.0.1+0.x86_64-linux-gnu.tar.gz/md5/9bf03ef3e69c7460008f5f2c0dbaa9d6 +SuiteSparse.v7.0.1+0.x86_64-linux-gnu.tar.gz/sha512/5d581dcff9e885d2848e60d09ebf0072222ab91d188532d205d3a45b3be0a179ee40ba6b40192d52528100e1afde656e05db404fac6fb4a65d42a71f646ca395 +SuiteSparse.v7.0.1+0.x86_64-linux-musl.tar.gz/md5/3cd348922eeb73fa8f9958341628f7a6 +SuiteSparse.v7.0.1+0.x86_64-linux-musl.tar.gz/sha512/493f4fc4c0813a8e5b2fbc2f1711664807245c66e68b3880d9c95e0f20bba93f5d912531a4adf1900225ae8fe65a5ff1bb6842c235e772162ddf4eb9e78fcbf6 +SuiteSparse.v7.0.1+0.x86_64-unknown-freebsd.tar.gz/md5/1b8e67dffe3a7dd01575e763be0698aa +SuiteSparse.v7.0.1+0.x86_64-unknown-freebsd.tar.gz/sha512/b04436019f92edf334d0116afd5808a3f146bf35aa11293ae509e0de06c1192ed8100fd0366e1ffb24d1950cc0cce05b87f8244bb8da100f465ed4d4282e3e00 +SuiteSparse.v7.0.1+0.x86_64-w64-mingw32.tar.gz/md5/29f0e6c518fa97e4c5c9129a469fb0ab +SuiteSparse.v7.0.1+0.x86_64-w64-mingw32.tar.gz/sha512/e0e74a8614f9b7df09e6d8c6e522d9f46952974924d69d60bb08842e94752b5fbcf884a486eec8fa13e1e1afe73019c1d61f92432d147b2adcebf55210b477ef diff --git a/deps/libsuitesparse.mk b/deps/libsuitesparse.mk index 7d79e03ee8d0e..f67e0e4b9a0a5 100644 --- a/deps/libsuitesparse.mk +++ b/deps/libsuitesparse.mk @@ -1,40 +1,27 @@ ## LIBSUITESPARSE ## include $(SRCDIR)/libsuitesparse.version -ifeq ($(USE_BLAS64), 1) -UMFPACK_CONFIG := -DLONGBLAS='long long' -CHOLMOD_CONFIG := -DLONGBLAS='long long' -SPQR_CONFIG := -DLONGBLAS='long long' -UMFPACK_CONFIG += -DSUN64 -CHOLMOD_CONFIG += -DSUN64 -SPQR_CONFIG += -DSUN64 -endif - -# Disable linking to libmetis -CHOLMOD_CONFIG += -DNPARTITION - ifneq ($(USE_BINARYBUILDER_LIBSUITESPARSE), 1) LIBSUITESPARSE_PROJECTS := AMD BTF CAMD CCOLAMD COLAMD CHOLMOD LDL KLU UMFPACK RBio SPQR LIBSUITESPARSE_LIBS := $(addsuffix .*$(SHLIB_EXT)*,suitesparseconfig amd btf camd ccolamd colamd cholmod klu ldl umfpack rbio spqr) -SUITESPARSE_LIB := $(LDFLAGS) -L"$(abspath $(BUILDDIR))/SuiteSparse-$(LIBSUITESPARSE_VER)/lib" -ifeq ($(OS), Darwin) -SUITESPARSE_LIB += $(RPATH_ESCAPED_ORIGIN) -endif -LIBSUITESPARSE_MFLAGS := CC="$(CC) $(SANITIZE_OPTS)" CXX="$(CXX) $(SANITIZE_OPTS)" F77="$(FC)" \ - AR="$(AR)" RANLIB="$(RANLIB)" \ - BLAS="-L$(build_shlibdir) -lblastrampoline" \ - LAPACK="-L$(build_shlibdir) -lblastrampoline" \ - LDFLAGS="$(SUITESPARSE_LIB) $(SANITIZE_LDFLAGS)" CFOPENMP="" CUDA=no CUDA_PATH="" \ - UMFPACK_CONFIG="$(UMFPACK_CONFIG)" \ - CHOLMOD_CONFIG="$(CHOLMOD_CONFIG)" \ - SPQR_CONFIG="$(SPQR_CONFIG)" -ifeq ($(OS),WINNT) -LIBSUITESPARSE_MFLAGS += UNAME=Windows -else -LIBSUITESPARSE_MFLAGS += UNAME=$(OS) -endif +LIBSUITESPARSE_CMAKE_FLAGS := $(CMAKE_COMMON) \ + -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_CUDA=NO \ + -DNFORTRAN=YES \ + -DNOPENMP=YES \ + -DNPARTITION=YES \ + -DBLAS_FOUND=1 \ + -DBLAS_LIBRARIES="$(build_shlibdir)/libblastrampoline.$(SHLIB_EXT)" \ + -DBLAS_LINKER_FLAGS="blastrampoline" \ + -DBLAS_UNDERSCORE=ON \ + -DBLA_VENDOR="blastrampoline" \ + -DBLAS64_SUFFIX="_64" \ + -DALLOW_64BIT_BLAS=ON \ + -DLAPACK_FOUND=1 \ + -DLAPACK_LIBRARIES="$(build_shlibdir)/libblastrampoline.$(SHLIB_EXT)" \ + -DLAPACK_LINKER_FLAGS="blastrampoline" $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz: | $(SRCCACHE) $(JLDOWNLOAD) $@ https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$(LIBSUITESPARSE_VER).tar.gz @@ -48,19 +35,16 @@ $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/source-extracted: $(SRCCACHE)/Suit checksum-libsuitesparse: $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz $(JLCHECKSUM) $< -$(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/SuiteSparse-shlib.patch-applied: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/source-extracted - cd $(dir $@) && patch -p1 < $(SRCDIR)/patches/SuiteSparse-shlib.patch - echo 1 > $@ -$(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/SuiteSparse-shlib.patch-applied - $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled: | $(build_prefix)/manifest/blastrampoline $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/source-extracted - $(MAKE) -C $(dir $<)SuiteSparse_config library config $(LIBSUITESPARSE_MFLAGS) - $(INSTALL_NAME_CMD)libsuitesparseconfig.$(SHLIB_EXT) $(dir $<)lib/libsuitesparseconfig.$(SHLIB_EXT) - for PROJ in $(LIBSUITESPARSE_PROJECTS); do \ - $(MAKE) -C $(dir $<)$${PROJ} library $(LIBSUITESPARSE_MFLAGS) || exit 1; \ - $(INSTALL_NAME_CMD)lib`echo $${PROJ} | tr A-Z a-z`.$(SHLIB_EXT) $(dir $<)lib/lib`echo $${PROJ} | tr A-Z a-z`.$(SHLIB_EXT) || exit 1; \ + cd $(dir $<); \ + for PROJ in SuiteSparse_config $(LIBSUITESPARSE_PROJECTS); do \ + cd $${PROJ}/build || exit 1; \ + $(CMAKE) .. $(LIBSUITESPARSE_CMAKE_FLAGS) || exit 1; \ + make || exit 1; \ + make install || exit 1; \ + cd ../..; \ done echo 1 > $@ @@ -78,11 +62,6 @@ $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-checked: $(BUILDDIR)/SuiteSp UNINSTALL_suitesparse := $(LIBSUITESPARSE_VER) manual_suitesparse $(LIBSUITESPARSE_LIBS) $(build_prefix)/manifest/libsuitesparse: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled | $(build_prefix)/manifest $(build_shlibdir) - for lib in $(LIBSUITESPARSE_LIBS); do \ - cp -a $(dir $<)lib/lib$${lib} $(build_shlibdir) || exit 1; \ - done - #cp -a $(dir $<)lib/* $(build_shlibdir) - #cp -a $(dir $<)include/* $(build_includedir) echo $(UNINSTALL_libsuitesparse) > $@ clean-libsuitesparse: uninstall-libsuitesparse diff --git a/deps/libsuitesparse.version b/deps/libsuitesparse.version index 2237db6f2d116..9f5973d79a22a 100644 --- a/deps/libsuitesparse.version +++ b/deps/libsuitesparse.version @@ -2,4 +2,4 @@ LIBSUITESPARSE_JLL_NAME := SuiteSparse ## source build -LIBSUITESPARSE_VER := 5.10.1 +LIBSUITESPARSE_VER := 7.0.1 diff --git a/stdlib/SuiteSparse_jll/Project.toml b/stdlib/SuiteSparse_jll/Project.toml index d1fb2c25fa68b..021dcb4c65e79 100644 --- a/stdlib/SuiteSparse_jll/Project.toml +++ b/stdlib/SuiteSparse_jll/Project.toml @@ -1,6 +1,6 @@ name = "SuiteSparse_jll" uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" -version = "5.10.1+6" +version = "7.0.1+0" [deps] libblastrampoline_jll = "8e850b90-86db-534c-a0d3-1478176c7d93" diff --git a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl index a347a91721bad..2f0b46fee5c15 100644 --- a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl +++ b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl @@ -54,31 +54,31 @@ if Sys.iswindows() const libsuitesparseconfig = "libsuitesparseconfig.dll" const libumfpack = "libumfpack.dll" elseif Sys.isapple() - const libamd = "@rpath/libamd.2.dylib" - const libbtf = "@rpath/libbtf.1.dylib" - const libcamd = "@rpath/libcamd.2.dylib" - const libccolamd = "@rpath/libccolamd.2.dylib" - const libcholmod = "@rpath/libcholmod.3.dylib" - const libcolamd = "@rpath/libcolamd.2.dylib" - const libklu = "@rpath/libklu.1.dylib" - const libldl = "@rpath/libldl.2.dylib" - const librbio = "@rpath/librbio.2.dylib" - const libspqr = "@rpath/libspqr.2.dylib" - const libsuitesparseconfig = "@rpath/libsuitesparseconfig.5.dylib" - const libumfpack = "@rpath/libumfpack.5.dylib" + const libamd = "@rpath/libamd.3.dylib" + const libbtf = "@rpath/libbtf.2.dylib" + const libcamd = "@rpath/libcamd.3.dylib" + const libccolamd = "@rpath/libccolamd.3.dylib" + const libcholmod = "@rpath/libcholmod.4.dylib" + const libcolamd = "@rpath/libcolamd.3.dylib" + const libklu = "@rpath/libklu.2.dylib" + const libldl = "@rpath/libldl.3.dylib" + const librbio = "@rpath/librbio.3.dylib" + const libspqr = "@rpath/libspqr.3.dylib" + const libsuitesparseconfig = "@rpath/libsuitesparseconfig.7.dylib" + const libumfpack = "@rpath/libumfpack.6.dylib" else - const libamd = "libamd.so.2" - const libbtf = "libbtf.so.1" - const libcamd = "libcamd.so.2" - const libccolamd = "libccolamd.so.2" - const libcholmod = "libcholmod.so.3" - const libcolamd = "libcolamd.so.2" - const libklu = "libklu.so.1" - const libldl = "libldl.so.2" - const librbio = "librbio.so.2" - const libspqr = "libspqr.so.2" - const libsuitesparseconfig = "libsuitesparseconfig.so.5" - const libumfpack = "libumfpack.so.5" + const libamd = "libamd.so.3" + const libbtf = "libbtf.so.2" + const libcamd = "libcamd.so.3" + const libccolamd = "libccolamd.so.3" + const libcholmod = "libcholmod.so.4" + const libcolamd = "libcolamd.so.3" + const libklu = "libklu.so.2" + const libldl = "libldl.so.3" + const librbio = "librbio.so.3" + const libspqr = "libspqr.so.3" + const libsuitesparseconfig = "libsuitesparseconfig.so.7" + const libumfpack = "libumfpack.so.6" end function __init__() diff --git a/stdlib/SuiteSparse_jll/test/runtests.jl b/stdlib/SuiteSparse_jll/test/runtests.jl index ca356951f99e2..ac768021603b1 100644 --- a/stdlib/SuiteSparse_jll/test/runtests.jl +++ b/stdlib/SuiteSparse_jll/test/runtests.jl @@ -3,5 +3,5 @@ using Test, SuiteSparse_jll @testset "SuiteSparse_jll" begin - @test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) == 5010 + @test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) == 7001 end From e2f0f805c285c4bde1e9e86858d5a0caa40d56f5 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Sat, 11 Mar 2023 10:46:13 -0500 Subject: [PATCH 02/17] Use sparsearrays.jl updated to work with SuiteSparse 7 --- .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 + .../sha512 | 1 + deps/checksums/suitesparse | 64 +++++++++---------- deps/libsuitesparse.mk | 9 +-- stdlib/SparseArrays.version | 2 +- stdlib/SuiteSparse_jll/Project.toml | 4 +- stdlib/SuiteSparse_jll/test/runtests.jl | 4 +- 9 files changed, 45 insertions(+), 42 deletions(-) delete mode 100644 deps/checksums/SparseArrays-8affe9e499379616e33fc60a24bb31500e8423d7.tar.gz/md5 delete mode 100644 deps/checksums/SparseArrays-8affe9e499379616e33fc60a24bb31500e8423d7.tar.gz/sha512 create mode 100644 deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/md5 create mode 100644 deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-8affe9e499379616e33fc60a24bb31500e8423d7.tar.gz/md5 b/deps/checksums/SparseArrays-8affe9e499379616e33fc60a24bb31500e8423d7.tar.gz/md5 deleted file mode 100644 index 96861ba265b5f..0000000000000 --- a/deps/checksums/SparseArrays-8affe9e499379616e33fc60a24bb31500e8423d7.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -e6dc511b49e07a167848adc4e12690d8 diff --git a/deps/checksums/SparseArrays-8affe9e499379616e33fc60a24bb31500e8423d7.tar.gz/sha512 b/deps/checksums/SparseArrays-8affe9e499379616e33fc60a24bb31500e8423d7.tar.gz/sha512 deleted file mode 100644 index f503304f810e4..0000000000000 --- a/deps/checksums/SparseArrays-8affe9e499379616e33fc60a24bb31500e8423d7.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -f40fd137ccd6651fc8b697f57cfcbd8e3feccb99f6a6b32fbaa69cc0160b78cefc662b914ff8f4e48478ca48f9583318a6030d922d43ed66f8db59fd5985f768 diff --git a/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/md5 b/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/md5 new file mode 100644 index 0000000000000..2abe755cb373b --- /dev/null +++ b/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/md5 @@ -0,0 +1 @@ +39c1a82409af85b411560bace9c08dac diff --git a/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/sha512 b/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/sha512 new file mode 100644 index 0000000000000..f72f87e253a2a --- /dev/null +++ b/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/sha512 @@ -0,0 +1 @@ +469bfb7a6ac84c2a418bd7d89fb943b6007b1a454228744066bb810f3eb03ad6b0d60c11275a80349f56f4effbbf02aa8a4b7ab7e3e6f2bba324e02811a0bcb7 diff --git a/deps/checksums/suitesparse b/deps/checksums/suitesparse index e46b4b6181a90..1e596e15a5c02 100644 --- a/deps/checksums/suitesparse +++ b/deps/checksums/suitesparse @@ -2,35 +2,35 @@ SuiteSparse-7.0.1.tar.gz/md5/d31bbe2a26dced338b23e71f7c9b541a SuiteSparse-7.0.1.tar.gz/sha512/af311efec01849d2c4445e163035a7013f3334a90edcda40f5dab0b35ad5d9a3e643c716c08a131ae99195bec016d1363623570058b05f3ee2a9ed4c483016db SuiteSparse-e8285dd13a6d5b5cf52d8124793fc4d622d07554.tar.gz/md5/46541001073d1c3c85e18d910f8308f3 SuiteSparse-e8285dd13a6d5b5cf52d8124793fc4d622d07554.tar.gz/sha512/f7470a447b934ca9315e216a07b97e363f11bc93186f9aa057b20b2d05092c58ae4f1b733de362de4a0730861c00be4ca5588d0b3ba65f018c1798b9122b9672 -SuiteSparse.v7.0.1+0.aarch64-apple-darwin.tar.gz/md5/a46b2ba38b460d259021f254f211b536 -SuiteSparse.v7.0.1+0.aarch64-apple-darwin.tar.gz/sha512/509cc94e99e799dfea53a2f0773e70274bc2d0611691289f2ac5c879a8ec52a2c7edaae3b3d8a19afb54f50d57a63adaa48b4ec40eb44f416e14d7129a74a1a3 -SuiteSparse.v7.0.1+0.aarch64-linux-gnu.tar.gz/md5/37eecb206e8fb30cfbda772460327609 -SuiteSparse.v7.0.1+0.aarch64-linux-gnu.tar.gz/sha512/ca9dba3afd9ab51d94d305fcf28a55fa741883d865b50237ddd83d197a0e4c42b0d2d12a0e8a71700553a9843270190d547da19e1424009ebc9eb81c54e36cf7 -SuiteSparse.v7.0.1+0.aarch64-linux-musl.tar.gz/md5/b57d52cebd6653d2eb5532b742bea455 -SuiteSparse.v7.0.1+0.aarch64-linux-musl.tar.gz/sha512/71133c32ff143ed9ddf821f5911650cfd9f036ab573043acdd002fcfc545433bc3bad9d47309d09e8a163015fdcba09e1aea7700b23194548e8cec4fc7488703 -SuiteSparse.v7.0.1+0.armv6l-linux-gnueabihf.tar.gz/md5/063bb5fa15abe461c3c0712f45969fab -SuiteSparse.v7.0.1+0.armv6l-linux-gnueabihf.tar.gz/sha512/72d9e8443461283fd04994e91c6a04e7fb39bce399025a16748c20efc3320369e890b021d0733c4070271ba9f8e2b7611560885aa523c13aa579589e7ec1614d -SuiteSparse.v7.0.1+0.armv6l-linux-musleabihf.tar.gz/md5/d7621f8f7e79c30026896b229334fde6 -SuiteSparse.v7.0.1+0.armv6l-linux-musleabihf.tar.gz/sha512/12bce1f5f39f17461b21b4afabf7d9aad7c2cd570c329a75b5e99cd5a300802a4aae3ae1100a0fe8616bd12a8fedeb154967616ad67c7aaedf302b7396b2fa49 -SuiteSparse.v7.0.1+0.armv7l-linux-gnueabihf.tar.gz/md5/16b20618a9443d222ca1dbcaee328fe7 -SuiteSparse.v7.0.1+0.armv7l-linux-gnueabihf.tar.gz/sha512/67924af6577fdb0704e03754f96e7d0bafd4cca37d0436cf996fab5ac43de606386ae3ea0a9979585fc1e2e950648768992d3ff555fdd93d380bd5578fd4e93e -SuiteSparse.v7.0.1+0.armv7l-linux-musleabihf.tar.gz/md5/1f496d19cb82623456e22b22922fc69d -SuiteSparse.v7.0.1+0.armv7l-linux-musleabihf.tar.gz/sha512/18b63deea2b3d0863d634f5de5d9ce529eed5c9ce07164d070da6d65c7a9a54fff69596e379f851fee1f57b8fdb9796e5afa812c117207120c7ef612c2bebe40 -SuiteSparse.v7.0.1+0.i686-linux-gnu.tar.gz/md5/0b7ff6e7be4985f73a7c86fe46de397e -SuiteSparse.v7.0.1+0.i686-linux-gnu.tar.gz/sha512/85242ce2163e5c838ccb8f4463bdb3bd5ace5b20e72916513d80b769c085ea2f178d6ec6e4c89208f6a5135515340c61fdf3f98de8b109b1db51fb93d821b536 -SuiteSparse.v7.0.1+0.i686-linux-musl.tar.gz/md5/09de2bb8f368952044ce99b23da2c175 -SuiteSparse.v7.0.1+0.i686-linux-musl.tar.gz/sha512/76c2b7f35e16bc525df1e7e26a216461f4f6f7a48caa3d2bca1daf64b26058b5b8ca09dcc996e1dd9c631ec08c3a85e09c67c69bd47de29fd0facd84fcde31df -SuiteSparse.v7.0.1+0.i686-w64-mingw32.tar.gz/md5/20e53a1777edcaab38cc2572de5b3a55 -SuiteSparse.v7.0.1+0.i686-w64-mingw32.tar.gz/sha512/9df0be5001aa05de08ada9500c1635deeb92f217b075c37d2e4c900acb1e75a98a49b76ab79cb8d7fb6c97cf74e5b67762e42b9b475b03c0e8bd7a4e74ef19d1 -SuiteSparse.v7.0.1+0.powerpc64le-linux-gnu.tar.gz/md5/934cd7c0db8ddefd02564830cfa2e059 -SuiteSparse.v7.0.1+0.powerpc64le-linux-gnu.tar.gz/sha512/a3c0748462c311b24e1de3c2ec5f7358c7694a2e30ce67ef58b7491f519d486aa64bffde1a88b77c347a44a7c89f5caeb73c16017951f5dfb25ac57b23482963 -SuiteSparse.v7.0.1+0.x86_64-apple-darwin.tar.gz/md5/bffa77fd8d37e6aad3e855f4edd79bdb -SuiteSparse.v7.0.1+0.x86_64-apple-darwin.tar.gz/sha512/54bee75edccac7934df68fbab2d35db755f80b32508c94c6fe1d93f9d4f9cf1f723fb034c5e1ca500f64be8b3911921a6fc57b9f84322a26ef51067e5d5be26c -SuiteSparse.v7.0.1+0.x86_64-linux-gnu.tar.gz/md5/9bf03ef3e69c7460008f5f2c0dbaa9d6 -SuiteSparse.v7.0.1+0.x86_64-linux-gnu.tar.gz/sha512/5d581dcff9e885d2848e60d09ebf0072222ab91d188532d205d3a45b3be0a179ee40ba6b40192d52528100e1afde656e05db404fac6fb4a65d42a71f646ca395 -SuiteSparse.v7.0.1+0.x86_64-linux-musl.tar.gz/md5/3cd348922eeb73fa8f9958341628f7a6 -SuiteSparse.v7.0.1+0.x86_64-linux-musl.tar.gz/sha512/493f4fc4c0813a8e5b2fbc2f1711664807245c66e68b3880d9c95e0f20bba93f5d912531a4adf1900225ae8fe65a5ff1bb6842c235e772162ddf4eb9e78fcbf6 -SuiteSparse.v7.0.1+0.x86_64-unknown-freebsd.tar.gz/md5/1b8e67dffe3a7dd01575e763be0698aa -SuiteSparse.v7.0.1+0.x86_64-unknown-freebsd.tar.gz/sha512/b04436019f92edf334d0116afd5808a3f146bf35aa11293ae509e0de06c1192ed8100fd0366e1ffb24d1950cc0cce05b87f8244bb8da100f465ed4d4282e3e00 -SuiteSparse.v7.0.1+0.x86_64-w64-mingw32.tar.gz/md5/29f0e6c518fa97e4c5c9129a469fb0ab -SuiteSparse.v7.0.1+0.x86_64-w64-mingw32.tar.gz/sha512/e0e74a8614f9b7df09e6d8c6e522d9f46952974924d69d60bb08842e94752b5fbcf884a486eec8fa13e1e1afe73019c1d61f92432d147b2adcebf55210b477ef +SuiteSparse.v7.0.1+3.aarch64-apple-darwin.tar.gz/md5/584c09a10071546d544c6bd2be92c16d +SuiteSparse.v7.0.1+3.aarch64-apple-darwin.tar.gz/sha512/abfd74078488ff2a1dc27fd7d9397ff891ead41563b38d4141e99ce2dca1ee088b85f0cf188e53b3ed3f55564a4f479d9deb5146e9bfcb6d2b29899c843b02e2 +SuiteSparse.v7.0.1+3.aarch64-linux-gnu.tar.gz/md5/845e902b4663ec635df0447334b7bc37 +SuiteSparse.v7.0.1+3.aarch64-linux-gnu.tar.gz/sha512/db3080c931c50a02f1a75b2fd8332a681e98ed6ae6becfd7f2a0ea2d17ddfa108a364e7d51c437e7834cb87a62a4b550f2686d1ef5ca56dd2ef6bea3d9d8ee3e +SuiteSparse.v7.0.1+3.aarch64-linux-musl.tar.gz/md5/8586732c13088f9584ce61368697aaa3 +SuiteSparse.v7.0.1+3.aarch64-linux-musl.tar.gz/sha512/67ca602490a64f1026bc1d7d8cdec61e09cd3eb7944d1367877a417329c2890da9e6b35d37b7d10d6b1b81c6602672c12b2990d81e09c3e233476b21d11d7e72 +SuiteSparse.v7.0.1+3.armv6l-linux-gnueabihf.tar.gz/md5/35f8bb2ea5e3836c5f222ae8357c58bd +SuiteSparse.v7.0.1+3.armv6l-linux-gnueabihf.tar.gz/sha512/7420cedd08e65e469fd063affba1a5700bec87521853067ac91a7a70e9ee4e4aa1d3511a63863be3ec3ea68f45533d64e1ff2b592579018915ebf91b0c1f6e69 +SuiteSparse.v7.0.1+3.armv6l-linux-musleabihf.tar.gz/md5/51db0e39cb6a8a51de891266a708aba2 +SuiteSparse.v7.0.1+3.armv6l-linux-musleabihf.tar.gz/sha512/9e9bb51c6c24b19a3319fe0494b3db0ec7ee81ea33612870bb7d8668af6e0447de9ad5f6209744399e7249048eebf360c09e793243665abaf9e9a321ff01c449 +SuiteSparse.v7.0.1+3.armv7l-linux-gnueabihf.tar.gz/md5/d4e565bbef6a2fcf15d76d536cdfeaf6 +SuiteSparse.v7.0.1+3.armv7l-linux-gnueabihf.tar.gz/sha512/f6f6b46ca1da00754a9c5422ceecd334fb83c2fba7cf931334ec8b1781a96243f9a5af80f4576274aba481e8fa45590e3c14f5301fb41165f17d3e51367b2b65 +SuiteSparse.v7.0.1+3.armv7l-linux-musleabihf.tar.gz/md5/488bead9cbf2a6fae167c0bd2d1150a2 +SuiteSparse.v7.0.1+3.armv7l-linux-musleabihf.tar.gz/sha512/575a912b14ca63deb9efa11a08a0fc1a146621edec92ea6116f58fe68e5b66492cf4a9e1c429f0f5f5d32d63ddea60e2ef5fc13417c9ebe8bb3cd48b3dad76cb +SuiteSparse.v7.0.1+3.i686-linux-gnu.tar.gz/md5/3bcb54c889a7962ab7a5d14064ef1d58 +SuiteSparse.v7.0.1+3.i686-linux-gnu.tar.gz/sha512/9ac71a82585e56b69a6fd53eb73b1a56ca7d3f75f49f101c3ebc7892feb3534e605ee650e1197ceadb2787eb6ae14f010987bc0c319ecba57f3d06634343cb0a +SuiteSparse.v7.0.1+3.i686-linux-musl.tar.gz/md5/7694a7bb54075138dc3c90b78bda1252 +SuiteSparse.v7.0.1+3.i686-linux-musl.tar.gz/sha512/b327ca15a868d1757574ed645012f347e15eaa964a9a1c46f0dc2531cf1e1da0871da9b7dcec69c50b16be95cdd077f561ac78b51a0c4f06d5b10e4050331a6b +SuiteSparse.v7.0.1+3.i686-w64-mingw32.tar.gz/md5/3ce5f297b58e9b1ae96b8d065c1d03fc +SuiteSparse.v7.0.1+3.i686-w64-mingw32.tar.gz/sha512/a4e897d81972a6a5a76012a02dc00740868d371dc32960702310b03f9c826c22805afa2c0578cb1516be588c4e28e492e43065353e59d7108c1c834c50168d7a +SuiteSparse.v7.0.1+3.powerpc64le-linux-gnu.tar.gz/md5/a4e8099b38731bda3841da2126dd1df3 +SuiteSparse.v7.0.1+3.powerpc64le-linux-gnu.tar.gz/sha512/a8900f88f4f206e26aef5799786a4cd4281a61a4f635cb685d2e1202dfe59325610c3056c3d2656679633f775c5824d78fc775f306ba176956f0d798cf1e1c36 +SuiteSparse.v7.0.1+3.x86_64-apple-darwin.tar.gz/md5/f70894c9cf4e33aebd7b94ba144aa284 +SuiteSparse.v7.0.1+3.x86_64-apple-darwin.tar.gz/sha512/6625ce8f309085d323213acd07522e40195334734c4c80c665040795b58e7028e52ec8d78f5054edba9e94c58ff5aa5eb5aae3c743f4707bd6332bbd453c35fb +SuiteSparse.v7.0.1+3.x86_64-linux-gnu.tar.gz/md5/cfb3fd593acd1c190d7c50bff002739b +SuiteSparse.v7.0.1+3.x86_64-linux-gnu.tar.gz/sha512/dabc12da913c94cd88e4137d167ab399f01566579d1eb6cba6d5490bfd624aa48c2e504c07b81c52fe0277ceb1ff45363e6b8329ee56354c0d3f29defcc396c7 +SuiteSparse.v7.0.1+3.x86_64-linux-musl.tar.gz/md5/1050be06b8f916637d14bd700aff54d8 +SuiteSparse.v7.0.1+3.x86_64-linux-musl.tar.gz/sha512/535c95e34137db8b7bef49bab1ca9dcf82ee31e145aab89d1066622a27b0cd7193169e6f148fb2bca8f12e5dbf69e93a31f529f61460cab9fe0ae4d81160c156 +SuiteSparse.v7.0.1+3.x86_64-unknown-freebsd.tar.gz/md5/660d965cc925399ebc403433ca1e9cb4 +SuiteSparse.v7.0.1+3.x86_64-unknown-freebsd.tar.gz/sha512/fa6038d06a6413ebe066c0610f34dc57cb05048e304faaeaa256e900859790b6f40a05e3641e8dfabe1c6e5d838e20db8cfdb150ea200a5d64077a44da3af683 +SuiteSparse.v7.0.1+3.x86_64-w64-mingw32.tar.gz/md5/76682aea2a1d74645cc998a2a58968a2 +SuiteSparse.v7.0.1+3.x86_64-w64-mingw32.tar.gz/sha512/1bf79014a6ae2b58029c66f9d753e03b3e50f42f5719e02ea595b51508ff885408861337e78cc3f36d863f874e837f419be991f4cb658d757043a04a44734ba7 diff --git a/deps/libsuitesparse.mk b/deps/libsuitesparse.mk index f67e0e4b9a0a5..2d8188bfafb9c 100644 --- a/deps/libsuitesparse.mk +++ b/deps/libsuitesparse.mk @@ -8,10 +8,11 @@ LIBSUITESPARSE_LIBS := $(addsuffix .*$(SHLIB_EXT)*,suitesparseconfig amd btf cam LIBSUITESPARSE_CMAKE_FLAGS := $(CMAKE_COMMON) \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_CUDA=NO \ - -DNFORTRAN=YES \ - -DNOPENMP=YES \ - -DNPARTITION=YES \ + -DENABLE_CUDA=0 \ + -DNFORTRAN=1 \ + -DNOPENMP=1 \ + -DNPARTITION=0 \ + -DNSTATIC=1 \ -DBLAS_FOUND=1 \ -DBLAS_LIBRARIES="$(build_shlibdir)/libblastrampoline.$(SHLIB_EXT)" \ -DBLAS_LINKER_FLAGS="blastrampoline" \ diff --git a/stdlib/SparseArrays.version b/stdlib/SparseArrays.version index d4a548daef5d7..b664c31c4e64e 100644 --- a/stdlib/SparseArrays.version +++ b/stdlib/SparseArrays.version @@ -1,4 +1,4 @@ SPARSEARRAYS_BRANCH = main -SPARSEARRAYS_SHA1 = 8affe9e499379616e33fc60a24bb31500e8423d7 +SPARSEARRAYS_SHA1 = d9eec65da55f1c362b717990c15040d39bb36a34 SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1 diff --git a/stdlib/SuiteSparse_jll/Project.toml b/stdlib/SuiteSparse_jll/Project.toml index 021dcb4c65e79..fb59ad8cfd3c4 100644 --- a/stdlib/SuiteSparse_jll/Project.toml +++ b/stdlib/SuiteSparse_jll/Project.toml @@ -1,6 +1,6 @@ name = "SuiteSparse_jll" uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" -version = "7.0.1+0" +version = "7.0.1+3" [deps] libblastrampoline_jll = "8e850b90-86db-534c-a0d3-1478176c7d93" @@ -9,7 +9,7 @@ Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" [compat] -julia = "1.7" +julia = "1.9" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/stdlib/SuiteSparse_jll/test/runtests.jl b/stdlib/SuiteSparse_jll/test/runtests.jl index ac768021603b1..c926d0eb82a1f 100644 --- a/stdlib/SuiteSparse_jll/test/runtests.jl +++ b/stdlib/SuiteSparse_jll/test/runtests.jl @@ -2,6 +2,8 @@ using Test, SuiteSparse_jll +# SuiteSparse only uses SUITESPARSE_MAIN_VERSION and SUITESPARSE_SUB_VERSION to compute its version +# The SUITESPARSE_SUBSUB_VERSION is not used @testset "SuiteSparse_jll" begin - @test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) == 7001 + @test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) == 7000 end From 0fd6600ef7394ab87ed3522770ecd93143df9ba5 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Mon, 3 Apr 2023 10:30:40 -0400 Subject: [PATCH 03/17] Bump SparseArrays. --- .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 - .../sha512 | 1 - stdlib/SparseArrays.version | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/md5 create mode 100644 deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/sha512 delete mode 100644 deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/md5 delete mode 100644 deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/md5 b/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/md5 new file mode 100644 index 0000000000000..f0d490d514142 --- /dev/null +++ b/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/md5 @@ -0,0 +1 @@ +4e7e270ad5b2efe639269a87bf6fe5a2 diff --git a/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/sha512 b/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/sha512 new file mode 100644 index 0000000000000..e486ed8128da7 --- /dev/null +++ b/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/sha512 @@ -0,0 +1 @@ +eda63bc4a612d3d64e89c7fbdce98b2516c7c90d7982aa0449c252dea88e8ff9440b584c3c7ab1001c02232ef55e2139690b62e223f102a80237a270cbe32ab2 diff --git a/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/md5 b/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/md5 deleted file mode 100644 index 2abe755cb373b..0000000000000 --- a/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -39c1a82409af85b411560bace9c08dac diff --git a/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/sha512 b/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/sha512 deleted file mode 100644 index f72f87e253a2a..0000000000000 --- a/deps/checksums/SparseArrays-d9eec65da55f1c362b717990c15040d39bb36a34.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -469bfb7a6ac84c2a418bd7d89fb943b6007b1a454228744066bb810f3eb03ad6b0d60c11275a80349f56f4effbbf02aa8a4b7ab7e3e6f2bba324e02811a0bcb7 diff --git a/stdlib/SparseArrays.version b/stdlib/SparseArrays.version index b664c31c4e64e..6d6a4410a6d44 100644 --- a/stdlib/SparseArrays.version +++ b/stdlib/SparseArrays.version @@ -1,4 +1,4 @@ SPARSEARRAYS_BRANCH = main -SPARSEARRAYS_SHA1 = d9eec65da55f1c362b717990c15040d39bb36a34 +SPARSEARRAYS_SHA1 = 21f2503bbf1df79af5e394366a117b8d8139b53e SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1 From 327f8c8c8766d3bba4aefd55a88d1d6cb54e585f Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Tue, 11 Apr 2023 23:51:07 -0400 Subject: [PATCH 04/17] Try updated SS7 with int32 indices --- .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 + .../sha512 | 1 + stdlib/SparseArrays.version | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/md5 delete mode 100644 deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/sha512 create mode 100644 deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/md5 create mode 100644 deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/md5 b/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/md5 deleted file mode 100644 index f0d490d514142..0000000000000 --- a/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -4e7e270ad5b2efe639269a87bf6fe5a2 diff --git a/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/sha512 b/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/sha512 deleted file mode 100644 index e486ed8128da7..0000000000000 --- a/deps/checksums/SparseArrays-21f2503bbf1df79af5e394366a117b8d8139b53e.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -eda63bc4a612d3d64e89c7fbdce98b2516c7c90d7982aa0449c252dea88e8ff9440b584c3c7ab1001c02232ef55e2139690b62e223f102a80237a270cbe32ab2 diff --git a/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/md5 b/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/md5 new file mode 100644 index 0000000000000..87ba969d5ce61 --- /dev/null +++ b/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/md5 @@ -0,0 +1 @@ +33dd4b5daadb07e2e8458d49a37aae78 diff --git a/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/sha512 b/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/sha512 new file mode 100644 index 0000000000000..5a2a41507ef1e --- /dev/null +++ b/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/sha512 @@ -0,0 +1 @@ +4463691f30bf7f137a7ac6c655216d2d2d9df701305f665ee68867ef7ecaeb40738e58bdfc440e715d0e107f217c9e5c1f9f60b4d2c8adbca9e7f11b20332044 diff --git a/stdlib/SparseArrays.version b/stdlib/SparseArrays.version index 6d6a4410a6d44..c95c91d370304 100644 --- a/stdlib/SparseArrays.version +++ b/stdlib/SparseArrays.version @@ -1,4 +1,4 @@ SPARSEARRAYS_BRANCH = main -SPARSEARRAYS_SHA1 = 21f2503bbf1df79af5e394366a117b8d8139b53e +SPARSEARRAYS_SHA1 = 5fbc159de998a1be5ac5434357534e271e57e5fb SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1 From 0d3b43394711859cb6c8928f7e1782f57bf51970 Mon Sep 17 00:00:00 2001 From: Will Kimmerer Date: Mon, 17 Apr 2023 16:20:02 -0400 Subject: [PATCH 05/17] new commit SS7? --- .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 + .../sha512 | 1 + stdlib/SparseArrays.version | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/md5 delete mode 100644 deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/sha512 create mode 100644 deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/md5 create mode 100644 deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/md5 b/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/md5 deleted file mode 100644 index 87ba969d5ce61..0000000000000 --- a/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -33dd4b5daadb07e2e8458d49a37aae78 diff --git a/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/sha512 b/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/sha512 deleted file mode 100644 index 5a2a41507ef1e..0000000000000 --- a/deps/checksums/SparseArrays-5fbc159de998a1be5ac5434357534e271e57e5fb.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -4463691f30bf7f137a7ac6c655216d2d2d9df701305f665ee68867ef7ecaeb40738e58bdfc440e715d0e107f217c9e5c1f9f60b4d2c8adbca9e7f11b20332044 diff --git a/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/md5 b/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/md5 new file mode 100644 index 0000000000000..4ba776c3a783b --- /dev/null +++ b/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/md5 @@ -0,0 +1 @@ +441f5ee1011a78fc818482a51ba00f1a \ No newline at end of file diff --git a/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/sha512 b/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/sha512 new file mode 100644 index 0000000000000..131335c3f3bef --- /dev/null +++ b/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/sha512 @@ -0,0 +1 @@ +40b947e6d62d773087dd03fff4c2d27e08e38fd5b5e51dd86accfe05f70eb9a1a71a80f06a7159f3dcefa0c219fa05a7f6b336732bad583e7949b68fcfa37f5c diff --git a/stdlib/SparseArrays.version b/stdlib/SparseArrays.version index c95c91d370304..cba727b966fd8 100644 --- a/stdlib/SparseArrays.version +++ b/stdlib/SparseArrays.version @@ -1,4 +1,4 @@ SPARSEARRAYS_BRANCH = main -SPARSEARRAYS_SHA1 = 5fbc159de998a1be5ac5434357534e271e57e5fb +SPARSEARRAYS_SHA1 = d320f229d190e9ac47418ea898038f0f12fc1d53 SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1 From 9ae184da6e626b8b97218c3b467da07fd4b0d1ad Mon Sep 17 00:00:00 2001 From: Will Kimmerer Date: Sat, 8 Jul 2023 14:17:15 -0400 Subject: [PATCH 06/17] incomplete checksum regen --- deps/checksums/suitesparse | 2 ++ deps/libsuitesparse.mk | 2 +- deps/libsuitesparse.version | 4 +++- stdlib/SparseArrays.version | 4 ++-- stdlib/SuiteSparse_jll/Project.toml | 2 +- stdlib/SuiteSparse_jll/test/runtests.jl | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/deps/checksums/suitesparse b/deps/checksums/suitesparse index 1e596e15a5c02..1d95e1a544761 100644 --- a/deps/checksums/suitesparse +++ b/deps/checksums/suitesparse @@ -1,5 +1,7 @@ SuiteSparse-7.0.1.tar.gz/md5/d31bbe2a26dced338b23e71f7c9b541a SuiteSparse-7.0.1.tar.gz/sha512/af311efec01849d2c4445e163035a7013f3334a90edcda40f5dab0b35ad5d9a3e643c716c08a131ae99195bec016d1363623570058b05f3ee2a9ed4c483016db +SuiteSparse-7.2.0.tar.gz/md5/a751b1161f03eb6bd8bd7b9c9be74b67 +SuiteSparse-7.2.0.tar.gz/sha512/62fc796a77f2a8c95cd688a4fa0e39c19d7ccfafde7a6623d62ca6928cee68ac9863a0f721959a1d5a07e62888ab621a4b1cb4f63371f4ac10f4ffe513241340 SuiteSparse-e8285dd13a6d5b5cf52d8124793fc4d622d07554.tar.gz/md5/46541001073d1c3c85e18d910f8308f3 SuiteSparse-e8285dd13a6d5b5cf52d8124793fc4d622d07554.tar.gz/sha512/f7470a447b934ca9315e216a07b97e363f11bc93186f9aa057b20b2d05092c58ae4f1b733de362de4a0730861c00be4ca5588d0b3ba65f018c1798b9122b9672 SuiteSparse.v7.0.1+3.aarch64-apple-darwin.tar.gz/md5/584c09a10071546d544c6bd2be92c16d diff --git a/deps/libsuitesparse.mk b/deps/libsuitesparse.mk index 2d8188bfafb9c..16d4919031ca5 100644 --- a/deps/libsuitesparse.mk +++ b/deps/libsuitesparse.mk @@ -25,7 +25,7 @@ LIBSUITESPARSE_CMAKE_FLAGS := $(CMAKE_COMMON) \ -DLAPACK_LINKER_FLAGS="blastrampoline" $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz: | $(SRCCACHE) - $(JLDOWNLOAD) $@ https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$(LIBSUITESPARSE_VER).tar.gz + $(JLDOWNLOAD) $@ https://github.com/Wimmerer/SuiteSparse/archive/v$(LIBSUITESPARSE_VER).tar.gz $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/source-extracted: $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz $(JLCHECKSUM) $< diff --git a/deps/libsuitesparse.version b/deps/libsuitesparse.version index 9f5973d79a22a..867e52304477c 100644 --- a/deps/libsuitesparse.version +++ b/deps/libsuitesparse.version @@ -2,4 +2,6 @@ LIBSUITESPARSE_JLL_NAME := SuiteSparse ## source build -LIBSUITESPARSE_VER := 7.0.1 +LIBSUITESPARSE_VER := 7.2.0 +LIBSUITESPARSE_BRANCH=guard-CXX_Standard +LIBSUITESPARSE_SHA1=1b4edf467637dbf33a26eee9a6c20afa40c7c5ea diff --git a/stdlib/SparseArrays.version b/stdlib/SparseArrays.version index cba727b966fd8..05981fabfb01b 100644 --- a/stdlib/SparseArrays.version +++ b/stdlib/SparseArrays.version @@ -1,4 +1,4 @@ -SPARSEARRAYS_BRANCH = main -SPARSEARRAYS_SHA1 = d320f229d190e9ac47418ea898038f0f12fc1d53 +SPARSEARRAYS_BRANCH = rk/ss7 +SPARSEARRAYS_SHA1 = d32fc92d84b7ab8bf50efea950a8466741f5f94f SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1 diff --git a/stdlib/SuiteSparse_jll/Project.toml b/stdlib/SuiteSparse_jll/Project.toml index fb59ad8cfd3c4..904b3809b4e1f 100644 --- a/stdlib/SuiteSparse_jll/Project.toml +++ b/stdlib/SuiteSparse_jll/Project.toml @@ -1,6 +1,6 @@ name = "SuiteSparse_jll" uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" -version = "7.0.1+3" +version = "7.2.0" [deps] libblastrampoline_jll = "8e850b90-86db-534c-a0d3-1478176c7d93" diff --git a/stdlib/SuiteSparse_jll/test/runtests.jl b/stdlib/SuiteSparse_jll/test/runtests.jl index c926d0eb82a1f..e74c3283a20cd 100644 --- a/stdlib/SuiteSparse_jll/test/runtests.jl +++ b/stdlib/SuiteSparse_jll/test/runtests.jl @@ -5,5 +5,5 @@ using Test, SuiteSparse_jll # SuiteSparse only uses SUITESPARSE_MAIN_VERSION and SUITESPARSE_SUB_VERSION to compute its version # The SUITESPARSE_SUBSUB_VERSION is not used @testset "SuiteSparse_jll" begin - @test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) == 7000 + @test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) == 7020 end From b63163b8a1547ec328b2916b696a07db77de922a Mon Sep 17 00:00:00 2001 From: Will Kimmerer Date: Sat, 8 Jul 2023 14:57:21 -0400 Subject: [PATCH 07/17] generate all checksums --- deps/checksums/suitesparse | 32 +++++++++++++++++++++++++++++ stdlib/SuiteSparse_jll/Project.toml | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/deps/checksums/suitesparse b/deps/checksums/suitesparse index 1d95e1a544761..8f6ad1f0b33c0 100644 --- a/deps/checksums/suitesparse +++ b/deps/checksums/suitesparse @@ -36,3 +36,35 @@ SuiteSparse.v7.0.1+3.x86_64-unknown-freebsd.tar.gz/md5/660d965cc925399ebc403433c SuiteSparse.v7.0.1+3.x86_64-unknown-freebsd.tar.gz/sha512/fa6038d06a6413ebe066c0610f34dc57cb05048e304faaeaa256e900859790b6f40a05e3641e8dfabe1c6e5d838e20db8cfdb150ea200a5d64077a44da3af683 SuiteSparse.v7.0.1+3.x86_64-w64-mingw32.tar.gz/md5/76682aea2a1d74645cc998a2a58968a2 SuiteSparse.v7.0.1+3.x86_64-w64-mingw32.tar.gz/sha512/1bf79014a6ae2b58029c66f9d753e03b3e50f42f5719e02ea595b51508ff885408861337e78cc3f36d863f874e837f419be991f4cb658d757043a04a44734ba7 +SuiteSparse.v7.2.0+0.aarch64-apple-darwin.tar.gz/md5/1a10261e5bed293a66849c7a50605a1c +SuiteSparse.v7.2.0+0.aarch64-apple-darwin.tar.gz/sha512/11ecce872aac1f30a3d4ce870920ebb03c7828d0fd740c3789d3f65c3f91ed3682372e9807b0593e2850ae9024450306451ee2e03866afee16b4169e4b5de1c6 +SuiteSparse.v7.2.0+0.aarch64-linux-gnu.tar.gz/md5/65e2e7ae54e94e00b306d17a1d08ed34 +SuiteSparse.v7.2.0+0.aarch64-linux-gnu.tar.gz/sha512/7714598448c6f98a7d931822f9ddb661a903342d4c8384648c1b7457511794ff95ad64266c9377a4a5856dcb1fb8864cb05eab1c7787fca58802473270313570 +SuiteSparse.v7.2.0+0.aarch64-linux-musl.tar.gz/md5/95eb68e02c04d075d6ecc974c3b44457 +SuiteSparse.v7.2.0+0.aarch64-linux-musl.tar.gz/sha512/1d7835106cd5baef701a3b670778a757d97ab9933f7da909e1e5521150f7e44bee30cf4dc7c1e9f57731366db0fca1b91d1cdfddbc53b7cc7457ca11534be6d7 +SuiteSparse.v7.2.0+0.armv6l-linux-gnueabihf.tar.gz/md5/5f627cc9c9d4d70e2f0d749e09926b1a +SuiteSparse.v7.2.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/5ae4b79b418b45d954bfb578ac384afd6fff10a602d16d8b503997ba15251a7db0e12da66061ffd27c23b7459ff56b4a5d200c7c8aaa4a33c608a88752535c15 +SuiteSparse.v7.2.0+0.armv6l-linux-musleabihf.tar.gz/md5/61b5ee7e2b50665caf15e7c4f7353048 +SuiteSparse.v7.2.0+0.armv6l-linux-musleabihf.tar.gz/sha512/854c0165bceeb8202aeeaa16e6ba1f643e8cb9bf0561816cf2c44d1c7334ba7c376ee9e9085316439ca7e27dd4e37814f4916382096a5889c6bb656d22a7fb8d +SuiteSparse.v7.2.0+0.armv7l-linux-gnueabihf.tar.gz/md5/618b9687ce30e630a52f72a8f34cfb9f +SuiteSparse.v7.2.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/add77a8842faf6515d94dc1d000784247d13f0211a9bb3f98edbc65b5f8994c0101940875fa050ca7a4605aaf33ec14daeaaf6b837673b3b4c600d4c5c0f4876 +SuiteSparse.v7.2.0+0.armv7l-linux-musleabihf.tar.gz/md5/b84d7f98b953772517689478d6bfc121 +SuiteSparse.v7.2.0+0.armv7l-linux-musleabihf.tar.gz/sha512/2c461eb23194bf61d3166abd8eb308dc643d865ff07466a88a580aa5a040f3c4fbfeadf7c78e1a3ce737fe0602909ff2b25be439741d36a780a260ccfdc6ed83 +SuiteSparse.v7.2.0+0.i686-linux-gnu.tar.gz/md5/3a38deddb5c1952584782378892d9579 +SuiteSparse.v7.2.0+0.i686-linux-gnu.tar.gz/sha512/5d6a9090c1c275c2bdcdc8d510c6372913109c1a775819354922c0d0afc2bc13a27950ed0e8cb8e05bc94d245220e322d93879054e5082814b7796b305981987 +SuiteSparse.v7.2.0+0.i686-linux-musl.tar.gz/md5/8076c50a73ab08ce0b9374956c2dbf29 +SuiteSparse.v7.2.0+0.i686-linux-musl.tar.gz/sha512/e54bcfe7eb9b266514a35a3c48676b7a792b59830e44bfcd5dfcf35be790f534cc31bd2e63ce4da1a22fcb3b0afb0ebebcc94f0e596806d6e832c3f68195cc5b +SuiteSparse.v7.2.0+0.i686-w64-mingw32.tar.gz/md5/361385833314fa6fbcd1f446ef6430e6 +SuiteSparse.v7.2.0+0.i686-w64-mingw32.tar.gz/sha512/576ef6a4242c6b999a143007aa073ba9e4d74246c297f60504052321c2bae202640cffe08fbcf69df1b093b12443382c9d11390f97b9d8754f10dcd32dd3e9c4 +SuiteSparse.v7.2.0+0.powerpc64le-linux-gnu.tar.gz/md5/64845ee8bb2f3f44a0837297e47e412d +SuiteSparse.v7.2.0+0.powerpc64le-linux-gnu.tar.gz/sha512/5f935e497db4ebbcdfb96603a7ee9c6c520d7f4df04f65952305ceff4271ab637079e9144b98044c5f159b4bed0963df8c95ed1578d2828f1a2356e6d34d7042 +SuiteSparse.v7.2.0+0.x86_64-apple-darwin.tar.gz/md5/fb8b00d4ca63004fe8ab8c159128e01f +SuiteSparse.v7.2.0+0.x86_64-apple-darwin.tar.gz/sha512/bcfb18c11be4b1147ff857e2ad0c881c9fc4ae16db8e88fb6e7e0448418c1fc4bff9ea8f1e6aa7202c277273c44c1afb3cc6c2bfcaa0735c7c09052f033248c7 +SuiteSparse.v7.2.0+0.x86_64-linux-gnu.tar.gz/md5/043594ee1cb90fd47b36acfa829fffb8 +SuiteSparse.v7.2.0+0.x86_64-linux-gnu.tar.gz/sha512/6a5bb3c85bb7e97b915f7dd40e8be1ed1bbbd5c756ef510deaecc8505b95bd42f3662f82e25c80055947060e0429e2ce427d4ff67b434acbe28d46b88279c65f +SuiteSparse.v7.2.0+0.x86_64-linux-musl.tar.gz/md5/67c6d3a7fd8635a43bd86b2b1e986978 +SuiteSparse.v7.2.0+0.x86_64-linux-musl.tar.gz/sha512/d46be3f60102fc69707c3e7cc3d693c7ecb4d4307c636afde61e5fab3c46fcf32564716a11d2cfe47b4e541422d5b6e13fbcc3e8749764527b4f4132e8ce17fc +SuiteSparse.v7.2.0+0.x86_64-unknown-freebsd.tar.gz/md5/124057f8455c9710fd1e6b4b4b469fb0 +SuiteSparse.v7.2.0+0.x86_64-unknown-freebsd.tar.gz/sha512/da0e56a8b1cf3967275cb64aea0b939d8982392f9ca1c3b268607e37c0b9bebbd456172c507c6dc2293989a0fe8df04ba1fea67442a4bb738cc8d894bea457a5 +SuiteSparse.v7.2.0+0.x86_64-w64-mingw32.tar.gz/md5/0f99c67d25c0fdd0f3c3e11f18925c43 +SuiteSparse.v7.2.0+0.x86_64-w64-mingw32.tar.gz/sha512/32fcd894cb4197970aa311f7bd12ccb91df7bbe27e389e793a2d3565c9c5c36c751f6dfa37e155cd2c2245be52f0a872dba032b78dc45c45d3fd7d7f2eeb773e diff --git a/stdlib/SuiteSparse_jll/Project.toml b/stdlib/SuiteSparse_jll/Project.toml index 904b3809b4e1f..dd88fc967079b 100644 --- a/stdlib/SuiteSparse_jll/Project.toml +++ b/stdlib/SuiteSparse_jll/Project.toml @@ -1,6 +1,6 @@ name = "SuiteSparse_jll" uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" -version = "7.2.0" +version = "7.2.0+0" [deps] libblastrampoline_jll = "8e850b90-86db-534c-a0d3-1478176c7d93" From 5663555b56e3ea52c24f25c93e54bd102a8f63a6 Mon Sep 17 00:00:00 2001 From: Will Kimmerer Date: Sat, 8 Jul 2023 15:20:23 -0400 Subject: [PATCH 08/17] version bump for LinAlg include --- .../md5 | 1 + .../sha512 | 1 + stdlib/SparseArrays.version | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/md5 create mode 100644 deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/md5 b/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/md5 new file mode 100644 index 0000000000000..79bca50b55867 --- /dev/null +++ b/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/md5 @@ -0,0 +1 @@ +ef05606abffc5aa87dbee94b847e3232 diff --git a/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/sha512 b/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/sha512 new file mode 100644 index 0000000000000..7988b4a987b8a --- /dev/null +++ b/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/sha512 @@ -0,0 +1 @@ +d73bfef22e4caf8f38fdca2abb0f7bab96b23db53eef4005347be8874e1a606449671d877d99ee599167dae4554d6b9884a683c2bbbc6a7cbc281468b73791df diff --git a/stdlib/SparseArrays.version b/stdlib/SparseArrays.version index 05981fabfb01b..cf3a7d6572456 100644 --- a/stdlib/SparseArrays.version +++ b/stdlib/SparseArrays.version @@ -1,4 +1,4 @@ SPARSEARRAYS_BRANCH = rk/ss7 -SPARSEARRAYS_SHA1 = d32fc92d84b7ab8bf50efea950a8466741f5f94f +SPARSEARRAYS_SHA1 = e953cf0718fe698f66bf010daacb07597eed5362 SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1 From a91ee26fc54ca7d67063d136f5b0bd18fb25ff06 Mon Sep 17 00:00:00 2001 From: Will Kimmerer Date: Sat, 8 Jul 2023 16:03:04 -0400 Subject: [PATCH 09/17] rbio and spqr versions --- stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl index 2f0b46fee5c15..f245759aaf383 100644 --- a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl +++ b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl @@ -62,8 +62,8 @@ elseif Sys.isapple() const libcolamd = "@rpath/libcolamd.3.dylib" const libklu = "@rpath/libklu.2.dylib" const libldl = "@rpath/libldl.3.dylib" - const librbio = "@rpath/librbio.3.dylib" - const libspqr = "@rpath/libspqr.3.dylib" + const librbio = "@rpath/librbio.4.dylib" + const libspqr = "@rpath/libspqr.4.dylib" const libsuitesparseconfig = "@rpath/libsuitesparseconfig.7.dylib" const libumfpack = "@rpath/libumfpack.6.dylib" else @@ -75,8 +75,8 @@ else const libcolamd = "libcolamd.so.3" const libklu = "libklu.so.2" const libldl = "libldl.so.3" - const librbio = "librbio.so.3" - const libspqr = "libspqr.so.3" + const librbio = "librbio.so.4" + const libspqr = "libspqr.so.4" const libsuitesparseconfig = "libsuitesparseconfig.so.7" const libumfpack = "libumfpack.so.6" end From d19b49af3b3acd9f904d336e2bb4a6aa6768e41a Mon Sep 17 00:00:00 2001 From: Will Kimmerer Date: Sat, 8 Jul 2023 18:22:04 -0400 Subject: [PATCH 10/17] update to most recent SA commit --- .../md5 | 1 + .../sha512 | 1 + stdlib/SparseArrays.version | 2 +- stdlib/SuiteSparse_jll/test/runtests.jl | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/md5 create mode 100644 deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/md5 b/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/md5 new file mode 100644 index 0000000000000..083c596bb4253 --- /dev/null +++ b/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/md5 @@ -0,0 +1 @@ +2afc464ded8a8ff2ada87ce171b2839f diff --git a/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/sha512 b/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/sha512 new file mode 100644 index 0000000000000..e4c2da505dc9e --- /dev/null +++ b/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/sha512 @@ -0,0 +1 @@ +a4d8391fe62fcd39b9edb2d14d8c45914a21e539e49d43dcfd0d2945e8fc4bb2dad8849f0ef22013fde5ab61c95063f30549287bff2c5caf2b6aa2c2834505c3 diff --git a/stdlib/SparseArrays.version b/stdlib/SparseArrays.version index cf3a7d6572456..9521725fa800f 100644 --- a/stdlib/SparseArrays.version +++ b/stdlib/SparseArrays.version @@ -1,4 +1,4 @@ SPARSEARRAYS_BRANCH = rk/ss7 -SPARSEARRAYS_SHA1 = e953cf0718fe698f66bf010daacb07597eed5362 +SPARSEARRAYS_SHA1 = cc518fae7195c27cd5e2a5a5558130d1f71dc5d5 SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1 diff --git a/stdlib/SuiteSparse_jll/test/runtests.jl b/stdlib/SuiteSparse_jll/test/runtests.jl index e74c3283a20cd..d6d82a73e4a57 100644 --- a/stdlib/SuiteSparse_jll/test/runtests.jl +++ b/stdlib/SuiteSparse_jll/test/runtests.jl @@ -4,6 +4,8 @@ using Test, SuiteSparse_jll # SuiteSparse only uses SUITESPARSE_MAIN_VERSION and SUITESPARSE_SUB_VERSION to compute its version # The SUITESPARSE_SUBSUB_VERSION is not used +# TODO before release: update to 7020 or above when upstreamed. +# This should be safe and unecessary since we specify exact version of the BB JLL. @testset "SuiteSparse_jll" begin - @test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) == 7020 + @test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) > 7000 end From cb70a064ea70432e31ffeaaeb4a38ed478f14d8b Mon Sep 17 00:00:00 2001 From: Will Kimmerer Date: Sat, 8 Jul 2023 21:06:24 -0400 Subject: [PATCH 11/17] back to main branch --- .../md5 | 1 + .../sha512 | 1 + stdlib/SparseArrays.version | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/md5 create mode 100644 deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/md5 b/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/md5 new file mode 100644 index 0000000000000..94c44822c930f --- /dev/null +++ b/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/md5 @@ -0,0 +1 @@ +f7e88a0e9df62b5ae990f9920061e3ad diff --git a/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/sha512 b/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/sha512 new file mode 100644 index 0000000000000..9528d72d8071d --- /dev/null +++ b/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/sha512 @@ -0,0 +1 @@ +56c60ab082362d83bfd5837a9429db0e51ef42d1014c7aa820243d9319017144aa2f1fde21cda4363587820a32ce0613fb9cfdd32cc04cbd3f7d00ff7b4326dd diff --git a/stdlib/SparseArrays.version b/stdlib/SparseArrays.version index 9521725fa800f..fbc84897538fa 100644 --- a/stdlib/SparseArrays.version +++ b/stdlib/SparseArrays.version @@ -1,4 +1,4 @@ -SPARSEARRAYS_BRANCH = rk/ss7 -SPARSEARRAYS_SHA1 = cc518fae7195c27cd5e2a5a5558130d1f71dc5d5 +SPARSEARRAYS_BRANCH = main +SPARSEARRAYS_SHA1 = 2e15e8b84748da109086c7ae6d9f2704760e4c7a SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1 From 276b7ff87616ade2d801b90cfabe1722aa0962df Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Sun, 9 Jul 2023 09:18:44 -0400 Subject: [PATCH 12/17] Remove checksums for SS 7.0.1. --- deps/checksums/suitesparse | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/deps/checksums/suitesparse b/deps/checksums/suitesparse index 8f6ad1f0b33c0..05f25450114a5 100644 --- a/deps/checksums/suitesparse +++ b/deps/checksums/suitesparse @@ -1,41 +1,7 @@ -SuiteSparse-7.0.1.tar.gz/md5/d31bbe2a26dced338b23e71f7c9b541a -SuiteSparse-7.0.1.tar.gz/sha512/af311efec01849d2c4445e163035a7013f3334a90edcda40f5dab0b35ad5d9a3e643c716c08a131ae99195bec016d1363623570058b05f3ee2a9ed4c483016db SuiteSparse-7.2.0.tar.gz/md5/a751b1161f03eb6bd8bd7b9c9be74b67 SuiteSparse-7.2.0.tar.gz/sha512/62fc796a77f2a8c95cd688a4fa0e39c19d7ccfafde7a6623d62ca6928cee68ac9863a0f721959a1d5a07e62888ab621a4b1cb4f63371f4ac10f4ffe513241340 SuiteSparse-e8285dd13a6d5b5cf52d8124793fc4d622d07554.tar.gz/md5/46541001073d1c3c85e18d910f8308f3 SuiteSparse-e8285dd13a6d5b5cf52d8124793fc4d622d07554.tar.gz/sha512/f7470a447b934ca9315e216a07b97e363f11bc93186f9aa057b20b2d05092c58ae4f1b733de362de4a0730861c00be4ca5588d0b3ba65f018c1798b9122b9672 -SuiteSparse.v7.0.1+3.aarch64-apple-darwin.tar.gz/md5/584c09a10071546d544c6bd2be92c16d -SuiteSparse.v7.0.1+3.aarch64-apple-darwin.tar.gz/sha512/abfd74078488ff2a1dc27fd7d9397ff891ead41563b38d4141e99ce2dca1ee088b85f0cf188e53b3ed3f55564a4f479d9deb5146e9bfcb6d2b29899c843b02e2 -SuiteSparse.v7.0.1+3.aarch64-linux-gnu.tar.gz/md5/845e902b4663ec635df0447334b7bc37 -SuiteSparse.v7.0.1+3.aarch64-linux-gnu.tar.gz/sha512/db3080c931c50a02f1a75b2fd8332a681e98ed6ae6becfd7f2a0ea2d17ddfa108a364e7d51c437e7834cb87a62a4b550f2686d1ef5ca56dd2ef6bea3d9d8ee3e -SuiteSparse.v7.0.1+3.aarch64-linux-musl.tar.gz/md5/8586732c13088f9584ce61368697aaa3 -SuiteSparse.v7.0.1+3.aarch64-linux-musl.tar.gz/sha512/67ca602490a64f1026bc1d7d8cdec61e09cd3eb7944d1367877a417329c2890da9e6b35d37b7d10d6b1b81c6602672c12b2990d81e09c3e233476b21d11d7e72 -SuiteSparse.v7.0.1+3.armv6l-linux-gnueabihf.tar.gz/md5/35f8bb2ea5e3836c5f222ae8357c58bd -SuiteSparse.v7.0.1+3.armv6l-linux-gnueabihf.tar.gz/sha512/7420cedd08e65e469fd063affba1a5700bec87521853067ac91a7a70e9ee4e4aa1d3511a63863be3ec3ea68f45533d64e1ff2b592579018915ebf91b0c1f6e69 -SuiteSparse.v7.0.1+3.armv6l-linux-musleabihf.tar.gz/md5/51db0e39cb6a8a51de891266a708aba2 -SuiteSparse.v7.0.1+3.armv6l-linux-musleabihf.tar.gz/sha512/9e9bb51c6c24b19a3319fe0494b3db0ec7ee81ea33612870bb7d8668af6e0447de9ad5f6209744399e7249048eebf360c09e793243665abaf9e9a321ff01c449 -SuiteSparse.v7.0.1+3.armv7l-linux-gnueabihf.tar.gz/md5/d4e565bbef6a2fcf15d76d536cdfeaf6 -SuiteSparse.v7.0.1+3.armv7l-linux-gnueabihf.tar.gz/sha512/f6f6b46ca1da00754a9c5422ceecd334fb83c2fba7cf931334ec8b1781a96243f9a5af80f4576274aba481e8fa45590e3c14f5301fb41165f17d3e51367b2b65 -SuiteSparse.v7.0.1+3.armv7l-linux-musleabihf.tar.gz/md5/488bead9cbf2a6fae167c0bd2d1150a2 -SuiteSparse.v7.0.1+3.armv7l-linux-musleabihf.tar.gz/sha512/575a912b14ca63deb9efa11a08a0fc1a146621edec92ea6116f58fe68e5b66492cf4a9e1c429f0f5f5d32d63ddea60e2ef5fc13417c9ebe8bb3cd48b3dad76cb -SuiteSparse.v7.0.1+3.i686-linux-gnu.tar.gz/md5/3bcb54c889a7962ab7a5d14064ef1d58 -SuiteSparse.v7.0.1+3.i686-linux-gnu.tar.gz/sha512/9ac71a82585e56b69a6fd53eb73b1a56ca7d3f75f49f101c3ebc7892feb3534e605ee650e1197ceadb2787eb6ae14f010987bc0c319ecba57f3d06634343cb0a -SuiteSparse.v7.0.1+3.i686-linux-musl.tar.gz/md5/7694a7bb54075138dc3c90b78bda1252 -SuiteSparse.v7.0.1+3.i686-linux-musl.tar.gz/sha512/b327ca15a868d1757574ed645012f347e15eaa964a9a1c46f0dc2531cf1e1da0871da9b7dcec69c50b16be95cdd077f561ac78b51a0c4f06d5b10e4050331a6b -SuiteSparse.v7.0.1+3.i686-w64-mingw32.tar.gz/md5/3ce5f297b58e9b1ae96b8d065c1d03fc -SuiteSparse.v7.0.1+3.i686-w64-mingw32.tar.gz/sha512/a4e897d81972a6a5a76012a02dc00740868d371dc32960702310b03f9c826c22805afa2c0578cb1516be588c4e28e492e43065353e59d7108c1c834c50168d7a -SuiteSparse.v7.0.1+3.powerpc64le-linux-gnu.tar.gz/md5/a4e8099b38731bda3841da2126dd1df3 -SuiteSparse.v7.0.1+3.powerpc64le-linux-gnu.tar.gz/sha512/a8900f88f4f206e26aef5799786a4cd4281a61a4f635cb685d2e1202dfe59325610c3056c3d2656679633f775c5824d78fc775f306ba176956f0d798cf1e1c36 -SuiteSparse.v7.0.1+3.x86_64-apple-darwin.tar.gz/md5/f70894c9cf4e33aebd7b94ba144aa284 -SuiteSparse.v7.0.1+3.x86_64-apple-darwin.tar.gz/sha512/6625ce8f309085d323213acd07522e40195334734c4c80c665040795b58e7028e52ec8d78f5054edba9e94c58ff5aa5eb5aae3c743f4707bd6332bbd453c35fb -SuiteSparse.v7.0.1+3.x86_64-linux-gnu.tar.gz/md5/cfb3fd593acd1c190d7c50bff002739b -SuiteSparse.v7.0.1+3.x86_64-linux-gnu.tar.gz/sha512/dabc12da913c94cd88e4137d167ab399f01566579d1eb6cba6d5490bfd624aa48c2e504c07b81c52fe0277ceb1ff45363e6b8329ee56354c0d3f29defcc396c7 -SuiteSparse.v7.0.1+3.x86_64-linux-musl.tar.gz/md5/1050be06b8f916637d14bd700aff54d8 -SuiteSparse.v7.0.1+3.x86_64-linux-musl.tar.gz/sha512/535c95e34137db8b7bef49bab1ca9dcf82ee31e145aab89d1066622a27b0cd7193169e6f148fb2bca8f12e5dbf69e93a31f529f61460cab9fe0ae4d81160c156 -SuiteSparse.v7.0.1+3.x86_64-unknown-freebsd.tar.gz/md5/660d965cc925399ebc403433ca1e9cb4 -SuiteSparse.v7.0.1+3.x86_64-unknown-freebsd.tar.gz/sha512/fa6038d06a6413ebe066c0610f34dc57cb05048e304faaeaa256e900859790b6f40a05e3641e8dfabe1c6e5d838e20db8cfdb150ea200a5d64077a44da3af683 -SuiteSparse.v7.0.1+3.x86_64-w64-mingw32.tar.gz/md5/76682aea2a1d74645cc998a2a58968a2 -SuiteSparse.v7.0.1+3.x86_64-w64-mingw32.tar.gz/sha512/1bf79014a6ae2b58029c66f9d753e03b3e50f42f5719e02ea595b51508ff885408861337e78cc3f36d863f874e837f419be991f4cb658d757043a04a44734ba7 SuiteSparse.v7.2.0+0.aarch64-apple-darwin.tar.gz/md5/1a10261e5bed293a66849c7a50605a1c SuiteSparse.v7.2.0+0.aarch64-apple-darwin.tar.gz/sha512/11ecce872aac1f30a3d4ce870920ebb03c7828d0fd740c3789d3f65c3f91ed3682372e9807b0593e2850ae9024450306451ee2e03866afee16b4169e4b5de1c6 SuiteSparse.v7.2.0+0.aarch64-linux-gnu.tar.gz/md5/65e2e7ae54e94e00b306d17a1d08ed34 From 3dc5916b1c168b65afc402580e006ea3783df4a7 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Sun, 9 Jul 2023 20:22:39 -0400 Subject: [PATCH 13/17] Remove older checksums --- .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 - .../sha512 | 1 - 6 files changed, 6 deletions(-) delete mode 100644 deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/md5 delete mode 100644 deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/sha512 delete mode 100644 deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/md5 delete mode 100644 deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/sha512 delete mode 100644 deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/md5 delete mode 100644 deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/md5 b/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/md5 deleted file mode 100644 index 083c596bb4253..0000000000000 --- a/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -2afc464ded8a8ff2ada87ce171b2839f diff --git a/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/sha512 b/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/sha512 deleted file mode 100644 index e4c2da505dc9e..0000000000000 --- a/deps/checksums/SparseArrays-cc518fae7195c27cd5e2a5a5558130d1f71dc5d5.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -a4d8391fe62fcd39b9edb2d14d8c45914a21e539e49d43dcfd0d2945e8fc4bb2dad8849f0ef22013fde5ab61c95063f30549287bff2c5caf2b6aa2c2834505c3 diff --git a/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/md5 b/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/md5 deleted file mode 100644 index 4ba776c3a783b..0000000000000 --- a/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -441f5ee1011a78fc818482a51ba00f1a \ No newline at end of file diff --git a/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/sha512 b/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/sha512 deleted file mode 100644 index 131335c3f3bef..0000000000000 --- a/deps/checksums/SparseArrays-d320f229d190e9ac47418ea898038f0f12fc1d53.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -40b947e6d62d773087dd03fff4c2d27e08e38fd5b5e51dd86accfe05f70eb9a1a71a80f06a7159f3dcefa0c219fa05a7f6b336732bad583e7949b68fcfa37f5c diff --git a/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/md5 b/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/md5 deleted file mode 100644 index 79bca50b55867..0000000000000 --- a/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -ef05606abffc5aa87dbee94b847e3232 diff --git a/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/sha512 b/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/sha512 deleted file mode 100644 index 7988b4a987b8a..0000000000000 --- a/deps/checksums/SparseArrays-e953cf0718fe698f66bf010daacb07597eed5362.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -d73bfef22e4caf8f38fdca2abb0f7bab96b23db53eef4005347be8874e1a606449671d877d99ee599167dae4554d6b9884a683c2bbbc6a7cbc281468b73791df From 0252366e1242ffadcf249a2d8c892d9866cb9b60 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Mon, 10 Jul 2023 14:58:31 -0400 Subject: [PATCH 14/17] Try reverting the new sparse hvcat design --- stdlib/SparseArrays.version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/SparseArrays.version b/stdlib/SparseArrays.version index fbc84897538fa..c375d7b927f96 100644 --- a/stdlib/SparseArrays.version +++ b/stdlib/SparseArrays.version @@ -1,4 +1,4 @@ -SPARSEARRAYS_BRANCH = main -SPARSEARRAYS_SHA1 = 2e15e8b84748da109086c7ae6d9f2704760e4c7a +SPARSEARRAYS_BRANCH = vs/revert-384 +SPARSEARRAYS_SHA1 = 478a80b97ac94688ddfe37f5d9ffcb54c6c12919 SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1 From a2f9d2a645f97210edca6a5a756506eafffe5f9d Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Mon, 10 Jul 2023 15:31:12 -0400 Subject: [PATCH 15/17] Add checksums --- .../md5 | 1 - .../sha512 | 1 - 2 files changed, 2 deletions(-) delete mode 100644 deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/md5 delete mode 100644 deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/md5 b/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/md5 deleted file mode 100644 index 94c44822c930f..0000000000000 --- a/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -f7e88a0e9df62b5ae990f9920061e3ad diff --git a/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/sha512 b/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/sha512 deleted file mode 100644 index 9528d72d8071d..0000000000000 --- a/deps/checksums/SparseArrays-2e15e8b84748da109086c7ae6d9f2704760e4c7a.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -56c60ab082362d83bfd5837a9429db0e51ef42d1014c7aa820243d9319017144aa2f1fde21cda4363587820a32ce0613fb9cfdd32cc04cbd3f7d00ff7b4326dd From 9f3492fc86bb76416764a974b73f74764fad98d4 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Mon, 10 Jul 2023 15:43:32 -0400 Subject: [PATCH 16/17] Add checksums for real this time. --- .../md5 | 1 + .../sha512 | 1 + 2 files changed, 2 insertions(+) create mode 100644 deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/md5 create mode 100644 deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/md5 b/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/md5 new file mode 100644 index 0000000000000..996bddb6500d5 --- /dev/null +++ b/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/md5 @@ -0,0 +1 @@ +66d51b63f91b10651a00d2ba002f4f62 diff --git a/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/sha512 b/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/sha512 new file mode 100644 index 0000000000000..504646687b207 --- /dev/null +++ b/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/sha512 @@ -0,0 +1 @@ +3fc0b4dd06f4cbc0ae56b581f31c77e195121b80b46b2643e2b3e80353419720bda288026dd2c28efcdde1530e2a4d3ff3652451165b2e8f343c7ac9957997b7 From 8834e3a1fc67e850c0627a25b4bd90b3c82a1958 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Mon, 10 Jul 2023 18:56:19 -0400 Subject: [PATCH 17/17] Update SparseArrays to the latest master --- .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 - .../sha512 | 1 - stdlib/SparseArrays.version | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 deps/checksums/SparseArrays-2c7f4d6d839e9a97027454a037bfa004c1eb34b0.tar.gz/md5 create mode 100644 deps/checksums/SparseArrays-2c7f4d6d839e9a97027454a037bfa004c1eb34b0.tar.gz/sha512 delete mode 100644 deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/md5 delete mode 100644 deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/sha512 diff --git a/deps/checksums/SparseArrays-2c7f4d6d839e9a97027454a037bfa004c1eb34b0.tar.gz/md5 b/deps/checksums/SparseArrays-2c7f4d6d839e9a97027454a037bfa004c1eb34b0.tar.gz/md5 new file mode 100644 index 0000000000000..21131a800d4af --- /dev/null +++ b/deps/checksums/SparseArrays-2c7f4d6d839e9a97027454a037bfa004c1eb34b0.tar.gz/md5 @@ -0,0 +1 @@ +0369c2679e8b834009526dd4f402cfd8 diff --git a/deps/checksums/SparseArrays-2c7f4d6d839e9a97027454a037bfa004c1eb34b0.tar.gz/sha512 b/deps/checksums/SparseArrays-2c7f4d6d839e9a97027454a037bfa004c1eb34b0.tar.gz/sha512 new file mode 100644 index 0000000000000..df3b4cc3736e1 --- /dev/null +++ b/deps/checksums/SparseArrays-2c7f4d6d839e9a97027454a037bfa004c1eb34b0.tar.gz/sha512 @@ -0,0 +1 @@ +b2573398a8e8f5bcd8195cc3aa68103b2b5ea66c1835d4bc4d808fb1e0d3fbd46cc2caa04a4f49813a4a4a7f88d2f95789fa080d1d940c0291b09416be0fd1e6 diff --git a/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/md5 b/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/md5 deleted file mode 100644 index 996bddb6500d5..0000000000000 --- a/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -66d51b63f91b10651a00d2ba002f4f62 diff --git a/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/sha512 b/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/sha512 deleted file mode 100644 index 504646687b207..0000000000000 --- a/deps/checksums/SparseArrays-478a80b97ac94688ddfe37f5d9ffcb54c6c12919.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -3fc0b4dd06f4cbc0ae56b581f31c77e195121b80b46b2643e2b3e80353419720bda288026dd2c28efcdde1530e2a4d3ff3652451165b2e8f343c7ac9957997b7 diff --git a/stdlib/SparseArrays.version b/stdlib/SparseArrays.version index c375d7b927f96..b29ce9b0306e1 100644 --- a/stdlib/SparseArrays.version +++ b/stdlib/SparseArrays.version @@ -1,4 +1,4 @@ -SPARSEARRAYS_BRANCH = vs/revert-384 -SPARSEARRAYS_SHA1 = 478a80b97ac94688ddfe37f5d9ffcb54c6c12919 +SPARSEARRAYS_BRANCH = main +SPARSEARRAYS_SHA1 = 2c7f4d6d839e9a97027454a037bfa004c1eb34b0 SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1