Skip to content

Commit

Permalink
Merge pull request #2376 from dweindl/release_0.23.1
Browse files Browse the repository at this point in the history
Release 0.23.1
  • Loading branch information
dweindl committed Mar 11, 2024
2 parents 815a50d + 81ec111 commit 4d40911
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## v0.X Series

### v0.23.1 (2024-03-11)

* Fixes installation issues related to building SuiteSparse on some systems
by @dweindl in https://github.com/AMICI-dev/AMICI/pull/2375

### v0.23.0 (2024-03-07)

**Features**
Expand Down
10 changes: 10 additions & 0 deletions python/sdist/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def get_extensions():
# Used by all extensions
global_cmake_configure_options = [
"-DCMAKE_VERBOSE_MAKEFILE=ON",
f"-DCMAKE_MODULE_PATH={prefix_path.as_posix()}",
]

# SuiteSparse Config
Expand All @@ -51,6 +52,7 @@ def get_extensions():
cmake_configure_options=[
*global_cmake_configure_options,
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
"-DBUILD_SHARED_LIBS=OFF",
# Building SuiteSparse_config does not require a BLAS
# we just set BLAS_LIBRARIES to skip the search,
# the value is not used
Expand All @@ -68,6 +70,8 @@ def get_extensions():
source_dir="amici/ThirdParty/SuiteSparse/AMD",
cmake_configure_options=[
*global_cmake_configure_options,
"-DBUILD_SHARED_LIBS=OFF",
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
"-DSUITESPARSE_USE_FORTRAN=OFF",
],
)
Expand All @@ -79,6 +83,8 @@ def get_extensions():
cmake_configure_options=[
*global_cmake_configure_options,
"-DSUITESPARSE_USE_FORTRAN=OFF",
"-DBUILD_SHARED_LIBS=OFF",
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
],
)
# SuiteSparse COLAMD
Expand All @@ -89,6 +95,8 @@ def get_extensions():
cmake_configure_options=[
*global_cmake_configure_options,
"-DSUITESPARSE_USE_FORTRAN=OFF",
"-DBUILD_SHARED_LIBS=OFF",
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
],
)
# SuiteSparse KLU
Expand All @@ -101,6 +109,8 @@ def get_extensions():
"-DKLU_USE_CHOLMOD=OFF",
"-DSUITESPARSE_USE_CUDA=OFF",
"-DSUITESPARSE_USE_FORTRAN=OFF",
"-DBUILD_SHARED_LIBS=OFF",
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
],
)
# SUNDIALS
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.23.0
0.23.1

0 comments on commit 4d40911

Please sign in to comment.