Merge pull request #5634 from jmgate/num-kokkos-devices

Set KOKKOS_NUM_DEVICES in ATDM Environment Scripts
trilinos · Aug 5, 2019 · b0e068f · b0e068f
2 parents 3401d93 + e4fd7f9
commit b0e068f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/cmake/std/atdm/ride/environment.sh b/cmake/std/atdm/ride/environment.sh
@@ -190,6 +190,7 @@ elif [[ "$ATDM_CONFIG_COMPILER" == "CUDA-9.2_GNU-7.2.0" ]] ; then
   export ATDM_CONFIG_USE_CUDA=ON
   export CUDA_LAUNCH_BLOCKING=1
   export CUDA_MANAGED_FORCE_DEVICE_ALLOC=1
+  export KOKKOS_NUM_DEVICES=2
   export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=8
   # ABove avoids timeouts due to not running on separate GPUs (see #2446)
 
@@ -208,6 +209,7 @@ elif [[ "$ATDM_CONFIG_COMPILER" == "CUDA-10.1_GNU-7.2.0" ]] ; then
   export ATDM_CONFIG_USE_CUDA=ON
   export CUDA_LAUNCH_BLOCKING=1
   export CUDA_MANAGED_FORCE_DEVICE_ALLOC=1
+  export KOKKOS_NUM_DEVICES=2
   export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=8
   # ABove avoids timeouts due to not running on separate GPUs (see #2446)
 

diff --git a/cmake/std/atdm/sems-rhel7/environment.sh b/cmake/std/atdm/sems-rhel7/environment.sh
@@ -190,6 +190,7 @@ elif [[ "$ATDM_CONFIG_COMPILER" == "CUDA-9.2" ]] ; then
   # some Trilinos tests require this to run correctly
   export CUDA_LAUNCH_BLOCKING=1
   export CUDA_MANAGED_FORCE_DEVICE_ALLOC=1
+  export KOKKOS_NUM_DEVICES=2
 else
   echo
   echo "***"

diff --git a/cmake/std/atdm/shiller/environment.sh b/cmake/std/atdm/shiller/environment.sh
@@ -79,6 +79,7 @@ elif [[ "$ATDM_CONFIG_COMPILER" == "CUDA"* && "$ATDM_CONFIG_KOKKOS_ARCH" == "Kep
   export ATDM_CONFIG_USE_CUDA=ON
   export CUDA_LAUNCH_BLOCKING=1
   export CUDA_MANAGED_FORCE_DEVICE_ALLOC=1
+  export KOKKOS_NUM_DEVICES=2
   export ATDM_CONFIG_LAPACK_LIBS="-L${LAPACK_ROOT}/lib;-llapack;-lgfortran"
   export ATDM_CONFIG_BLAS_LIBS="-L${BLAS_ROOT}/lib;-lblas;-lgfortran"
   export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=8

diff --git a/cmake/std/atdm/waterman/environment.sh b/cmake/std/atdm/waterman/environment.sh
@@ -118,6 +118,7 @@ elif [[ "$ATDM_CONFIG_COMPILER" == "CUDA"* ]] ; then
   export ATDM_CONFIG_USE_CUDA=ON
   export CUDA_LAUNCH_BLOCKING=1
   export CUDA_MANAGED_FORCE_DEVICE_ALLOC=1
+  export KOKKOS_NUM_DEVICES=2
   export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=8
   # Avoids timeouts due to not running on separate GPUs (see #2446)
 else