Merge pull request #350 from tjhei/tril-14-2

trilinos 14.4
dealii · May 26, 2024 · 993c089 · 993c089
2 parents 6c453eb + e9b91c9
commit 993c089
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -103,4 +103,4 @@ jobs:
           echo 'DEAL_II_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg
 
           ./candi.sh -j 2 --packages="once:p4est once:petsc dealii"
-          cd ~/dealii-candi/tmp/build/deal.II-* && cat detailed.log
+          cd ~/dealii-candi/tmp/build/deal.II-* && cat detailed.log && ctest --output-on-failure -j 2
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -56,7 +56,7 @@ pipeline
 	# Ubuntu 20.04 only ships cmake 3.16 not 3.17:
 	echo 'PACKAGES="once:cmake ${PACKAGES}"' > local.cfg
 	rm -rf $WORKSPACE/install
-        ./candi.sh -j 10 -p $WORKSPACE/install
+        ./candi.sh -j 8 -p $WORKSPACE/install
         cp $WORKSPACE/install/tmp/build/deal.II-*/detailed.log detailed-ubuntu2004.log
         '''
 	archiveArtifacts artifacts: 'detailed-ubuntu2004.log', fingerprint: true
@@ -87,7 +87,7 @@ pipeline
 	cmake --version
 	rm -f local.cfg
 	rm -rf $WORKSPACE/install/
-        ./candi.sh -j 10 -p $WORKSPACE/install
+        ./candi.sh -j 8 -p $WORKSPACE/install
         cp $WORKSPACE/install/tmp/build/deal.II-*/detailed.log detailed-ubuntu2204.log
         '''
 	archiveArtifacts artifacts: 'detailed-ubuntu2204.log', fingerprint: true

diff --git a/candi.cfg b/candi.cfg
@@ -98,8 +98,10 @@ DEAL_II_VERSION=v9.5.2
 
 #########################################################################
 
-# If you want to use Trilinos, decide if you want v12.x.x (AUTO) or v11.x.x
+# If you want to use Trilinos, decide which major version to use
 TRILINOS_MAJOR_VERSION=AUTO
+#TRILINOS_MAJOR_VERSION=14
+#TRILINOS_MAJOR_VERSION=13
 #TRILINOS_MAJOR_VERSION=12
 #TRILINOS_MAJOR_VERSION=11
 

diff --git a/deal.II-toolchain/packages/cmake.package b/deal.II-toolchain/packages/cmake.package
@@ -1,5 +1,5 @@
-MAJOR=3.20
-MINOR=5
+MAJOR=3.26
+MINOR=4
 VERSION=${MAJOR}.${MINOR}
 
 if [ -z ${CANDI_CMAKE_LOAD_TARBALL} ]; then
@@ -15,13 +15,15 @@ if [ ${CANDI_CMAKE_LOAD_TARBALL} = ON ] && [ ${PLATFORM_OSTYPE} == "linux" ]; th
     # tarball install
     NAME=cmake-${VERSION}-linux-x86_64
     PACKING=.tar.gz
-    CHECKSUM=3adc4d6ab87b8d3b46fb5fe98612dd84 # 3.20.5 tarball linux
+    CHECKSUM=ac6d7ce3cad61c5c5a021ababbe3bd17 # 3.26.4 tarball linux
+    #CHECKSUM=3adc4d6ab87b8d3b46fb5fe98612dd84 # 3.20.5 tarball linux
     BUILDCHAIN=ignore
 else
     # configure/make/install
     NAME=cmake-${VERSION}
     PACKING=.tar.gz
-    CHECKSUM=137311bbe83d9a32469f99ac2792a2bc # 3.20.5 src
+    CHECKSUM=9095556a3b268fd88c995d2bb4c90320 # 3.26.4 src
+    #CHECKSUM=137311bbe83d9a32469f99ac2792a2bc # 3.20.5 src
 
     if builtin command -v cmake > /dev/null; then
         # configure/make with cmake (older or newer version already installed)    

diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package
@@ -7,7 +7,7 @@ if [ -z "${TRILINOS_MAJOR_VERSION}" ]; then
 fi
 
 if [ ${TRILINOS_MAJOR_VERSION} = "AUTO" ]; then
-    TRILINOS_MAJOR_VERSION="13"
+    TRILINOS_MAJOR_VERSION="14"
 fi
 
 if [ ${TRILINOS_MAJOR_VERSION} = "DEV" ];then
@@ -21,8 +21,10 @@ if [ ${TRILINOS_MAJOR_VERSION} = "DEV" ];then
     SOURCE=https://github.com/trilinos/
 elif [ ${TRILINOS_MAJOR_VERSION} = "14" ]; then
 
-    VERSION=14-0-0
-    CHECKSUM=24d973894e2e334c6ac9436d8b16f7cc
+    VERSION=14-4-0;CHECKSUM=334f9c3700c72f6ed5658eaa783ffccd
+    # VERSION=14-2-0;CHECKSUM=ca08601791d1c301473a0cde6c047c2e
+
+    # VERSION=14-0-0;CHECKSUM=24d973894e2e334c6ac9436d8b16f7cc
 
     SOURCE=https://github.com/trilinos/Trilinos/archive/
     NAME=trilinos-release-${VERSION}
@@ -235,7 +237,7 @@ CONFOPTS="\
   -D Trilinos_ENABLE_OpenMP:BOOL=OFF \
   -D TPL_ENABLE_TBB:BOOL=OFF \
   -D Trilinos_VERBOSE_CONFIGURE:BOOL=OFF \
-  -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION=OFF \
+  -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION=ON \
   -D Trilinos_ENABLE_FLOAT=ON \
   -D Trilinos_ENABLE_Amesos:BOOL=ON \
   -D Trilinos_ENABLE_Epetra:BOOL=ON \

diff --git a/deal.II-toolchain/platforms/supported/macos.platform b/deal.II-toolchain/platforms/supported/macos.platform
@@ -54,4 +54,7 @@ if [ "$(machine)" = "arm64e" ]; then
   # disable this for now.
   TRILINOS_WITH_SEACAS=OFF
 
+  # Trilinos defaults to c++17 while deal.II 9.5 defaults to c++14 with clang 14,
+  # which then fails to compile when including Kokkos coming from Trilinos:
+  DEAL_II_CONFOPTS="-DCMAKE_CXX_STANDARD=17 ${DEAL_II_CONFOPTS}"
 fi