Merge pull request #7 from Pressio/6-update-trilinos

6: update trilinos containers
Pressio · Dec 10, 2024 · d83a365 · d83a365
2 parents 0dd9f1b + af0e7fb
commit d83a365
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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'}

diff --git 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 \