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

sundials: add v7.1.1, v6.7.0, v5.8.0, add optional deps, fix CMake names #21664

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

sundials: add v7.1.1, v6.7.0, v5.8.0, add optional deps, fix CMake names #21664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ff1309b
sundials: add v6.6.2, v5.8.0
valgur Dec 6, 2023
48f7e37
sundials: add new lib, rmdir lib/cmake
valgur Dec 6, 2023
c46c105
sundials: bump to v6.7.0
valgur Dec 21, 2023
fe66f12
sundials: fix_apple_shared_install_name()
valgur Jan 7, 2024
bae21db
sundials: set CMP0077 for older versions
valgur Jul 31, 2024
2a029d5
Merge remote-tracking branch 'refs/remotes/upstream/master' into upda…
valgur Jul 31, 2024
0b0047c
sundials: add a comment for the v5 v6 test split
valgur Jul 31, 2024
07ba8e5
sundials: add v7.1.1
valgur Jul 31, 2024
a753224
sundials: add lib suffix on v7 on Windows
valgur Aug 7, 2024
7059af4
sundials: add optional deps, improve components
valgur Sep 11, 2024
c9beef8
sundials: restore old component names in < v5.8.0
valgur Sep 11, 2024
b010c8b
Merge remote-tracking branch 'upstream/master' into update/sundials
valgur Sep 11, 2024
cb21384
sundials: fix import
valgur Sep 11, 2024
8aea036
sundials: avoid a Fortran compiler requirement
valgur Sep 16, 2024
6dfb7ba
sunidals: fix cross-compilation
valgur Oct 16, 2024
7514a10
Use openblas/0.3.28 for cross-compilation support
valgur Nov 11, 2024
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
9 changes: 9 additions & 0 deletions recipes/sundials/all/conan-cuda-support.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
find_dependency(CUDAToolkit REQUIRED)

target_link_libraries(SUNDIALS::nveccuda INTERFACE CUDA::cudart)
if(TARGET SUNDIALS::sunmatrixcusparse)
target_link_libraries(SUNDIALS::sunmatrixcusparse INTERFACE CUDA::cusparse)
endif()
if(TARGET SUNDIALS::sunlinsolcusolversp)
target_link_libraries(SUNDIALS::sunlinsolcusolversp INTERFACE CUDA::cusolver)
endif()
9 changes: 9 additions & 0 deletions recipes/sundials/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
sources:
"7.1.1":
url: "https://github.com/LLNL/sundials/releases/download/v7.1.1/sundials-7.1.1.tar.gz"
sha256: "ea7d6edfb52448ddfdc1ec48f89a721fe6c0a259c10f8ef56f60fcded87a94bb"
"6.7.0":
url: "https://github.com/LLNL/sundials/releases/download/v6.7.0/sundials-6.7.0.tar.gz"
sha256: "5f113a1564a9d2d98ff95249f4871a4c815a05dbb9b8866a82b13ab158c37adb"
"5.8.0":
url: "https://github.com/LLNL/sundials/releases/download/v5.8.0/sundials-5.8.0.tar.gz"
sha256: "d4ed403351f72434d347df592da6c91a69452071860525385b3339c824e8a213"
"5.4.0":
url: "https://github.com/LLNL/sundials/releases/download/v5.4.0/sundials-5.4.0.tar.gz"
sha256: "a60ba8155ca12261cf7623efcf9fd4232e95bcfefe480993ef71324176cb395b"
Expand Down
314 changes: 256 additions & 58 deletions recipes/sundials/all/conanfile.py
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions recipes/sundials/all/test_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.15)
project(test_package LANGUAGES C)

find_package(sundials REQUIRED CONFIG)
find_package(SUNDIALS REQUIRED CONFIG)

add_executable(${PROJECT_NAME} test_package.c)
# SUNDIALS v6.0.0 introduced a new SUNContext object on which all other SUNDIALS objects depend
# and is not backwards compatible.
if(SUNDIALS_VERSION GREATER_EQUAL 6)
add_executable(${PROJECT_NAME} test_package_v6.c)
else()
add_executable(${PROJECT_NAME} test_package_v5.c)
endif()
target_link_libraries(${PROJECT_NAME} PRIVATE sundials::sundials)
2 changes: 1 addition & 1 deletion .../sundials/all/test_package/test_package.c → ...ndials/all/test_package/test_package_v5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ int main()
SUNMatrix A = SUNDenseMatrix(1, 1);
SUNLinearSolver LS = SUNLinSol_Dense(y, A);

N_Vector v = N_VNew_Serial(1);;
N_Vector v = N_VNew_Serial(1);
N_VScale(2.0, y, v);
return 0;
}
18 changes: 18 additions & 0 deletions recipes/sundials/all/test_package/test_package_v6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#include <nvector/nvector_serial.h>
perseoGI marked this conversation as resolved.
Show resolved Hide resolved
#include <sunmatrix/sunmatrix_dense.h>
#include <sunlinsol/sunlinsol_dense.h>
#include <sundials/sundials_types.h>

int main()
{
SUNContext sunctx;
SUNContext_Create(0, &sunctx);
N_Vector y = N_VNew_Serial(1, sunctx);
NV_DATA_S(y)[0] = 2.0;
SUNMatrix A = SUNDenseMatrix(1, 1, sunctx);
SUNLinearSolver LS = SUNLinSol_Dense(y, A, sunctx);

N_Vector v = N_VNew_Serial(1, sunctx);
N_VScale(2.0, y, v);
return 0;
}
6 changes: 6 additions & 0 deletions recipes/sundials/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
versions:
"7.1.1":
folder: all
"6.7.0":
folder: all
"5.8.0":
folder: all
"5.4.0":
folder: all
"5.3.0":
Expand Down