Skip to content

Update kokkos min to 4.1 #738

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

Merged
streeve merged 6 commits into from
Feb 13, 2024
Merged

Update kokkos min to 4.1 #738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ef48b5
update kokkos min to 4.1
kwitaechong Feb 5, 2024
83eb558
fixup: bump HIP CI to rocm 5.2 for Kokkos 4.1
streeve Feb 9, 2024
09f172a
fixup: remove outdated Kokkos math namespace in test
streeve Feb 9, 2024
b751e06
fixup: use recent ArborX release in jenkins CI
streeve Feb 9, 2024
bb6011d
fixup: use binning for now in unmanaged memory ex
streeve Feb 9, 2024
22feee5
fixup: unmanaged example print
streeve Feb 9, 2024
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
46 changes: 23 additions & 23 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
cxx: ['g++', 'clang++']
backend: ['OPENMP', 'SERIAL']
cmake_build_type: ['Debug', 'Release']
kokkos_ver: ['3.7.02']
kokkos_ver: ['4.1.00']
bounds_check: ['OFF']
arborx: ['OFF']
heffte: ['OFF' ]
Expand All @@ -42,7 +42,7 @@ jobs:
cxx: 'g++'
backend: 'THREADS'
cmake_build_type: 'Debug'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -52,7 +52,7 @@ jobs:
cxx: 'icpx'
backend: 'OPENMP'
cmake_build_type: 'Release'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -61,7 +61,7 @@ jobs:
cxx: 'icpx'
backend: 'OPENMP'
cmake_build_type: 'Debug'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -70,7 +70,7 @@ jobs:
cxx: 'icpx'
backend: 'SERIAL'
cmake_build_type: 'Release'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -79,7 +79,7 @@ jobs:
cxx: 'icpx'
backend: 'SERIAL'
cmake_build_type: 'Debug'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -88,7 +88,7 @@ jobs:
cxx: 'icpx'
backend: 'SERIAL'
cmake_build_type: 'Debug'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'MKL'
hypre: 'OFF'
Expand All @@ -98,7 +98,7 @@ jobs:
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Release'
kokkos_ver: '4.0.00'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -109,7 +109,7 @@ jobs:
cxx: 'clang++'
backend: 'OPENMP'
cmake_build_type: 'Release'
kokkos_ver: '4.0.00'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -118,7 +118,7 @@ jobs:
cxx: 'g++'
cmake_build_type: 'Release'
backend: 'OPENMP'
kokkos_ver: '4.0.00'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -127,7 +127,7 @@ jobs:
cxx: 'clang++'
backend: 'OPENMP'
cmake_build_type: 'Release'
kokkos_ver: '4.0.00'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -137,7 +137,7 @@ jobs:
cxx: 'g++'
cmake_build_type: 'Release'
backend: 'OPENMP'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -146,7 +146,7 @@ jobs:
cxx: 'clang++'
backend: 'OPENMP'
cmake_build_type: 'Release'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -155,7 +155,7 @@ jobs:
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Debug'
kokkos_ver: '4.0.00'
kokkos_ver: '4.1.00'
arborx: 'ArborX'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -164,7 +164,7 @@ jobs:
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Release'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'ArborX'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -173,7 +173,7 @@ jobs:
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Release'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'FFTW'
hypre: 'OFF'
Expand All @@ -182,7 +182,7 @@ jobs:
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Release'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -192,7 +192,7 @@ jobs:
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Debug'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'HYPRE'
Expand All @@ -201,7 +201,7 @@ jobs:
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Debug'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -211,7 +211,7 @@ jobs:
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Debug'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'OFF'
heffte: 'OFF'
hypre: 'OFF'
Expand All @@ -221,7 +221,7 @@ jobs:
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Debug'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'ArborX'
heffte: 'FFTW'
hypre: 'HYPRE'
Expand All @@ -234,7 +234,7 @@ jobs:
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Debug'
kokkos_ver: '3.7.02'
kokkos_ver: '4.1.00'
arborx: 'ArborX'
heffte: 'FFTW'
hypre: 'HYPRE'
Expand Down Expand Up @@ -568,7 +568,7 @@ jobs:
matrix:
cxx: ['nvcc']
cmake_build_type: ['Release']
kokkos_ver: ['3.7.02']
kokkos_ver: ['4.1.00']
runs-on: ubuntu-20.04
container: ghcr.io/ecp-copa/ci-containers/cuda:12.2.0
steps:
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 @@ -36,7 +36,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
# Dependencies
#------------------------------------------------------------------------------#
# find kokkos
find_package(Kokkos 3.7 REQUIRED)
find_package(Kokkos 4.1 REQUIRED)

# set supported kokkos devices
set(CABANA_SUPPORTED_DEVICES SERIAL THREADS OPENMP CUDA HIP SYCL OPENMPTARGET)
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ RUN OPENMPI_VERSION=4.0.2 && \
ENV PATH=${OPENMPI_DIR}/bin:$PATH

# Install Kokkos
ARG KOKKOS_VERSION=3.7.02
ARG KOKKOS_VERSION=4.1.00
ENV KOKKOS_DIR=/opt/kokkos
RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
KOKKOS_ARCHIVE=kokkos-${KOKKOS_VERSION}.tar.gz && \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.hipcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ RUN OPENMPI_VERSION=4.0.4 && \
ENV PATH=${OPENMPI_DIR}/bin:$PATH

# Install Kokkos
ARG KOKKOS_VERSION=3.7.02
ARG KOKKOS_VERSION=4.1.00
ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_HIP=ON -DKokkos_ENABLE_LIBDL=OFF -DKokkos_ARCH_VEGA906=ON"
ENV KOKKOS_DIR=/opt/kokkos
RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.sycl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN wget https://cloud.cees.ornl.gov/download/oneapi-for-nvidia-gpus-${DPCPP_VER
rm oneapi-for-nvidia-gpus-${DPCPP_VERSION}-linux.sh

# Install Kokkos
ARG KOKKOS_VERSION=3.7.02
ARG KOKKOS_VERSION=4.1.00
ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SYCL=ON -DCMAKE_CXX_FLAGS=-Wno-unknown-cuda-version -DKokkos_ENABLE_UNSUPPORTED_ARCHS=ON -DKokkos_ARCH_VOLTA70=ON -DCMAKE_CXX_STANDARD=17"
ENV KOKKOS_DIR=/opt/kokkos
RUN . /opt/intel/oneapi/setvars.sh --include-intel-llvm && \
Expand Down