Compare commits
89 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
57d472b531 | ||
|
a22013fb60 | ||
|
3bdc8bb899 | ||
|
0a73bde27c | ||
|
91a778238c | ||
|
c8db4a03d4 | ||
|
270533a0d2 | ||
|
41c60a31ef | ||
|
a4d78f230b | ||
|
81d6d5dcb5 | ||
|
a7e8a6a26f | ||
|
600714480a | ||
|
88587460d0 | ||
|
9c24deea51 | ||
|
e67341840b | ||
|
b9a2d883e3 | ||
|
b966147d50 | ||
|
472311b48a | ||
|
070e8fc604 | ||
|
2e71ab7d55 | ||
|
13bcc3677b | ||
|
55f4198ea8 | ||
|
c3b2ca7f44 | ||
|
1c0917332c | ||
|
6a25f4c837 | ||
|
4f166ae910 | ||
|
a95bca9e69 | ||
|
ce265c0fb9 | ||
|
583d756d0a | ||
|
ad02605f50 | ||
|
640081595d | ||
|
59d564c711 | ||
|
23b30e5243 | ||
|
d6f6eadc14 | ||
|
eb73682272 | ||
|
04cc633018 | ||
|
c1b727b690 | ||
|
f67662f3d3 | ||
|
0734b3d1d6 | ||
|
b14b8816a7 | ||
|
00d0cc281b | ||
|
2f6bea5d2b | ||
|
51eaed3729 | ||
|
272a325265 | ||
|
ff0fbf959f | ||
|
4c17b4b9a1 | ||
|
a530f8393c | ||
|
3c848f3475 | ||
|
3af99bab57 | ||
|
4375191f47 | ||
|
0adf07d3b2 | ||
|
136038d45a | ||
|
c46e59166c | ||
|
5480dd72cb | ||
|
dceb33bcd2 | ||
|
f9f2d365af | ||
|
65f6318915 | ||
|
9d0e2bdf45 | ||
|
610f7c09b2 | ||
|
4a68f5e5e5 | ||
|
180f85767e | ||
|
c258f2826d | ||
|
7360740200 | ||
|
2715d8ff38 | ||
|
5b687ed2c4 | ||
|
580f7dec54 | ||
|
32d1d3ce90 | ||
|
01990a10f1 | ||
|
673e6fb527 | ||
|
7ec7c12f26 | ||
|
e2708de39d | ||
|
f413557c53 | ||
|
10f9a9025d | ||
|
077e622582 | ||
|
727a0141a6 | ||
|
4be4205224 | ||
|
799c1d3b79 | ||
|
2b4006bfe8 | ||
|
31b3afe859 | ||
|
2824c4566d | ||
|
250d313041 | ||
|
e17f8059ea | ||
|
5386e3b733 | ||
|
fd2f047b34 | ||
|
5bb7b2dd1a | ||
|
afcdc98824 | ||
|
0e0cf4e8b5 | ||
|
cca7c6a2c8 | ||
|
98f080c001 |
8
.gitignore
vendored
8
.gitignore
vendored
@ -14,3 +14,11 @@ sundials-2.3.0.tar.gz
|
|||||||
/sundials-3.2.0.tar.gz
|
/sundials-3.2.0.tar.gz
|
||||||
/sundials-3.2.1.tar.gz
|
/sundials-3.2.1.tar.gz
|
||||||
/sundials-4.1.0.tar.gz
|
/sundials-4.1.0.tar.gz
|
||||||
|
/sundials-5.2.0.tar.gz
|
||||||
|
/sundials-5.3.0.tar.gz
|
||||||
|
/sundials-5.4.0.tar.gz
|
||||||
|
/sundials-5.5.0.tar.gz
|
||||||
|
/sundials-5.6.1.tar.gz
|
||||||
|
/sundials-5.7.0.tar.gz
|
||||||
|
/sundials-5.8.0.tar.gz
|
||||||
|
/sundials-6.5.1.tar.gz
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (sundials-4.1.0.tar.gz) = 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
|
SHA512 (sundials-6.5.1.tar.gz) = c68fa7bd5e228739f08f2c328b3e45866ce43e5d9156e98254cf81c6fe7bfc89882a9fff6445e35df5c09cb56364711138de9258fcf4b53dfe70251bf7003196
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
--- config/FindSUPERLUMT.orig.cmake 2016-09-27 00:16:47.000000000 +0200
|
|
||||||
+++ config/FindSUPERLUMT.cmake 2016-10-04 12:08:58.202988791 +0200
|
|
||||||
@@ -44,7 +44,7 @@
|
|
||||||
set(SUPERLUMT_LIBRARY_DIR ${SUPERLUMT_LIBRARY_DIR} CACHE PATH "" FORCE)
|
|
||||||
else()
|
|
||||||
# find library with user provided directory path
|
|
||||||
- set(SUPERLUMT_LIBRARY_NAME superlu_mt_${POST})
|
|
||||||
+ set(SUPERLUMT_LIBRARY_NAME superlumt64_d)
|
|
||||||
find_library(SUPERLUMT_LIBRARY ${SUPERLUMT_LIBRARY_NAME} ${SUPERLUMT_LIBRARY_DIR} NO_DEFAULT_PATH)
|
|
||||||
endif()
|
|
||||||
mark_as_advanced(SUPERLUMT_LIBRARY)
|
|
@ -1,11 +0,0 @@
|
|||||||
--- config/FindSUPERLUMT.orig.cmake 2016-09-27 00:16:47.000000000 +0200
|
|
||||||
+++ config/FindSUPERLUMT.cmake 2016-10-04 12:08:58.202988791 +0200
|
|
||||||
@@ -44,7 +44,7 @@
|
|
||||||
set(SUPERLUMT_LIBRARY_DIR ${SUPERLUMT_LIBRARY_DIR} CACHE PATH "" FORCE)
|
|
||||||
else()
|
|
||||||
# find library with user provided directory path
|
|
||||||
- set(SUPERLUMT_LIBRARY_NAME superlu_mt_${POST})
|
|
||||||
+ set(SUPERLUMT_LIBRARY_NAME superlumt_d)
|
|
||||||
find_library(SUPERLUMT_LIBRARY ${SUPERLUMT_LIBRARY_NAME} ${SUPERLUMT_LIBRARY_DIR} NO_DEFAULT_PATH)
|
|
||||||
endif()
|
|
||||||
mark_as_advanced(SUPERLUMT_LIBRARY)
|
|
11
sundials-5.5.0-set_superlumt64_name.patch
Normal file
11
sundials-5.5.0-set_superlumt64_name.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- cmake/tpl/FindSUPERLUMT.orig.cmake 2020-11-02 17:28:15.000000000 +0100
|
||||||
|
+++ cmake/tpl/FindSUPERLUMT.cmake 2020-11-08 16:58:46.599284747 +0100
|
||||||
|
@@ -62,7 +62,7 @@
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Set SuperLU_MT library name with thread type postfix
|
||||||
|
-set(SUPERLUMT_LIBRARY_NAME superlu_mt_${SUPERLUMT_THREAD_TYPE})
|
||||||
|
+set(SUPERLUMT_LIBRARY_NAME superlumt64_d)
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
set(CMAKE_FIND_LIBRARY_PREFIXES lib ${CMAKE_FIND_LIBRARY_PREFIXES})
|
11
sundials-5.5.0-set_superlumt_name.patch
Normal file
11
sundials-5.5.0-set_superlumt_name.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- cmake/tpl/FindSUPERLUMT.orig.cmake 2020-11-02 17:28:15.000000000 +0100
|
||||||
|
+++ cmake/tpl/FindSUPERLUMT.cmake 2020-11-08 16:58:46.599284747 +0100
|
||||||
|
@@ -62,7 +62,7 @@
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Set SuperLU_MT library name with thread type postfix
|
||||||
|
-set(SUPERLUMT_LIBRARY_NAME superlu_mt_${SUPERLUMT_THREAD_TYPE})
|
||||||
|
+set(SUPERLUMT_LIBRARY_NAME superlumt_d)
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
set(CMAKE_FIND_LIBRARY_PREFIXES lib ${CMAKE_FIND_LIBRARY_PREFIXES})
|
11
sundials-change_petsc_variable.patch
Normal file
11
sundials-change_petsc_variable.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- a/config/FindPETSC.orig.cmake 2019-10-22 01:10:24.000000000 +0200
|
||||||
|
+++ b/config/FindPETSC.cmake 2019-10-26 15:50:39.747116576 +0200
|
||||||
|
@@ -478,7 +478,7 @@
|
||||||
|
|
||||||
|
include (FindPackageHandleStandardArgs)
|
||||||
|
find_package_handle_standard_args (PETSC
|
||||||
|
- REQUIRED_VARS PETSC_INCLUDES PETSC_LIBRARIES PETSC_EXECUTABLE_RUNS
|
||||||
|
+ REQUIRED_VARS PETSC_INCLUDES PETSC_LIBRARIES
|
||||||
|
VERSION_VAR PETSC_VERSION
|
||||||
|
FAIL_MESSAGE "PETSC could not be found. Be sure to set PETSC_DIR and PETSC_ARCH.")
|
||||||
|
|
@ -1,75 +0,0 @@
|
|||||||
--- a/config/SundialsPETSc.cmake
|
|
||||||
+++ b/config/SundialsPETSc.cmake
|
|
||||||
@@ -25,49 +25,4 @@
|
|
||||||
# set PETSC_LIBRARIES
|
|
||||||
include(FindPETSc)
|
|
||||||
|
|
||||||
-# If we have the PETSC libraries, test them
|
|
||||||
-if(PETSC_LIBRARIES)
|
|
||||||
- message(STATUS "Looking for PETSc libraries...")
|
|
||||||
- # Create the PETSCTest directory
|
|
||||||
- set(PETSCTest_DIR ${PROJECT_BINARY_DIR}/PETSCTest)
|
|
||||||
- file(MAKE_DIRECTORY ${PETSCTest_DIR})
|
|
||||||
- # Create a CMakeLists.txt file
|
|
||||||
- file(WRITE ${PETSCTest_DIR}/CMakeLists.txt
|
|
||||||
- "CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)\n"
|
|
||||||
- "PROJECT(ltest C)\n"
|
|
||||||
- "SET(CMAKE_VERBOSE_MAKEFILE ON)\n"
|
|
||||||
- "SET(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\")\n"
|
|
||||||
- "SET(CMAKE_C_COMPILER ${MPI_C_COMPILER})\n"
|
|
||||||
- "SET(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS}\")\n"
|
|
||||||
- "SET(CMAKE_C_FLAGS_RELEASE \"${CMAKE_C_FLAGS_RELEASE}\")\n"
|
|
||||||
- "SET(CMAKE_C_FLAGS_DEBUG \"${CMAKE_C_FLAGS_DEBUG}\")\n"
|
|
||||||
- "SET(CMAKE_C_FLAGS_RELWITHDEBUGINFO \"${CMAKE_C_FLAGS_RELWITHDEBUGINFO}\")\n"
|
|
||||||
- "SET(CMAKE_C_FLAGS_MINSIZE \"${CMAKE_C_FLAGS_MINSIZE}\")\n"
|
|
||||||
- "INCLUDE_DIRECTORIES(${PETSC_INCLUDE_DIR})\n"
|
|
||||||
- "ADD_EXECUTABLE(ltest ltest.c)\n"
|
|
||||||
- "TARGET_LINK_LIBRARIES(ltest ${PETSC_LIBRARIES})\n")
|
|
||||||
- # Create a C source file which calls a PETSC function
|
|
||||||
- file(WRITE ${PETSCTest_DIR}/ltest.c
|
|
||||||
- "\#include \"petscvec.h\"\n"
|
|
||||||
- "int main(){\n"
|
|
||||||
- "Vec x;\n"
|
|
||||||
- "VecCreate(PETSC_COMM_WORLD, &x);\n"
|
|
||||||
- "return(0);\n"
|
|
||||||
- "}\n")
|
|
||||||
- # Attempt to link the "ltest" executable
|
|
||||||
- try_compile(LTEST_OK ${PETSCTest_DIR} ${PETSCTest_DIR} ltest OUTPUT_VARIABLE MY_OUTPUT)
|
|
||||||
-
|
|
||||||
- # To ensure we do not use stuff from the previous attempts,
|
|
||||||
- # we must remove the CMakeFiles directory.
|
|
||||||
- file(REMOVE_RECURSE ${PETSCTest_DIR}/CMakeFiles)
|
|
||||||
- # Process test result
|
|
||||||
- if(LTEST_OK)
|
|
||||||
- message(STATUS "Checking if PETSc works... OK")
|
|
||||||
- set(PETSC_FOUND TRUE)
|
|
||||||
- else(LTEST_OK)
|
|
||||||
- message(STATUS "Checking if PETSc works... FAILED")
|
|
||||||
- endif(LTEST_OK)
|
|
||||||
-else(PETSC_LIBRARIES)
|
|
||||||
- PRINT_WARNING("PETSC LIBRARIES NOT Found. Please check library path" "${PETSC_LIBRARY_DIR} ")
|
|
||||||
- message(STATUS "Looking for PETSc libraries... FAILED")
|
|
||||||
-endif(PETSC_LIBRARIES)
|
|
||||||
+set(PETSC_FOUND TRUE)
|
|
||||||
--- a/examples/ida/petsc/CMakeLists.txt
|
|
||||||
+++ b/examples/ida/petsc/CMakeLists.txt
|
|
||||||
@@ -19,8 +19,6 @@
|
|
||||||
|
|
||||||
# Examples using SUNDIALS linear solvers
|
|
||||||
SET(IDA_examples
|
|
||||||
- #"idaHeat2D_jac_petsc\;1\;4" # Not to be released in 2.7.0
|
|
||||||
- "idaHeat2D_kry_petsc\;1\;4\;develop"
|
|
||||||
)
|
|
||||||
|
|
||||||
IF(MPI_C_COMPILER)
|
|
||||||
--- a/examples/nvector/petsc/CMakeLists.txt
|
|
||||||
+++ b/examples/nvector/petsc/CMakeLists.txt
|
|
||||||
@@ -19,8 +19,6 @@
|
|
||||||
|
|
||||||
# Examples using SUNDIALS PETSc nvector
|
|
||||||
SET(nvector_petsc_examples
|
|
||||||
- "test_nvector_petsc\;1000 0\;\;\;" # run sequentially
|
|
||||||
- "test_nvector_petsc\;1000 0\;1\;4\;" # run 4 procs
|
|
||||||
)
|
|
||||||
|
|
||||||
# Dependencies for nvector examples
|
|
39
sundials-klu64.patch
Normal file
39
sundials-klu64.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
--- a/cmake/tpl/FindKLU.orig.cmake 2021-09-30 21:05:25.000000000 +0200
|
||||||
|
+++ b/cmake/tpl/FindKLU.cmake 2023-03-03 21:28:45.354177379 +0100
|
||||||
|
@@ -54,31 +54,31 @@
|
||||||
|
|
||||||
|
else ()
|
||||||
|
# find library with user provided directory path
|
||||||
|
- set(KLU_LIBRARY_NAME klu)
|
||||||
|
+ set(KLU_LIBRARY_NAME klu64)
|
||||||
|
find_library(KLU_LIBRARY ${KLU_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH)
|
||||||
|
endif ()
|
||||||
|
mark_as_advanced(KLU_LIBRARY)
|
||||||
|
|
||||||
|
if (NOT AMD_LIBRARY)
|
||||||
|
- set(AMD_LIBRARY_NAME amd)
|
||||||
|
+ set(AMD_LIBRARY_NAME amd64)
|
||||||
|
find_library(AMD_LIBRARY ${AMD_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH)
|
||||||
|
mark_as_advanced(AMD_LIBRARY)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
if (NOT COLAMD_LIBRARY)
|
||||||
|
- set(COLAMD_LIBRARY_NAME colamd)
|
||||||
|
+ set(COLAMD_LIBRARY_NAME colamd64)
|
||||||
|
find_library(COLAMD_LIBRARY ${COLAMD_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH)
|
||||||
|
mark_as_advanced(COLAMD_LIBRARY)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
if (NOT BTF_LIBRARY)
|
||||||
|
- set(BTF_LIBRARY_NAME btf)
|
||||||
|
+ set(BTF_LIBRARY_NAME btf64)
|
||||||
|
find_library( BTF_LIBRARY ${BTF_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH)
|
||||||
|
mark_as_advanced(BTF_LIBRARY)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
if (NOT SUITESPARSECONFIG_LIBRARY)
|
||||||
|
- set(SUITESPARSECONFIG_LIBRARY_NAME suitesparseconfig)
|
||||||
|
+ set(SUITESPARSECONFIG_LIBRARY_NAME suitesparseconfig64)
|
||||||
|
# NOTE: no prefix for this library on windows
|
||||||
|
if(WIN32 AND NOT MSYS)
|
||||||
|
set(CMAKE_FIND_LIBRARY_PREFIXES "")
|
1006
sundials.spec
1006
sundials.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user