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

bump SUNDIALS submodule to v6.7.0 (blocked by CAMP not supporting SUNDIALS >= 6) #343

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

bump SUNDIALS submodule to v6.7.0 (blocked by CAMP not supporting SUNDIALS >= 6) #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbdf659
bump SUNDIALS submodule to v6.7.0
slayoo Feb 27, 2024
e614aea
minimal pyproject.toml
slayoo Feb 27, 2024
c15db3a
making SUNDIALS CMake logic compatible with v6.7.0
slayoo Feb 27, 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
10 changes: 6 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
####################################################################################################

cmake_minimum_required(VERSION 3.8) # CXX17
include(CheckCSourceCompiles)
include(CheckCXXSourceCompiles)
include(CheckFunctionExists)
include(CheckFortranCompilerFlag)
include(CheckFunctionExists)

file(GLOB mods RELATIVE ${CMAKE_SOURCE_DIR} gitmodules/*)
foreach(mod ${mods})
Expand Down Expand Up @@ -284,6 +289,7 @@ endfunction()
scoped_sundials_setup_config()

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SUNDIALS_SOURCE_DIR}/cmake)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SUNDIALS_SOURCE_DIR}/cmake/tpl)
include(${SUNDIALS_SOURCE_DIR}/cmake/SundialsSetupCompilers.cmake)

foreach(item cvode;sunmatrix;sunlinsol;sunnonlinsol;nvector;sundials;sunlinsol/klu)
Expand Down Expand Up @@ -335,7 +341,6 @@ string(CONCAT cmd
" or '_T TRUE)' in line"
"]))"
)
include(CheckFunctionExists)
execute_process(
COMMAND ${PYTHON_EXECUTABLE} "-c" "${cmd}"
INPUT_FILE ${CMAKE_SOURCE_DIR}/gitmodules/netcdf-c/CMakeLists.txt
Expand Down Expand Up @@ -392,7 +397,6 @@ target_compile_options(netcdf_clib PRIVATE

### netCDF-FORTRAN #################################################################################

include(CheckFortranCompilerFlag)
add_library(netcdf_flib STATIC ${netcdf_f_SOURCES})
target_link_libraries(netcdf_flib PRIVATE netcdf_clib)
target_compile_definitions(netcdf_flib PRIVATE
Expand Down Expand Up @@ -437,7 +441,6 @@ string(CONCAT
"import sys;"
"print(''.join([f'#define {line.split()[3]} {line.split()[5]}\\n' for line in sys.stdin if 'parameter ::' in line]))"
)
include(CheckFunctionExists)
foreach(file aero_data;gas_data;output)
execute_process(
COMMAND ${PYTHON_EXECUTABLE} "-c" "${cmd}"
Expand Down Expand Up @@ -505,7 +508,6 @@ foreach(target _PyPartMC)
)
endforeach()
target_compile_definitions(_PyPartMC PRIVATE PMC_USE_SUNDIALS="1")
include(CheckCXXSourceCompiles)
file(GLOB PyPartMC_headers ${CMAKE_SOURCE_DIR}/src/*.hpp)
if (NOT "${CMAKE_REQUIRED_INCLUDES}" STREQUAL "")
message("CMAKE_REQUIRED_INCLUDES not empty! (${CMAKE_REQUIRED_INCLUDES})")
Expand Down
2 changes: 1 addition & 1 deletion gitmodules/sundials
Open in desktop
Submodule sundials updated 3262 files
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[tool.setuptools_scm]
Loading