From a5e0a6905c1a8472c524501c7c776bb6bd0a21b1 Mon Sep 17 00:00:00 2001 From: Caleb Schilly Date: Fri, 6 Dec 2024 09:15:43 -0500 Subject: [PATCH 1/2] 6: update trilinos containers --- .github/workflows/ci-docker.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index e74d6df..2b18941 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -21,9 +21,8 @@ jobs: - {dockerfile: 'fedora-gnu', compiler-version: '13', tag: 'latest'} # - {dockerfile: 'intel-oneapi', compiler-version: 'latest'} - {dockerfile: 'ubuntu-clang', compiler-version: '14', tag: 'latest'} - - {dockerfile: 'ubuntu-gnu-trilinos', compiler-version: '11', tag: 'ef73d14'} - - {dockerfile: 'ubuntu-gnu-trilinos', compiler-version: '11', tag: '702aac5'} - - {dockerfile: 'ubuntu-gnu-trilinos', compiler-version: '11', tag: 'trilinos-release-14-4-0'} + - {dockerfile: 'ubuntu-gnu-trilinos', compiler-version: '11', tag: '0dc4553'} + - {dockerfile: 'ubuntu-gnu-trilinos', compiler-version: '11', tag: '5bbda25'} - {dockerfile: 'ubuntu-gnu', compiler-version: '11', tag: 'latest'} - {dockerfile: 'ubuntu-gnu-kokkos-cpu-openmp', compiler-version: '11', tag: 'latest'} - {dockerfile: 'ubuntu-gnu-kokkos-cpu-serial', compiler-version: '11', tag: 'latest'} From af0e7fbe8b03e322f30b0cafe15c862bf414794f Mon Sep 17 00:00:00 2001 From: Caleb Schilly Date: Fri, 6 Dec 2024 10:35:54 -0500 Subject: [PATCH 2/2] #6: try enabling deprecated code --- docker_scripts/ubuntu-gnu-trilinos.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_scripts/ubuntu-gnu-trilinos.dockerfile b/docker_scripts/ubuntu-gnu-trilinos.dockerfile index 3e31c47..1b76db9 100644 --- a/docker_scripts/ubuntu-gnu-trilinos.dockerfile +++ b/docker_scripts/ubuntu-gnu-trilinos.dockerfile @@ -81,7 +81,7 @@ RUN cmake -B Trilinos/builddir \ -D Trilinos_ENABLE_Teuchos:BOOL=ON \ -D Trilinos_ENABLE_Epetra:BOOL=ON \ -D Trilinos_ENABLE_Tpetra:BOOL=ON \ - -D Tpetra_ENABLE_DEPRECATED_CODE:BOOL=OFF \ + -D Tpetra_ENABLE_DEPRECATED_CODE:BOOL=ON \ -D Tpetra_ENABLE_TSQR:BOOL=ON \ -D Trilinos_ENABLE_EpetraExt:BOOL=ON \ -D Trilinos_ENABLE_AztecOO:BOOL=ON \