From 359600460f3dcbf7082c8cc074271f9bab8bcf99 Mon Sep 17 00:00:00 2001 From: Jerry Watkins Date: Mon, 1 Apr 2024 17:07:49 -0600 Subject: [PATCH] Revert "Replace Kokkos_ENABLE_CUDA_UVM with new flags" This reverts commit 4ea3c760debc63d623ef7ec3b4f64c1afbd82ed9. These flags are not working and our weaver nightlies haven't been using them anyways (the script needs to be manually copied to project space). See https://github.com/sandialabs/Albany/issues/1025 --- .../perlmutter-p1.nersc.gov/cuda-uvm/do-cmake-pm_gpu-trilinos | 3 +-- doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/dashboards/perlmutter-p1.nersc.gov/cuda-uvm/do-cmake-pm_gpu-trilinos b/doc/dashboards/perlmutter-p1.nersc.gov/cuda-uvm/do-cmake-pm_gpu-trilinos index 9b65fbbfa2..cd04363128 100644 --- a/doc/dashboards/perlmutter-p1.nersc.gov/cuda-uvm/do-cmake-pm_gpu-trilinos +++ b/doc/dashboards/perlmutter-p1.nersc.gov/cuda-uvm/do-cmake-pm_gpu-trilinos @@ -60,8 +60,7 @@ cmake \ \ -D Kokkos_ENABLE_CUDA:BOOL=ON \ -D Kokkos_ENABLE_CUDA_LAMBDA:BOOL=ON \ - -D KokkosKernels_INST_MEMSPACE_CUDAUVMSPACE=ON \ - -D Tpetra_ALLOCATE_IN_SHARED_SPACE=ON \ + -D Kokkos_ENABLE_CUDA_UVM:BOOL=ON \ -D Kokkos_ENABLE_EXAMPLES:BOOL=OFF \ -D Trilinos_ENABLE_Epetra:BOOL=OFF \ -D Trilinos_ENABLE_EpetraExt:BOOL=OFF \ diff --git a/doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos b/doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos index 77b7d5bfa5..1a9679cba4 100644 --- a/doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos +++ b/doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos @@ -36,8 +36,7 @@ cmake \ -D Trilinos_VERBOSE_CONFIGURE:BOOL=OFF \ -D Trilinos_WARNINGS_AS_ERRORS_FLAGS:STRING='' \ -D Kokkos_ENABLE_CUDA:BOOL=ON \ - -D KokkosKernels_INST_MEMSPACE_CUDAUVMSPACE=ON \ - -D Tpetra_ALLOCATE_IN_SHARED_SPACE=ON \ + -D Kokkos_ENABLE_CUDA_UVM:BOOL=ON \ -D Kokkos_ENABLE_EXAMPLES:BOOL=OFF \ -D Kokkos_ENABLE_OPENMP:BOOL=OFF \ -D Kokkos_ENABLE_PTHREAD:BOOL=OFF \