Update to trilinos-13.0.0

GEOS-DEV · Aug 26, 2020 · d1ee89f · d1ee89f
1 parent 125a328
commit d1ee89f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -614,7 +614,7 @@ list(APPEND build_list pugixml )
 ################################
 if (ENABLE_TRILINOS)
     set(TRILINOS_DIR "${CMAKE_INSTALL_PREFIX}/trilinos")
-    set(TRILINOS_URL "${TPL_MIRROR_DIR}/trilinos-release-12-18-1.tar.gz")
+    set(TRILINOS_URL "${TPL_MIRROR_DIR}/trilinos-release-13-0-0.tar.gz")
 
     message(STATUS "Building TRILINOS found at ${TRILINOS_URL}")
 
@@ -662,8 +662,30 @@ if (ENABLE_TRILINOS)
     endif()
 
     if( ENABLE_CUDA )
-      set( TRILINOS_CXX_FLAGS "${TRILINOS_CXX_FLAGS} -ccbin ${TRILINOS_CXX_COMPILER} -arch=${CUDA_ARCH} --expt-extended-lambda --expt-relaxed-constexpr" )
+      set( TRILINOS_CXX_FLAGS "${TRILINOS_CXX_FLAGS} -ccbin ${TRILINOS_CXX_COMPILER} --expt-extended-lambda --expt-relaxed-constexpr" )
       set( TRILINOS_CXX_COMPILER ${CMAKE_CURRENT_BINARY_DIR}/trilinos/src/trilinos/packages/kokkos/bin/nvcc_wrapper )
+
+      # Handle Kokkos_ARCH settings
+      set( _KOKKOS_ARCH_sm_30 Kepler30 )
+      set( _KOKKOS_ARCH_sm_32 Kepler32 )
+      set( _KOKKOS_ARCH_sm_35 Kepler35 )
+      set( _KOKKOS_ARCH_sm_37 Kepler37 )
+      set( _KOKKOS_ARCH_sm_50 Maxwell50 )
+      set( _KOKKOS_ARCH_sm_52 Maxwell52 )
+      set( _KOKKOS_ARCH_sm_53 Maxwell53 )
+      set( _KOKKOS_ARCH_sm_60 Pascal60 )
+      set( _KOKKOS_ARCH_sm_61 Pascal61 )
+      set( _KOKKOS_ARCH_sm_70 Volta70 )
+      set( _KOKKOS_ARCH_sm_72 Volta72 )
+      set( _KOKKOS_ARCH_sm_75 Turing75 )
+
+      if( NOT DEFINED _KOKKOS_ARCH_${CUDA_ARCH} )
+        message(FATAL_ERROR "Unable to determine Kokkos_ARCH from CUDA_ARCH=${CUDA_ARCH}")
+      endif()
+      set( KOKKOS_ARCH ${_KOKKOS_ARCH_${CUDA_ARCH}} )
+      set( TRILINOS_EXTRA_ARGS ${TRILINOS_EXTRA_ARGS}
+                               -D Kokkos_ARCH_${KOKKOS_ARCH}:BOOL=ON )
+
     endif()
 
     set( TRILINOS_ENABLE_SERIAL ON )
@@ -722,9 +744,9 @@ if (ENABLE_TRILINOS)
                                     -D Trilinos_ENABLE_TrilinosCouplings:BOOL=OFF
                                     -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON
                                     -D Trilinos_ENABLE_COMPLEX_DOUBLE:BOOL=OFF
-                                    -D KOKKOS_ENABLE_CUDA:BOOL=${ENABLE_CUDA}
-                                    -D KOKKOS_ENABLE_CUDA_LAMBDA:BOOL=${ENABLE_CUDA}
-                                    -D KOKKOS_ENABLE_CUDA_UVM:BOOL=${ENABLE_CUDA}
+                                    -D Kokkos_ENABLE_CUDA:BOOL=${ENABLE_CUDA}
+                                    -D Kokkos_ENABLE_CUDA_LAMBDA:BOOL=${ENABLE_CUDA}
+                                    -D Kokkos_ENABLE_CUDA_UVM:BOOL=${ENABLE_CUDA}
                                     -D Tpetra_ENABLE_CUDA:BOOL=${ENABLE_CUDA}
                                     -D Tpetra_INST_SERIAL:BOOL=${TRILINOS_ENABLE_SERIAL}
                                     -D Tpetra_INST_INT_LONG_LONG:BOOL=ON
@@ -734,7 +756,7 @@ if (ENABLE_TRILINOS)
                                     -D Belos_ENABLE_Tpetra:BOOL=ON
                                     -D Belos_ENABLE_Epetra:BOOL=OFF
                                     -D Belos_ENABLE_Xpetra:BOOL=OFF
-                                    -D Ifpack2_ENABLE_ThyraTpetraAdapters:BOOL=OFF
+                                    -D Ifpack2_ENABLE_ThyraTpetraAdapters:BOOL=ON
                                     -D Amesos2_ENABLE_TIMERS:BOOL=ON
                                     ${TRILINOS_EXTRA_ARGS}
                         )

diff --git a/tplMirror/trilinos-release-12-18-1.tar.gz b/tplMirror/trilinos-release-12-18-1.tar.gz
diff --git a/tplMirror/trilinos-release-13-0-0.tar.gz b/tplMirror/trilinos-release-13-0-0.tar.gz