Compare commits

..

No commits in common. "rawhide" and "master" have entirely different histories.

10 changed files with 446 additions and 741 deletions

8
.gitignore vendored
View File

@ -14,11 +14,3 @@ sundials-2.3.0.tar.gz
/sundials-3.2.0.tar.gz
/sundials-3.2.1.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

View File

@ -1 +1 @@
SHA512 (sundials-6.5.1.tar.gz) = c68fa7bd5e228739f08f2c328b3e45866ce43e5d9156e98254cf81c6fe7bfc89882a9fff6445e35df5c09cb56364711138de9258fcf4b53dfe70251bf7003196
SHA512 (sundials-4.1.0.tar.gz) = 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0

View File

@ -0,0 +1,11 @@
--- 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)

View File

@ -0,0 +1,11 @@
--- 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)

View File

@ -1,11 +0,0 @@
--- 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})

View File

@ -1,11 +0,0 @@
--- 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})

View File

@ -1,11 +0,0 @@
--- 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.")

View File

@ -0,0 +1,75 @@
--- 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

View File

@ -1,39 +0,0 @@
--- 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 "")

File diff suppressed because it is too large Load Diff