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

Kokkos 3.1 #268

Merged
merged 7 commits into from
Apr 18, 2020
Merged

Kokkos 3.1 #268

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d178bb
Require Kokkos 3.1
aprokop Apr 16, 2020
8a89b6b
Update Dockerfiles to Kokkos 3.1
aprokop Apr 16, 2020
d9d4e6a
Use execution space in deep_copy
aprokop Apr 16, 2020
3d66e05
Update documentation to indicate Kokkos 3.1 requirement
aprokop Apr 16, 2020
744950f
Use KOKKOS_DEFAULTED_FUNCTION
masterleinad Feb 26, 2020
5cf1daf
Prefer {Details::is_device_type -> Kokkos::is_device} now that we req…
dalg24 Apr 17, 2020
200767c
Drop Details::is_device<T>
dalg24 Apr 17, 2020
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
Prev Previous commit
Next Next commit
Update Dockerfiles to Kokkos 3.1
  • Loading branch information
@aprokop
aprokop committed Apr 17, 2020
commit 8a89b6bdfcac9c25ecf80aa2728b18683d369b2c
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 @@ -127,7 +127,7 @@ RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
ENV LD_LIBRARY_PATH=/usr/local/cuda/targets/x86_64-linux/lib:${LD_LIBRARY_PATH}

# Install Kokkos
ARG KOKKOS_VERSION=3.0.00
ARG KOKKOS_VERSION=3.1.00
ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=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.pgi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
rm -rf ${SCRATCH_DIR}

# Install Kokkos
ARG KOKKOS_VERSION=3.0.00
ARG KOKKOS_VERSION=3.1.00
ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_DEPRECATED_CODE=OFF -DKokkos_ENABLE_PROFILING=OFF -DKokkos_ENABLE_LIBDL=OFF"
ENV KOKKOS_DIR=/opt/kokkos
RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
Expand Down