Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SuiteSparse] Update to 7.5.0 #7931

Merged
merged 1 commit into from
Jan 11, 2024
Merged

[SuiteSparse] Update to 7.5.0 #7931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions S/SuiteSparse/SuiteSparse@7/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,25 @@
include("../common.jl")

name = "SuiteSparse"
version = v"7.4.0"
version = v"7.5.0"

sources = suitesparse_sources(version)

sources = suitesparse_sources(version)
push!(sources, DirectorySource("./bundled"))

# Bash recipe for building across all platforms
script = raw"""
cd $WORKSPACE/srcdir/SuiteSparse

# Needs cmake >= 3.22 provided by jll
apk del cmake

# Apply upstream patch to fix BLAS calls (backported from 7.5.0 dev branch)
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/blas_suffix.patch

# Disable OpenMP as it will probably interfere with blas threads and Julia threads
FLAGS+=(INSTALL="${prefix}" INSTALL_LIB="${libdir}" INSTALL_INCLUDE="${prefix}/include" CFOPENMP=)

BLAS_NAME=blastrampoline
if [[ "${target}" == *-mingw* ]]; then
BLAS_NAME=blastrampoline-5
BLAS_LIB=${BLAS_NAME}-5
else
BLAS_NAME=blastrampoline
BLAS_LIB=${BLAS_NAME}
fi

if [[ ${bb_full_target} == *-sanitize+memory* ]]; then
Expand Down Expand Up @@ -58,11 +53,11 @@ cmake -DCMAKE_BUILD_TYPE=Release \
-DSUITESPARSE_USE_OPENMP=OFF \
-DCHOLMOD_PARTITION=ON \
-DBLAS_FOUND=1 \
-DBLAS_LIBRARIES="${libdir}/lib${BLAS_NAME}.${dlext}" \
-DBLAS_LINKER_FLAGS="${BLAS_NAME}" \
-DBLAS_LIBRARIES="${libdir}/lib${BLAS_LIB}.${dlext}" \
-DBLAS_LINKER_FLAGS="${BLAS_LIB}" \
-DBLA_VENDOR="${BLAS_NAME}" \
-DLAPACK_LIBRARIES="${libdir}/lib${BLAS_NAME}.${dlext}" \
-DLAPACK_LINKER_FLAGS="${BLAS_NAME}" \
-DLAPACK_LIBRARIES="${libdir}/lib${BLAS_LIB}.${dlext}" \
-DLAPACK_LINKER_FLAGS="${BLAS_LIB}" \
"${CMAKE_OPTIONS[@]}" \
.
make -j${nproc}
Expand Down
40 changes: 0 additions & 40 deletions S/SuiteSparse/SuiteSparse@7/bundled/patches/blas_suffix.patch
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions S/SuiteSparse/common.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ function suitesparse_sources(version::VersionNumber; kwargs...)
v"7.4.0" => [
GitSource("https://github.com/DrTimothyAldenDavis/SuiteSparse.git",
"df91d7be262e6b5cddf5dd23ff42dec1713e7947")
],
v"7.5.0" => [
GitSource("https://github.com/DrTimothyAldenDavis/SuiteSparse.git",
"da5050cd3f6b6a15ec4d7c42b2c1e2dfe4f8ef6e")
]
)
return Any[
Expand Down