update to Kokkos 4.0.1 (#888)

* update to Kokkos 4.0.1 * Bump infrastructure to Kokkos 4.0.1 --------- Co-authored-by: Philipp Grete <[email protected]>
parthenon-hpc-lab · Jun 21, 2023 · 3596f29 · 3596f29
1 parent 40dd596
commit 3596f29
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/check-compilers.yml b/.github/workflows/check-compilers.yml
@@ -26,7 +26,7 @@ jobs:
             cmake_build_type: Debug
     runs-on: ubuntu-latest
     container:
-      image: registry.gitlab.com/pgrete/parthenon/cuda11.4.2-mpi-hdf5
+      image: ghcr.io/parthenon-hpc-lab/cuda11.6-mpi-hdf5-ascent
     env:
       CMAKE_GENERATOR: Ninja
     steps:
@@ -53,7 +53,7 @@ jobs:
         parallel: ['serial', 'mpi']
     runs-on: ubuntu-latest
     container:
-      image: registry.gitlab.com/pgrete/parthenon/rocm4.5-mpi-hdf5
+      image: ghcr.io/parthenon-hpc-lab/rocm5.4.3-mpi-hdf5
     env:
       CMAKE_GENERATOR: Ninja
     steps:

diff --git a/.github/workflows/ci-short.yml b/.github/workflows/ci-short.yml
@@ -18,7 +18,7 @@ jobs:
   style:
     runs-on: [self-hosted, A100]
     container:
-      image: registry.gitlab.com/pgrete/parthenon/cuda11.6-mpi-hdf5
+      image: ghcr.io/parthenon-hpc-lab/cuda11.6-mpi-hdf5-ascent
       # map to local user id on CI  machine to allow writing to build cache
       options: --user 1001
     steps:
@@ -43,7 +43,7 @@ jobs:
         device: ['cuda', 'host']
     runs-on: [self-hosted, A100]
     container:
-      image: registry.gitlab.com/pgrete/parthenon/cuda11.6-mpi-hdf5
+      image: ghcr.io/parthenon-hpc-lab/cuda11.6-mpi-hdf5-ascent
       # map to local user id on CI  machine to allow writing to build cache
       options: --user 1001
     steps:
@@ -73,7 +73,7 @@ jobs:
         device: ['cuda', 'host']
     runs-on: [self-hosted, A100]
     container:
-      image: registry.gitlab.com/pgrete/parthenon/cuda11.6-mpi-hdf5
+      image: ghcr.io/parthenon-hpc-lab/cuda11.6-mpi-hdf5-ascent
       # map to local user id on CI  machine to allow writing to build cache
       options: --user 1001
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [[PR 868]](https://github.com/parthenon-hpc-lab/parthenon/pull/868) Add block-local face, edge, and nodal fields and allow for packing
 
 ### Changed (changing behavior/API/variables/...)
+- [[PR 888]](https://github.com/parthenon-hpc-lab/parthenon/pull/888) Bump Kokkos submodule to 4.0.1
 - [[PR 885]](https://github.com/parthenon-hpc-lab/parthenon/pull/885) Expose PackDescriptor and use uids in SparsePacks
 
 ### Fixed (not changing behavior/API/variables/...)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -261,7 +261,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 if (NOT TARGET Kokkos::kokkos)
   if (PARTHENON_IMPORT_KOKKOS)
-    find_package(Kokkos 3)
+    find_package(Kokkos 4)
     if (NOT Kokkos_FOUND)
       unset(PARTHENON_IMPORT_KOKKOS CACHE)
       message(FATAL_ERROR "Could not find external Kokkos. Consider importing a Kokkos installation into your environment or disabling external Kokkos with e.g. -DPARTHENON_IMPORT_KOKKOS=OFF")

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Parthenon -- a performance portable block-structured adaptive mesh refinement fr
 
 * CMake 3.16 or greater
 * C++17 compatible compiler
-* Kokkos 3.6 or greater
+* Kokkos 4.0.1 or greater
 
 ## Optional (enabling features)
 

diff --git a/external/Kokkos b/external/Kokkos
diff --git a/scripts/docker/Dockerfile.hip-rocm b/scripts/docker/Dockerfile.hip-rocm
@@ -1,4 +1,4 @@
-FROM rocm/dev-ubuntu-20.04:4.5
+FROM rocm/dev-ubuntu-20.04:5.4.3
 
 RUN apt-get clean && apt-get update -y && \
     DEBIAN_FRONTEND="noninteractive" TZ=America/New_York apt-get install -y --no-install-recommends git python3-minimal libpython3-stdlib bc hwloc wget openssh-client python3-numpy python3-h5py python3-matplotlib lcov curl cmake ninja-build openmpi-bin libopenmpi-dev && \