Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update to Kokkos 4.0.1 #888

Merged
merged 4 commits into from
Jun 21, 2023
Merged

update to Kokkos 4.0.1 #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4e5758
update to Kokkos 4.0.1
BenWibking Jun 13, 2023
ab8db0c
Merge branch 'develop' into kokkos-4
BenWibking Jun 13, 2023
8f48485
Merge branch 'develop' into kokkos-4
pgrete Jun 21, 2023
7e25720
Bump infrastructure to Kokkos 4.0.1
pgrete Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/check-compilers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-short.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/...)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion external/Kokkos
Open in desktop
Submodule Kokkos updated 1139 files
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile.hip-rocm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down