From eec8c44b22316cdf0da57b3415924d68376facf4 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 22 Jun 2023 17:37:30 -0400 Subject: [PATCH 1/8] trilinos 14.2 --- deal.II-toolchain/packages/trilinos.package | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package index da20432..fec9e6c 100644 --- a/deal.II-toolchain/packages/trilinos.package +++ b/deal.II-toolchain/packages/trilinos.package @@ -21,8 +21,9 @@ 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-2-0;CHECKSUM=ca08601791d1c301473a0cde6c047c2e + + # VERSION=14-0-0;CHECKSUM=24d973894e2e334c6ac9436d8b16f7cc SOURCE=https://github.com/trilinos/Trilinos/archive/ NAME=trilinos-release-${VERSION} From 3cdf3ba67722f7967ae0f7c15f3783e4933ee88e Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 22 Jun 2023 17:41:54 -0400 Subject: [PATCH 2/8] adjust config --- candi.cfg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/candi.cfg b/candi.cfg index 35db527..119d5dc 100644 --- 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 From 43ee34f1ebaf19ab3f1b52ded1f4096c4f30b798 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 23 Jun 2023 16:18:32 -0400 Subject: [PATCH 3/8] update cmake --- deal.II-toolchain/packages/cmake.package | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/deal.II-toolchain/packages/cmake.package b/deal.II-toolchain/packages/cmake.package index 813a941..d47d64a 100644 --- 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) From 0300856ac0f40349e3cb7c406ad650a3e7cf3458 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 8 Feb 2024 11:46:54 -0500 Subject: [PATCH 4/8] update to 14.4 14.4 --- deal.II-toolchain/packages/trilinos.package | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package index fec9e6c..3b4d605 100644 --- 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,7 +21,8 @@ if [ ${TRILINOS_MAJOR_VERSION} = "DEV" ];then SOURCE=https://github.com/trilinos/ elif [ ${TRILINOS_MAJOR_VERSION} = "14" ]; then - VERSION=14-2-0;CHECKSUM=ca08601791d1c301473a0cde6c047c2e + VERSION=14-4-0;CHECKSUM=334f9c3700c72f6ed5658eaa783ffccd + # VERSION=14-2-0;CHECKSUM=ca08601791d1c301473a0cde6c047c2e # VERSION=14-0-0;CHECKSUM=24d973894e2e334c6ac9436d8b16f7cc From 8ab801a758bb2c1fa8a6fb0c410ca7529394877c Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 9 Feb 2024 14:23:14 -0500 Subject: [PATCH 5/8] output details --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d3d9df4..44073f0 100644 --- 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 From 906c29738f54bd1756a3032f445224e9bd41c0e3 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 9 Feb 2024 15:12:11 -0500 Subject: [PATCH 6/8] fewer cores --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d7a9a31..a339c33 100644 --- 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 From a2f27e419d47269d4f4ea30ed226eda186646819 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 23 May 2024 15:29:01 -0400 Subject: [PATCH 7/8] enable explicit instantiations --- deal.II-toolchain/packages/trilinos.package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package index 3b4d605..84783c3 100644 --- a/deal.II-toolchain/packages/trilinos.package +++ b/deal.II-toolchain/packages/trilinos.package @@ -237,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 \ From e9b91c9964b3727e3ed16c88334c9bae5e2deb13 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 24 May 2024 17:13:56 -0400 Subject: [PATCH 8/8] fix clang 14 on OSX compilation with Trilinos 14 fix --- deal.II-toolchain/platforms/supported/macos.platform | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deal.II-toolchain/platforms/supported/macos.platform b/deal.II-toolchain/platforms/supported/macos.platform index bbf12c5..888f600 100644 --- 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