Skip to content

Commit

Permalink
Use sparsearrays.jl updated to work with SuiteSparse 7
Browse files Browse the repository at this point in the history
  • Loading branch information
ViralBShah committed Mar 24, 2023
1 parent 51c4ff3 commit decd02d
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 44 deletions.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1bc89fa40311dd019e3df16181fa1abd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5af010f1ce57ecde667c6b13c6b592ff3fa865477cb4c35ff96b470e344fc007ab03a262f9874fa321b69aaf3555f8646f445f625552b409e12907e831692068
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
46541001073d1c3c85e18d910f8308f3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f7470a447b934ca9315e216a07b97e363f11bc93186f9aa057b20b2d05092c58ae4f1b733de362de4a0730861c00be4ca5588d0b3ba65f018c1798b9122b9672
66 changes: 32 additions & 34 deletions deps/checksums/suitesparse
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
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+2.aarch64-apple-darwin.tar.gz/md5/584c09a10071546d544c6bd2be92c16d
SuiteSparse.v7.0.1+2.aarch64-apple-darwin.tar.gz/sha512/abfd74078488ff2a1dc27fd7d9397ff891ead41563b38d4141e99ce2dca1ee088b85f0cf188e53b3ed3f55564a4f479d9deb5146e9bfcb6d2b29899c843b02e2
SuiteSparse.v7.0.1+2.aarch64-linux-gnu.tar.gz/md5/845e902b4663ec635df0447334b7bc37
SuiteSparse.v7.0.1+2.aarch64-linux-gnu.tar.gz/sha512/db3080c931c50a02f1a75b2fd8332a681e98ed6ae6becfd7f2a0ea2d17ddfa108a364e7d51c437e7834cb87a62a4b550f2686d1ef5ca56dd2ef6bea3d9d8ee3e
SuiteSparse.v7.0.1+2.aarch64-linux-musl.tar.gz/md5/8586732c13088f9584ce61368697aaa3
SuiteSparse.v7.0.1+2.aarch64-linux-musl.tar.gz/sha512/67ca602490a64f1026bc1d7d8cdec61e09cd3eb7944d1367877a417329c2890da9e6b35d37b7d10d6b1b81c6602672c12b2990d81e09c3e233476b21d11d7e72
SuiteSparse.v7.0.1+2.armv6l-linux-gnueabihf.tar.gz/md5/309af6697329d73a3da787ab50ad9e54
SuiteSparse.v7.0.1+2.armv6l-linux-gnueabihf.tar.gz/sha512/363c1635b6ac03876a4ed5e522c8c54bd3aa4dcbea12180c3a27ddf11ecd7a1838f0bf9be90d8b96073602c6b8727cbe73423173b83f6265170473c2b72bad9e
SuiteSparse.v7.0.1+2.armv6l-linux-musleabihf.tar.gz/md5/c3049b7124e293af95aee71a863ce109
SuiteSparse.v7.0.1+2.armv6l-linux-musleabihf.tar.gz/sha512/ce73d9f948324c25486f2988f57c53125cc0dc623e21cd7eea7a2d0f5822f02de1a77bc839c27efe51d381a2803d786ce0ea72172a070a75b667b910b072f947
SuiteSparse.v7.0.1+2.armv7l-linux-gnueabihf.tar.gz/md5/fc6ffa908d1e11f0519d0a99976437c5
SuiteSparse.v7.0.1+2.armv7l-linux-gnueabihf.tar.gz/sha512/b0393ffd2c0b2fbce2d95f6a2d28c8f21a134b9961f1a67ed6b7ff660390e9aa5d65f0fa267edc7b7e429582b34bbcb3868a39d381faef9244d9948cb0e1b798
SuiteSparse.v7.0.1+2.armv7l-linux-musleabihf.tar.gz/md5/70ba7b6e135bac9710e4604ff707432c
SuiteSparse.v7.0.1+2.armv7l-linux-musleabihf.tar.gz/sha512/ae810b61fff3b4f1ef0e3001759dae6d813ac97e334dff4ce4a3311e82c4706a7eddee4e2d92c5661761513cf48ec1e75e4c99e24176bf5d7049289f51800a5c
SuiteSparse.v7.0.1+2.i686-linux-gnu.tar.gz/md5/1810e3bcd9a0810d7a0bd51389c4309d
SuiteSparse.v7.0.1+2.i686-linux-gnu.tar.gz/sha512/d4a2008d7c7b7c102cb57cddf249df7df7bd9d461a56dd67bc338f2a54553deeaf18002d70a8c54aa2bc2842ed1d66bf7394d65d333b3f15eaf13a4f5e7e02f8
SuiteSparse.v7.0.1+2.i686-linux-musl.tar.gz/md5/948bb229614009bfe2b769270ffc3e67
SuiteSparse.v7.0.1+2.i686-linux-musl.tar.gz/sha512/9183f09e5aa22948ebb28ca6892f7d1ba8931b4766b8250b8cf581b5c68c4e7cd9ac2d52d5811e1077f0751fe0940055e43bfcf4c0e15b5dd3dbce8f4c7c2a10
SuiteSparse.v7.0.1+2.i686-w64-mingw32.tar.gz/md5/63c1763805cf557e4fc124c85b94d4a3
SuiteSparse.v7.0.1+2.i686-w64-mingw32.tar.gz/sha512/e191286ee7fc0f842150105f5e4d2eecc92b37ffc73677a512ec8bdb469a78f1616720f08f3a9fdddb457b67262d7b0f1112d244bbabbca584d7a99107c6a141
SuiteSparse.v7.0.1+2.powerpc64le-linux-gnu.tar.gz/md5/a4e8099b38731bda3841da2126dd1df3
SuiteSparse.v7.0.1+2.powerpc64le-linux-gnu.tar.gz/sha512/a8900f88f4f206e26aef5799786a4cd4281a61a4f635cb685d2e1202dfe59325610c3056c3d2656679633f775c5824d78fc775f306ba176956f0d798cf1e1c36
SuiteSparse.v7.0.1+2.x86_64-apple-darwin.tar.gz/md5/f70894c9cf4e33aebd7b94ba144aa284
SuiteSparse.v7.0.1+2.x86_64-apple-darwin.tar.gz/sha512/6625ce8f309085d323213acd07522e40195334734c4c80c665040795b58e7028e52ec8d78f5054edba9e94c58ff5aa5eb5aae3c743f4707bd6332bbd453c35fb
SuiteSparse.v7.0.1+2.x86_64-linux-gnu.tar.gz/md5/cfb3fd593acd1c190d7c50bff002739b
SuiteSparse.v7.0.1+2.x86_64-linux-gnu.tar.gz/sha512/dabc12da913c94cd88e4137d167ab399f01566579d1eb6cba6d5490bfd624aa48c2e504c07b81c52fe0277ceb1ff45363e6b8329ee56354c0d3f29defcc396c7
SuiteSparse.v7.0.1+2.x86_64-linux-musl.tar.gz/md5/1050be06b8f916637d14bd700aff54d8
SuiteSparse.v7.0.1+2.x86_64-linux-musl.tar.gz/sha512/535c95e34137db8b7bef49bab1ca9dcf82ee31e145aab89d1066622a27b0cd7193169e6f148fb2bca8f12e5dbf69e93a31f529f61460cab9fe0ae4d81160c156
SuiteSparse.v7.0.1+2.x86_64-unknown-freebsd.tar.gz/md5/660d965cc925399ebc403433ca1e9cb4
SuiteSparse.v7.0.1+2.x86_64-unknown-freebsd.tar.gz/sha512/fa6038d06a6413ebe066c0610f34dc57cb05048e304faaeaa256e900859790b6f40a05e3641e8dfabe1c6e5d838e20db8cfdb150ea200a5d64077a44da3af683
SuiteSparse.v7.0.1+2.x86_64-w64-mingw32.tar.gz/md5/76682aea2a1d74645cc998a2a58968a2
SuiteSparse.v7.0.1+2.x86_64-w64-mingw32.tar.gz/sha512/1bf79014a6ae2b58029c66f9d753e03b3e50f42f5719e02ea595b51508ff885408861337e78cc3f36d863f874e837f419be991f4cb658d757043a04a44734ba7
9 changes: 5 additions & 4 deletions deps/libsuitesparse.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion stdlib/SparseArrays.version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SPARSEARRAYS_BRANCH = main
SPARSEARRAYS_SHA1 = 8affe9e499379616e33fc60a24bb31500e8423d7
SPARSEARRAYS_SHA1 = ee419aef600102e932d86ef784629d11605f9373
SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git
SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1
4 changes: 2 additions & 2 deletions stdlib/SuiteSparse_jll/Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "SuiteSparse_jll"
uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
version = "7.0.1+0"
version = "7.0.1+2"

[deps]
libblastrampoline_jll = "8e850b90-86db-534c-a0d3-1478176c7d93"
Expand All @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion stdlib/SuiteSparse_jll/test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit decd02d

Please sign in to comment.