From b8056c80f9502499c21c701582dc81dbc531df44 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Sat, 29 May 2021 15:39:40 -0400 Subject: [PATCH] Remove SuiteSparse_wrapper and winclang patch (#40998) * Remove SuiteSparse_wrapper and winclang patch Fix https://github.com/JuliaLang/SuiteSparse.jl/issues/11 Fix https://github.com/JuliaLang/julia/issues/37322 * Update SuiteSparse version to 5.10.1 * Update libsuitesparse checksums for 5.10.1 * Remove more wrapper stuff --- Makefile | 1 - deps/Makefile | 10 +- deps/SuiteSparse_wrapper.c | 156 ------------------ deps/Versions.make | 2 +- deps/checksums/suitesparse | 68 ++++---- deps/libsuitesparse.mk | 50 +----- deps/patches/SuiteSparse-winclang.patch | 14 -- stdlib/SuiteSparse_jll/Project.toml | 2 +- stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl | 12 +- stdlib/SuiteSparse_jll/test/runtests.jl | 2 +- 10 files changed, 43 insertions(+), 274 deletions(-) delete mode 100644 deps/SuiteSparse_wrapper.c delete mode 100644 deps/patches/SuiteSparse-winclang.patch diff --git a/Makefile b/Makefile index f4207c1719021a..51bb09b094f1c0 100644 --- a/Makefile +++ b/Makefile @@ -170,7 +170,6 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1) JL_PRIVATE_LIBS-0 += libjulia-internal-debug endif ifeq ($(USE_GPL_LIBS), 1) -JL_PRIVATE_LIBS-0 += libsuitesparse_wrapper JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSUITESPARSE) += libamd libbtf libcamd libccolamd libcholmod libcolamd libklu libldl librbio libspqr libsuitesparseconfig libumfpack endif JL_PRIVATE_LIBS-$(USE_SYSTEM_PCRE) += libpcre2-8 diff --git a/deps/Makefile b/deps/Makefile index 35c30d5930bd11..27b93f444580f4 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -24,7 +24,7 @@ BUILDDIR := $(BUILDDIR)$(MAYBE_HOST) # if you are adding a new target, it can help to copy an similar, existing target # # autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv curl -# custom Makefile rules: openlibm dsfmt libsuitesparse-wrapper libsuitesparse lapack blastrampoline openblas utf8proc objconv libwhich +# custom Makefile rules: openlibm dsfmt libsuitesparse lapack blastrampoline openblas utf8proc objconv libwhich # CMake libs: llvm llvmunwind libgit2 libssh2 mbedtls # # downloadable via git: llvm-svn, libuv, libopenlibm, utf8proc, libgit2, libssh2 @@ -46,10 +46,6 @@ ifeq ($(USE_SYSTEM_CSL), 0) DEP_LIBS += csl endif -ifeq ($(USE_GPL_LIBS), 1) -DEP_LIBS += libsuitesparse-wrapper -endif - ifeq ($(USE_SYSTEM_LIBUV), 0) DEP_LIBS += libuv endif @@ -166,13 +162,11 @@ ifneq ($(OS), WINNT) DEP_LIBS += libwhich endif -DEP_LIBS_STAGED := $(filter-out libsuitesparse-wrapper,$(DEP_LIBS)) - # list all targets DEP_LIBS_STAGED_ALL := llvm llvm-tools clang llvmunwind unwind libuv pcre \ openlibm dsfmt blastrampoline openblas lapack gmp mpfr patchelf utf8proc \ objconv mbedtls libssh2 nghttp2 curl libgit2 libwhich zlib p7zip csl \ - libsuitesparse libsuitesparse-wrapper + libsuitesparse DEP_LIBS_ALL := $(DEP_LIBS_STAGED_ALL) ifneq ($(USE_BINARYBUILDER_OPENBLAS),0) diff --git a/deps/SuiteSparse_wrapper.c b/deps/SuiteSparse_wrapper.c deleted file mode 100644 index 63204ac80a665a..00000000000000 --- a/deps/SuiteSparse_wrapper.c +++ /dev/null @@ -1,156 +0,0 @@ -/* - SuiteSparse_wrapper.c: Changes made to this file in the Julia repo - in deps/SuiteSparse_wrapper.c should be also made in - Yggdrasil/S/SuiteSparse and vice versa. -*/ - -#include -#include - -extern size_t jl_cholmod_sizeof_long(void) { - return sizeof(SuiteSparse_long); -} - -extern int jl_cholmod_version(int *ver) { - if (ver != (int*) NULL) { - ver[0] = CHOLMOD_MAIN_VERSION; - ver[1] = CHOLMOD_SUB_VERSION; - ver[2] = CHOLMOD_SUBSUB_VERSION; - } - return CHOLMOD_VERSION; -} - -// Keep this synchronized with https://github.com/JuliaLang/julia/blob/master/stdlib/SuiteSparse/src/cholmod.jl -extern void jl_cholmod_method_offsets(size_t *v) { - size_t offset = offsetof(cholmod_common, method[0]); - v[ 0] = offsetof(cholmod_common, method[0].lnz) - offset; - v[ 1] = offsetof(cholmod_common, method[0].fl) - offset; - v[ 2] = offsetof(cholmod_common, method[0].prune_dense) - offset; - v[ 3] = offsetof(cholmod_common, method[0].prune_dense2) - offset; - v[ 4] = offsetof(cholmod_common, method[0].nd_oksep) - offset; - v[ 5] = offsetof(cholmod_common, method[0].other_1) - offset; - v[ 6] = offsetof(cholmod_common, method[0].nd_small) - offset; - v[ 7] = offsetof(cholmod_common, method[0].other_2) - offset; - v[ 8] = offsetof(cholmod_common, method[0].aggressive) - offset; - v[ 9] = offsetof(cholmod_common, method[0].order_for_lu) - offset; - v[10] = offsetof(cholmod_common, method[0].nd_compress) - offset; - v[11] = offsetof(cholmod_common, method[0].nd_camd) - offset; - v[12] = offsetof(cholmod_common, method[0].nd_components) - offset; - v[13] = offsetof(cholmod_common, method[0].ordering) - offset; - v[14] = offsetof(cholmod_common, method[0].other_3) - offset; -} - -// Keep this synchronized with https://github.com/JuliaLang/julia/blob/master/stdlib/SuiteSparse/src/cholmod.jl -extern void jl_cholmod_common_offsets(size_t *v) { - v[ 0] = offsetof(cholmod_common, dbound); - v[ 1] = offsetof(cholmod_common, grow0); - v[ 2] = offsetof(cholmod_common, grow1); - v[ 3] = offsetof(cholmod_common, grow2); - v[ 4] = offsetof(cholmod_common, maxrank); - v[ 5] = offsetof(cholmod_common, supernodal_switch); - v[ 6] = offsetof(cholmod_common, supernodal); - v[ 7] = offsetof(cholmod_common, final_asis); - v[ 8] = offsetof(cholmod_common, final_super); - v[ 9] = offsetof(cholmod_common, final_ll); - v[ 10] = offsetof(cholmod_common, final_pack); - v[ 11] = offsetof(cholmod_common, final_monotonic); - v[ 12] = offsetof(cholmod_common, final_resymbol); - v[ 13] = offsetof(cholmod_common, zrelax); - v[ 14] = offsetof(cholmod_common, nrelax); - v[ 15] = offsetof(cholmod_common, prefer_zomplex); - v[ 16] = offsetof(cholmod_common, prefer_upper); - v[ 17] = offsetof(cholmod_common, quick_return_if_not_posdef); - v[ 18] = offsetof(cholmod_common, prefer_binary); - v[ 19] = offsetof(cholmod_common, print); - v[ 20] = offsetof(cholmod_common, precise); - v[ 21] = offsetof(cholmod_common, try_catch); - v[ 22] = offsetof(cholmod_common, error_handler); - v[ 23] = offsetof(cholmod_common, nmethods); - v[ 24] = offsetof(cholmod_common, current); - v[ 25] = offsetof(cholmod_common, selected); - v[ 26] = offsetof(cholmod_common, method); - v[ 27] = offsetof(cholmod_common, postorder); - v[ 28] = offsetof(cholmod_common, default_nesdis); - v[ 29] = offsetof(cholmod_common, metis_memory); - v[ 30] = offsetof(cholmod_common, metis_dswitch); - v[ 31] = offsetof(cholmod_common, metis_nswitch); - v[ 32] = offsetof(cholmod_common, nrow); - v[ 33] = offsetof(cholmod_common, mark); - v[ 34] = offsetof(cholmod_common, iworksize); - v[ 35] = offsetof(cholmod_common, xworksize); - v[ 36] = offsetof(cholmod_common, Flag); - v[ 37] = offsetof(cholmod_common, Head); - v[ 38] = offsetof(cholmod_common, Xwork); - v[ 39] = offsetof(cholmod_common, Iwork); - v[ 40] = offsetof(cholmod_common, itype); - v[ 41] = offsetof(cholmod_common, dtype); - v[ 42] = offsetof(cholmod_common, no_workspace_reallocate); - v[ 43] = offsetof(cholmod_common, status); - v[ 44] = offsetof(cholmod_common, fl); - v[ 45] = offsetof(cholmod_common, lnz); - v[ 46] = offsetof(cholmod_common, anz); - v[ 47] = offsetof(cholmod_common, modfl); - v[ 48] = offsetof(cholmod_common, malloc_count); - v[ 49] = offsetof(cholmod_common, memory_usage); - v[ 50] = offsetof(cholmod_common, memory_inuse); - v[ 51] = offsetof(cholmod_common, nrealloc_col); - v[ 52] = offsetof(cholmod_common, nrealloc_factor); - v[ 53] = offsetof(cholmod_common, ndbounds_hit); - v[ 54] = offsetof(cholmod_common, rowfacfl); - v[ 55] = offsetof(cholmod_common, aatfl); - v[ 56] = offsetof(cholmod_common, called_nd); - v[ 57] = offsetof(cholmod_common, blas_ok); - v[ 58] = offsetof(cholmod_common, SPQR_grain); - v[ 59] = offsetof(cholmod_common, SPQR_small); - v[ 60] = offsetof(cholmod_common, SPQR_shrink); - v[ 61] = offsetof(cholmod_common, SPQR_nthreads); - v[ 62] = offsetof(cholmod_common, SPQR_flopcount); - v[ 63] = offsetof(cholmod_common, SPQR_analyze_time); - v[ 64] = offsetof(cholmod_common, SPQR_factorize_time); - v[ 65] = offsetof(cholmod_common, SPQR_solve_time); - v[ 66] = offsetof(cholmod_common, SPQR_flopcount_bound); - v[ 67] = offsetof(cholmod_common, SPQR_tol_used); - v[ 68] = offsetof(cholmod_common, SPQR_norm_E_fro); - v[ 69] = offsetof(cholmod_common, SPQR_istat); - v[ 70] = offsetof(cholmod_common, useGPU); - v[ 71] = offsetof(cholmod_common, maxGpuMemBytes); - v[ 72] = offsetof(cholmod_common, maxGpuMemFraction); - v[ 73] = offsetof(cholmod_common, gpuMemorySize); - v[ 74] = offsetof(cholmod_common, gpuKernelTime); - v[ 75] = offsetof(cholmod_common, gpuFlops); - v[ 76] = offsetof(cholmod_common, gpuNumKernelLaunches); - v[ 77] = offsetof(cholmod_common, cublasHandle); - v[ 78] = offsetof(cholmod_common, gpuStream); - v[ 79] = offsetof(cholmod_common, cublasEventPotrf); - v[ 80] = offsetof(cholmod_common, updateCKernelsComplete); - v[ 81] = offsetof(cholmod_common, updateCBuffersFree); - v[ 82] = offsetof(cholmod_common, dev_mempool); - v[ 83] = offsetof(cholmod_common, dev_mempool_size); - v[ 84] = offsetof(cholmod_common, host_pinned_mempool); - v[ 85] = offsetof(cholmod_common, host_pinned_mempool_size); - v[ 86] = offsetof(cholmod_common, devBuffSize); - v[ 87] = offsetof(cholmod_common, ibuffer); - v[ 88] = offsetof(cholmod_common, syrkStart); - v[ 89] = offsetof(cholmod_common, cholmod_cpu_gemm_time); - v[ 90] = offsetof(cholmod_common, cholmod_cpu_syrk_time); - v[ 91] = offsetof(cholmod_common, cholmod_cpu_trsm_time); - v[ 92] = offsetof(cholmod_common, cholmod_cpu_potrf_time); - v[ 93] = offsetof(cholmod_common, cholmod_gpu_gemm_time); - v[ 94] = offsetof(cholmod_common, cholmod_gpu_syrk_time); - v[ 95] = offsetof(cholmod_common, cholmod_gpu_trsm_time); - v[ 96] = offsetof(cholmod_common, cholmod_gpu_potrf_time); - v[ 97] = offsetof(cholmod_common, cholmod_assemble_time); - v[ 98] = offsetof(cholmod_common, cholmod_assemble_time2); - v[ 99] = offsetof(cholmod_common, cholmod_cpu_gemm_calls); - v[100] = offsetof(cholmod_common, cholmod_cpu_syrk_calls); - v[101] = offsetof(cholmod_common, cholmod_cpu_trsm_calls); - v[102] = offsetof(cholmod_common, cholmod_cpu_potrf_calls); - v[103] = offsetof(cholmod_common, cholmod_gpu_gemm_calls); - v[104] = offsetof(cholmod_common, cholmod_gpu_syrk_calls); - v[105] = offsetof(cholmod_common, cholmod_gpu_trsm_calls); - v[106] = offsetof(cholmod_common, cholmod_gpu_potrf_calls); -} - -extern size_t jl_cholmod_common_size() { - return sizeof(cholmod_common); -} diff --git a/deps/Versions.make b/deps/Versions.make index 56014d8b052b0e..cb41d43622aedf 100644 --- a/deps/Versions.make +++ b/deps/Versions.make @@ -98,7 +98,7 @@ PCRE_VER := 10.36 PCRE_JLL_NAME := PCRE2 # SuiteSparse -LIBSUITESPARSE_VER := 5.8.1 +LIBSUITESPARSE_VER := 5.10.1 LIBSUITESPARSE_JLL_NAME := SuiteSparse # unwind diff --git a/deps/checksums/suitesparse b/deps/checksums/suitesparse index 7b4975e4ca709c..25123ba0152945 100644 --- a/deps/checksums/suitesparse +++ b/deps/checksums/suitesparse @@ -1,34 +1,34 @@ -SuiteSparse-5.8.1.tar.gz/md5/c414679bbc9432a3def01b31ad921140 -SuiteSparse-5.8.1.tar.gz/sha512/3d986157acd39968216880c2de30c54d72e0addd7318a04948c1b842ad9c876bcde32f292504d4540a4baa998a368dfc0db000606a2d00f61760a92d5b8c1cb8 -SuiteSparse.v5.8.1+2.aarch64-apple-darwin.tar.gz/md5/949a6cd6ac04e41f89cef401d7e5ca74 -SuiteSparse.v5.8.1+2.aarch64-apple-darwin.tar.gz/sha512/60612bd0bfeb1e00a452aea8024454110838eb20889be3f82fa6ee25884f791d7fd21c156aaca68e94561f084ab83b44f71c7740486d8233c5451ff267e85d9a -SuiteSparse.v5.8.1+2.aarch64-linux-gnu.tar.gz/md5/241344499b65b88a967fecae692e314c -SuiteSparse.v5.8.1+2.aarch64-linux-gnu.tar.gz/sha512/5ab6f4df36a56c2ebc880a10889071bbf0846d6231ffe750a1427108a5ae3c7e1dcd0e994dcd4264908a420cc6534b8f58912baaafd1cdc83d5c38f5f44fb217 -SuiteSparse.v5.8.1+2.aarch64-linux-musl.tar.gz/md5/d0cbfe923083718235a6ef878a36dd7d -SuiteSparse.v5.8.1+2.aarch64-linux-musl.tar.gz/sha512/e1e0b4c9408ae966c429a81c22089077f137cd44fdd6a8ee228122ac3dfe79dd163277657fcce69c916d071b46b82f6cc445b1b2a778691c2a7fc4178eaeae0c -SuiteSparse.v5.8.1+2.armv6l-linux-gnueabihf.tar.gz/md5/5c690a16f2a176e3d7369ef52aaf0dcc -SuiteSparse.v5.8.1+2.armv6l-linux-gnueabihf.tar.gz/sha512/ce018e09df64f63b728a6f3fd6b256859b1f6ff76750858192083b19acd25813512ae50755d5cfd716fa62dc17ef160bad1ed4c65a46268801df9504482e2c04 -SuiteSparse.v5.8.1+2.armv6l-linux-musleabihf.tar.gz/md5/4b51607d9d6c332b5c86adc9ab6887e6 -SuiteSparse.v5.8.1+2.armv6l-linux-musleabihf.tar.gz/sha512/9fac97308c3109d4a6c365393c8077f9717b2cdd3dd483e0a0aed82ed4e70cd321aeb18e3eaa764bdb1c3b24e378eb687eeb0c48b91e1d0de55a08301b50c6d6 -SuiteSparse.v5.8.1+2.armv7l-linux-gnueabihf.tar.gz/md5/f40fdd991ef0cf9d556d1ae2ae079cd1 -SuiteSparse.v5.8.1+2.armv7l-linux-gnueabihf.tar.gz/sha512/1d1b81b8f6f82d09f53bff5ade45d3183cb903fee0b279d69fbb7cfa737aeff72279d3e151d4094ed56dfa4b8affe1f4bda443c982c5fc8aa881c2ce9f88dafc -SuiteSparse.v5.8.1+2.armv7l-linux-musleabihf.tar.gz/md5/4a87fc57bc380220abc7422f9f428d6f -SuiteSparse.v5.8.1+2.armv7l-linux-musleabihf.tar.gz/sha512/47cab4afd3559f67dfe54c6bc2ce9ff3c0e69334c2df99e929ff4843c7f92b6fdf7b6001e61701040a1623fc97927001b7cd0f07074d4099cd03b2d4e184d4c1 -SuiteSparse.v5.8.1+2.i686-linux-gnu.tar.gz/md5/4d3826df74a9f0c64e4dffabb6de0c7d -SuiteSparse.v5.8.1+2.i686-linux-gnu.tar.gz/sha512/2a0a10e1ba273b308aa7d11b0ace54eaef300ff4c8ddbf8ff3a721766fa5b59a43184b73f80afe8205410fa4d295ed5b38973053dcdba278d8e03aa0f47903ed -SuiteSparse.v5.8.1+2.i686-linux-musl.tar.gz/md5/72543b4dd636e4ffadb7a24eff8b5f9e -SuiteSparse.v5.8.1+2.i686-linux-musl.tar.gz/sha512/216795d8af1c2012b692d1b6ec2a4b70012331bbe9619a502c43cf1530d3170c69eb2261d6bba973ab40173f0b9a05992f4c570ff35a25018c7bff936da607ff -SuiteSparse.v5.8.1+2.i686-w64-mingw32.tar.gz/md5/29141ae2b353d4477b9d8e9fad0b8242 -SuiteSparse.v5.8.1+2.i686-w64-mingw32.tar.gz/sha512/ac80a24f60cb89ec25fddd77371cf209e43c4223756d435eb6f1a931c840bf7f2b11762de889664b98b0e0bb9b35f747c6af2365d564a164d6d92bb69c7b5108 -SuiteSparse.v5.8.1+2.powerpc64le-linux-gnu.tar.gz/md5/a776cb5742b4d00c89c445bc07ac7c3d -SuiteSparse.v5.8.1+2.powerpc64le-linux-gnu.tar.gz/sha512/314a220782be70d8267cefe4efd84439e33516c576666d8edbfa02581f0a1ebd31af97618743d461acb63f447ddff4dc282445b96782f2a73ec72b911948e443 -SuiteSparse.v5.8.1+2.x86_64-apple-darwin.tar.gz/md5/8b94288d3ec650f85f7723fc53e0acfd -SuiteSparse.v5.8.1+2.x86_64-apple-darwin.tar.gz/sha512/7a790a3bf8b3ff4402aea6d8c06eaf5d997317c85a7f109850af4f6719388b4a0a96d540c55b6ca1c2a69732307a89780c3f7282b784ce9c5d65b2fd2169a20c -SuiteSparse.v5.8.1+2.x86_64-linux-gnu.tar.gz/md5/b78f13d88b69826d6cde30cf5e7dbdf1 -SuiteSparse.v5.8.1+2.x86_64-linux-gnu.tar.gz/sha512/0e624d5f0f5f69d9e60841c90a7205bb38e0916db83752bb837b42f956389b9dfb7aca55025cb071fedeaa2acde8f7c7ad567e264f43aa49b1e8797b8bc3b4cb -SuiteSparse.v5.8.1+2.x86_64-linux-musl.tar.gz/md5/f1e7760e7de7385617c42137c042f085 -SuiteSparse.v5.8.1+2.x86_64-linux-musl.tar.gz/sha512/a7098cce4bed90133e9625908373c7c695ff03ebebec556322652d1d5485c7f9ab3543122a8950d27f0d00d751f136aa640a403fd2f326e37538cea12c199ac1 -SuiteSparse.v5.8.1+2.x86_64-unknown-freebsd.tar.gz/md5/8ebdffa4e464038f5dfa00f63776a919 -SuiteSparse.v5.8.1+2.x86_64-unknown-freebsd.tar.gz/sha512/54a93637ff01d2606726d445e8f186517da8915ef6bde549f841cd11521031c4fc19d3a8254006683db6bee04e41b43aaad72bacdf3c826d0fd9eed16feb40ab -SuiteSparse.v5.8.1+2.x86_64-w64-mingw32.tar.gz/md5/d280f92f61ce045dcf434029b32b788c -SuiteSparse.v5.8.1+2.x86_64-w64-mingw32.tar.gz/sha512/a17bfa2562fc60f3832131d72d6055c7855b10a67cccea357de6bed51ed9a310da5ccae7ed31549f4628c1af73aebd26125073d49648d194827e6cad0e421626 +SuiteSparse-5.10.1.tar.gz/md5/68bb912f3cf3d2b01f30ebafef690302 +SuiteSparse-5.10.1.tar.gz/sha512/8f85c6d63b76cba95707dfa732c51200df7794cb4c2599dbd92100475747b8d02b05089a47096e85c60b89bc852a8e768e0670f24902a82d29494a80ccf2bb5f +SuiteSparse.v5.10.1+0.aarch64-apple-darwin.tar.gz/md5/b9392f8e71c0c40d37489e7b2071c5ad +SuiteSparse.v5.10.1+0.aarch64-apple-darwin.tar.gz/sha512/109d67cb009e3b2931b94d63cbdaaee29d60dc190b731ebe3737181cd48d913b8a1333043c67be8179c73e4d3ae32ed1361ab4e34312c0f42e4b29f8a7afda3e +SuiteSparse.v5.10.1+0.aarch64-linux-gnu.tar.gz/md5/1b2651ede4a74cd57f65505a65093314 +SuiteSparse.v5.10.1+0.aarch64-linux-gnu.tar.gz/sha512/753f986a749d139f9a6baedac059d8ed8efdd716ed28eacdbf00e6ebe863b4e17467f01a9693dcb39571d38b4b5c4c1375dbb790b88a7e704116e3fe83f7ff3e +SuiteSparse.v5.10.1+0.aarch64-linux-musl.tar.gz/md5/051ff9bbbc95c57d58563df8a2c8eedd +SuiteSparse.v5.10.1+0.aarch64-linux-musl.tar.gz/sha512/855979ed8d6290c529d9c9e82944fb15c88f9d9d8da7db1fa2fc34efb0ed985fc6554312882107f26956f2a18ae985918909cd834e068b874906c21a0f53b6c9 +SuiteSparse.v5.10.1+0.armv6l-linux-gnueabihf.tar.gz/md5/dbc5fb4844077084663612af26e180ce +SuiteSparse.v5.10.1+0.armv6l-linux-gnueabihf.tar.gz/sha512/b906f7275ab58006acd52927e7e04c79eec59b5f28e9d7e5d5b8556c0eedd54cfff87e494373702c205afa2384ee6b0f2bb5e811fd440b1b50d5c9eee1b47b99 +SuiteSparse.v5.10.1+0.armv6l-linux-musleabihf.tar.gz/md5/7770d256e76d5ce1484c3781508cc3ed +SuiteSparse.v5.10.1+0.armv6l-linux-musleabihf.tar.gz/sha512/4f1d46cc8da5a7eff665b4bb96f9e21319f39231f98a6164d8c3d654d5b6f93c3e4477f55a39a80b7f8125a78d690cc5a1cc58f29143ba4c109a4182d7fa2110 +SuiteSparse.v5.10.1+0.armv7l-linux-gnueabihf.tar.gz/md5/ee1fa978bcfb264842749f915bbefd77 +SuiteSparse.v5.10.1+0.armv7l-linux-gnueabihf.tar.gz/sha512/9592a42f6474fd89eea1144f62ecc2a23796ad251173a9c36ccbc9bc18dd88687ce49f51528974f56b5652e2ab15f0aa41634513f2cc0b3c54259de3b68350bd +SuiteSparse.v5.10.1+0.armv7l-linux-musleabihf.tar.gz/md5/30f708421b92158c7741c82576e9047b +SuiteSparse.v5.10.1+0.armv7l-linux-musleabihf.tar.gz/sha512/d8793d48757dbb62aa7a21c215b6d6e63a26ce4ba740f1f7f42a3e485ad3d9628744f021ad9cc96e29c8c88bfb2f02ea92865c26b971ca739d3c05c7f28875d9 +SuiteSparse.v5.10.1+0.i686-linux-gnu.tar.gz/md5/9018b6168b9a687bab0c9a9cbf45afba +SuiteSparse.v5.10.1+0.i686-linux-gnu.tar.gz/sha512/308a92f441af6855517c40c6871b4935251677c05cc082c21fd1249e0137b635fa524f60cad61c7524026301a6de7ffea0ad1f4b9a4d9d6e3ced3f332a6719d4 +SuiteSparse.v5.10.1+0.i686-linux-musl.tar.gz/md5/99143f8d6de4f071ffa19942252b6dec +SuiteSparse.v5.10.1+0.i686-linux-musl.tar.gz/sha512/9fb719fffea03296dfac8bc221bafc3ed8f7791749eca6c4b00265994de1be5d242e7e5184693603c745b39c4538feb11ab283204e0e33df2745f904cf0c7252 +SuiteSparse.v5.10.1+0.i686-w64-mingw32.tar.gz/md5/d049c943fbda2c8380dea33e16569275 +SuiteSparse.v5.10.1+0.i686-w64-mingw32.tar.gz/sha512/174768464432b991ecff88d5e5126caca83672fb5173115de59bc2387ef8aa75a56d3e84957fce625fabaf50ba462549f2ea828aea7258be7513835b7fea2e31 +SuiteSparse.v5.10.1+0.powerpc64le-linux-gnu.tar.gz/md5/f01f7e134f8ee77849f3a46e773c1ff2 +SuiteSparse.v5.10.1+0.powerpc64le-linux-gnu.tar.gz/sha512/dc0339f2b35f05d49fbd1dcf1822c774a07af122fabc8e00eb7435dc53fcf82b3c1ec24e2bb41b1a58d3f8ab8903830eb7ece19dc6fce3f5e73d90a3dc3c4194 +SuiteSparse.v5.10.1+0.x86_64-apple-darwin.tar.gz/md5/02975a8670660c5e79eab0a70b051a0b +SuiteSparse.v5.10.1+0.x86_64-apple-darwin.tar.gz/sha512/e55685ed7a63318c5baa326795503f13f031e0a617c045c972d5c89252ab51e7325e2b0425ca10dfbd59e79c5b4200545f5a4944fddd376e7610b6ebf74ded14 +SuiteSparse.v5.10.1+0.x86_64-linux-gnu.tar.gz/md5/6c111d315fb25c529710722bd5ae6af0 +SuiteSparse.v5.10.1+0.x86_64-linux-gnu.tar.gz/sha512/c971aed91bd695a0f7f735f58ddcb075d32b9522a8a50a30ad383ba5ce2c8e572fec97644e6cb85745206f4e5da72d7865d9a9724eb63ce3c04e90a4eedc90c9 +SuiteSparse.v5.10.1+0.x86_64-linux-musl.tar.gz/md5/7c98daf0edfad31764c3078e6351b521 +SuiteSparse.v5.10.1+0.x86_64-linux-musl.tar.gz/sha512/2c4b3cae1bd8d1ce62dae6aeca3ffbf90c26a1b01c0da4fb7761d6fe4293b8fad0b6fbfd5f930cefe6ccaef7546a482022ff2f50dc59ecf17c5c0dfc6a5961f5 +SuiteSparse.v5.10.1+0.x86_64-unknown-freebsd.tar.gz/md5/aeca88a7bc3f9d239c61084996ce9182 +SuiteSparse.v5.10.1+0.x86_64-unknown-freebsd.tar.gz/sha512/0bee1ee07c3883fe28dd322c40195be9adb757d6dab3eb1730d7b0ff65dd4517520047696ccdda4ca618e671d898cdb45b787094594e142cb4b176549a74200b +SuiteSparse.v5.10.1+0.x86_64-w64-mingw32.tar.gz/md5/63e449554eee134757e3d50ca8b5f47d +SuiteSparse.v5.10.1+0.x86_64-w64-mingw32.tar.gz/sha512/95b58df4fe7520e2b526f9e3b199253909992789cd24ecca814ddb9a0c0bb37ff93c1de40239e5295a8503613cdb2431a87f0a70a3d657d94d4661f1778797f2 diff --git a/deps/libsuitesparse.mk b/deps/libsuitesparse.mk index a7bf592ccc9ea9..42ae7807bb4ec8 100644 --- a/deps/libsuitesparse.mk +++ b/deps/libsuitesparse.mk @@ -42,13 +42,9 @@ $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/source-extracted: $(SRCCACHE)/Suit checksum-libsuitesparse: $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz $(JLCHECKSUM) $< -$(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/SuiteSparse-winclang.patch-applied: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/source-extracted - cd $(dir $@) && patch -p0 < $(SRCDIR)/patches/SuiteSparse-winclang.patch - echo 1 > $@ $(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-winclang.patch-applied $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/SuiteSparse-shlib.patch-applied $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled: | $(build_prefix)/manifest/blastrampoline @@ -83,13 +79,13 @@ $(build_prefix)/manifest/libsuitesparse: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARS #cp -a $(dir $<)include/* $(build_includedir) echo $(UNINSTALL_libsuitesparse) > $@ -clean-libsuitesparse: clean-suitesparse-wrapper uninstall-libsuitesparse +clean-libsuitesparse: uninstall-libsuitesparse -rm $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled -rm -fr $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/lib -rm -fr $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/include -$(MAKE) -C $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER) clean -distclean-libsuitesparse: clean-libsuitesparse-wrapper +distclean-libsuitesparse: -rm -rf $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz \ $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER) @@ -99,52 +95,12 @@ configure-libsuitesparse: extract-libsuitesparse compile-libsuitesparse: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled fastcheck-libsuitesparse: #none check-libsuitesparse: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-checked -install-libsuitesparse: $(build_prefix)/manifest/libsuitesparse install-libsuitesparse-wrapper - -# LIBSUITESPARSE WRAPPER - -ifeq ($(USE_SYSTEM_LIBSUITESPARSE), 1) -LIBSUITESPARSE_INC := -I $(LOCALBASE)/include/suitesparse -LIBSUITESPARSE_LIB := -lumfpack -lcholmod -lamd -lcamd -lcolamd -lspqr -else -LIBSUITESPARSE_INC := -I $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/CHOLMOD/Include -I $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/SuiteSparse_config -I $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/SPQR/Include -LIBSUITESPARSE_LIB := -L$(build_shlibdir) -lcholmod -lumfpack -lspqr $(RPATH_ORIGIN) -$(build_shlibdir)/libsuitesparse_wrapper.$(SHLIB_EXT): $(build_prefix)/manifest/libsuitesparse -endif - -$(build_shlibdir)/libsuitesparse_wrapper.$(SHLIB_EXT): $(SRCDIR)/SuiteSparse_wrapper.c - mkdir -p $(build_shlibdir) - $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(LIBSUITESPARSE_INC) $< -o $@ $(LIBSUITESPARSE_LIB) - $(INSTALL_NAME_CMD)libsuitesparse_wrapper.$(SHLIB_EXT) $@ - touch -c $@ - -clean-libsuitesparse-wrapper: - -rm -f $(build_shlibdir)/libsuitesparse_wrapper.$(SHLIB_EXT) - -distclean-libsuitesparse-wrapper: clean-suitesparse-wrapper - -get-libsuitesparse-wrapper: -extract-libsuitesparse-wrapper: -configure-libsuitesparse-wrapper: -compile-libsuitesparse-wrapper: -fastcheck-libsuitesparse-wrapper: #none -check-libsuitesparse-wrapper: -install-libsuitesparse-wrapper: $(build_shlibdir)/libsuitesparse_wrapper.$(SHLIB_EXT) +install-libsuitesparse: $(build_prefix)/manifest/libsuitesparse else # USE_BINARYBUILDER_LIBSUITESPARSE $(eval $(call bb-install,libsuitesparse,LIBSUITESPARSE,false)) -get-libsuitesparse-wrapper: get-libsuitesparse -extract-libsuitesparse-wrapper: extract-libsuitesparse -configure-libsuitesparse-wrapper: configure-libsuitesparse -compile-libsuitesparse-wrapper: compile-libsuitesparse -fastcheck-libsuitesparse-wrapper: fastcheck-libsuitesparse -check-libsuitesparse-wrapper: check-libsuitesparse -clean-libsuitesparse-wrapper: clean-libsuitesparse -distclean-libsuitesparse-wrapper: distclean-libsuitesparse -install-libsuitesparse-wrapper: install-libsuitesparse - # libsuitesparse depends on blastrampoline compile-libsuitesparse: | $(build_prefix)/manifest/blastrampoline endif diff --git a/deps/patches/SuiteSparse-winclang.patch b/deps/patches/SuiteSparse-winclang.patch deleted file mode 100644 index 8bfb64dc278393..00000000000000 --- a/deps/patches/SuiteSparse-winclang.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- SuiteSparse_config/SuiteSparse_config.h 2015-07-15 03:26:41.000000000 +0000 -+++ SuiteSparse_config/SuiteSparse_config.h 2016-07-01 00:55:57.157465600 +0000 -@@ -54,7 +54,11 @@ - #ifdef _WIN64 - - #define SuiteSparse_long __int64 -+#ifdef _MSVC_VER - #define SuiteSparse_long_max _I64_MAX -+#else -+#define SuiteSparse_long_max LLONG_MAX -+#endif - #define SuiteSparse_long_idd "I64d" - - #else diff --git a/stdlib/SuiteSparse_jll/Project.toml b/stdlib/SuiteSparse_jll/Project.toml index 436f919a609769..c360967a2acc16 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.8.1+2" +version = "5.10.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 19cf398feec252..2940970ceff9fe 100644 --- a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl +++ b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl @@ -8,7 +8,7 @@ Base.Experimental.@compiler_options compile=min optimize=0 infer=false const PATH_list = String[] const LIBPATH_list = String[] -export libamd, libbtf, libcamd, libccolamd, libcholmod, libcolamd, libklu, libldl, librbio, libspqr, libsuitesparse_wrapper, libsuitesparseconfig, libumfpack +export libamd, libbtf, libcamd, libccolamd, libcholmod, libcolamd, libklu, libldl, librbio, libspqr, libsuitesparseconfig, libumfpack # These get calculated in __init__() # Man I can't wait until these are automatically handled by an in-Base JLLWrappers clone. @@ -35,8 +35,6 @@ librbio_handle = C_NULL librbio_path = "" libspqr_handle = C_NULL libspqr_path = "" -libsuitesparse_wrapper_handle = C_NULL -libsuitesparse_wrapper_path = "" libsuitesparseconfig_handle = C_NULL libsuitesparseconfig_path = "" libumfpack_handle = C_NULL @@ -53,7 +51,6 @@ if Sys.iswindows() const libldl = "libldl.dll" const librbio = "librbio.dll" const libspqr = "libspqr.dll" - const libsuitesparse_wrapper = "libsuitesparse_wrapper.dll" const libsuitesparseconfig = "libsuitesparseconfig.dll" const libumfpack = "libumfpack.dll" elseif Sys.isapple() @@ -67,7 +64,6 @@ elseif Sys.isapple() const libldl = "@rpath/libldl.2.dylib" const librbio = "@rpath/librbio.2.dylib" const libspqr = "@rpath/libspqr.2.dylib" - const libsuitesparse_wrapper = "@rpath/libsuitesparse_wrapper.dylib" const libsuitesparseconfig = "@rpath/libsuitesparseconfig.5.dylib" const libumfpack = "@rpath/libumfpack.5.dylib" else @@ -81,7 +77,6 @@ else const libldl = "libldl.so.2" const librbio = "librbio.so.2" const libspqr = "libspqr.so.2" - const libsuitesparse_wrapper = "libsuitesparse_wrapper.so" const libsuitesparseconfig = "libsuitesparseconfig.so.5" const libumfpack = "libumfpack.so.5" end @@ -107,15 +102,11 @@ function __init__() global librbio_path = dlpath(librbio_handle) global libspqr_handle = dlopen(libspqr) global libspqr_path = dlpath(libspqr_handle) - global libsuitesparse_wrapper_handle = dlopen(libsuitesparse_wrapper) - global libsuitesparse_wrapper_path = dlpath(libsuitesparse_wrapper_handle) global libsuitesparseconfig_handle = dlopen(libsuitesparseconfig) global libsuitesparseconfig_path = dlpath(libsuitesparseconfig_handle) global libumfpack_handle = dlopen(libumfpack) global libumfpack_path = dlpath(libumfpack_handle) global artifact_dir = dirname(Sys.BINDIR) - LIBPATH[] = dirname(libsuitesparse_wrapper_path) - push!(LIBPATH_list, LIBPATH[]) end # JLLWrappers API compatibility shims. Note that not all of these will really make sense. @@ -135,7 +126,6 @@ get_libklu_path() = libklu_path get_libldl_path() = libldl_path get_librbio_path() = librbio_path get_libspqr_path() = libspqr_path -get_libsuitesparse_wrapper_path() = libsuitesparse_wrapper_path get_libsuitesparseconfig_path() = libsuitesparseconfig_path get_libumfpack_path() = libumfpack_path diff --git a/stdlib/SuiteSparse_jll/test/runtests.jl b/stdlib/SuiteSparse_jll/test/runtests.jl index 60e5cf74d6534f..ca356951f99e22 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) == 5008 + @test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) == 5010 end