diff --git a/CMakeLists.txt b/CMakeLists.txt index 49d50ed..071bde9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.19) +cmake_minimum_required(VERSION 3.23.1) project(RajaSuiteTutorial LANGUAGES C CXX) diff --git a/blt b/blt index 84fe0d1..9ff7734 160000 --- a/blt +++ b/blt @@ -1 +1 @@ -Subproject commit 84fe0d15d841a79d923e97a9105b86b59147bfed +Subproject commit 9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35 diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile index aba5e0d..e640ad2 100644 --- a/containers/tutorial/Dockerfile +++ b/containers/tutorial/Dockerfile @@ -5,24 +5,24 @@ # SPDX-License-Identifier: (BSD-3-Clause) ############################################################################### -FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 AS nvcc11 +FROM ghcr.io/llnl/radiuss:cuda-12-3-ubuntu-22.04 ARG USER=rajadev ENV HOME /home/${USER} -RUN apt-get update && apt-get install -y supervisor -RUN useradd --create-home --shell /bin/bash ${USER} +RUN sudo apt-get update && sudo apt-get install -y supervisor +RUN sudo useradd --create-home --shell /bin/bash ${USER} WORKDIR /opt/archives -RUN curl -L https://github.com/gitpod-io/openvscode-server/releases/download/openvscode-server-v1.69.1/openvscode-server-v1.69.1-linux-x64.tar.gz > \ +RUN sudo curl -L https://github.com/gitpod-io/openvscode-server/releases/download/openvscode-server-v1.69.1/openvscode-server-v1.69.1-linux-x64.tar.gz > \ /opt/archives/openvscode-server-v1.69.1-linux-x64.tar.gz -RUN tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && chown -R ${USER}:${USER} openvscode-server-v1.69.1-linux-x64 +RUN sudo tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && sudo chown -R ${USER}:${USER} openvscode-server-v1.69.1-linux-x64 USER ${USER} COPY --chown=rajadev:rajadev . $HOME/tutorial/ -RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && mkdir -p ${HOME}/tutorial/build && cd ${HOME}/tutorial/build && \ - cmake -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DBLT_CXX_STD=c++14 -DCMAKE_CUDA_STANDARD=14 -DCMAKE_CUDA_ARCHITECTURES=70 -DCMAKE_CUDA_FLAGS="--expt-extended-lambda" -DENABLE_OPENMP=On .. \ +RUN mkdir -p ${HOME}/tutorial/build && cd ${HOME}/tutorial/build && \ + cmake -DCMAKE_CXX_COMPILER=g++ -DCUDAToolkit_ROOT=/usr/local/cuda-12.3 -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-12.3 -DCMAKE_CUDA_COMPILER=/usr/local/cuda-12.3/bin/nvcc -DENABLE_CUDA=On -DBLT_CXX_STD=c++14 -DCMAKE_CUDA_ARCHITECTURES=70 -DCMAKE_CUDA_FLAGS="--expt-extended-lambda" -DENABLE_OPENMP=On .. \ && make -j RAJA \ && make -j umpire diff --git a/tpl/raja b/tpl/raja index e330b25..4d7fcba 160000 --- a/tpl/raja +++ b/tpl/raja @@ -1 +1 @@ -Subproject commit e330b2560747d5417cd7bd265fab3fb91d32ecbd +Subproject commit 4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1 diff --git a/tpl/umpire b/tpl/umpire index 1e5ef60..e04e0ca 160000 --- a/tpl/umpire +++ b/tpl/umpire @@ -1 +1 @@ -Subproject commit 1e5ef604de88e81bb3b6fc4a5d914be833529da5 +Subproject commit e04e0caa7e23f3e2da9513901f18c9eacc6b6f31