From 676e16400a650b77f10a3a7b58fb3ab582fb9462 Mon Sep 17 00:00:00 2001 From: Arturo Vargas Date: Thu, 24 Jul 2025 16:42:37 -0700 Subject: [PATCH 1/3] make all --- containers/tutorial/Dockerfile | 3 ++- containers/tutorial/dockerfile | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 containers/tutorial/dockerfile diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile index 28b1b8b..c3860e9 100644 --- a/containers/tutorial/Dockerfile +++ b/containers/tutorial/Dockerfile @@ -30,7 +30,8 @@ ENV CALIPER_PATH ${HOME}/tutorial/caliper_build 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 -DRAJA_ENABLE_CALIPER=ON -Dcaliper_DIR=$CALIPER_PATH/share/cmake/caliper .. \ && make -j RAJA \ - && make -j umpire + && make -j umpire \ + && make -j USER root ADD ./containers/tutorial/supervisord.conf /etc/supervisord.conf diff --git a/containers/tutorial/dockerfile b/containers/tutorial/dockerfile new file mode 100644 index 0000000..c8eea6a --- /dev/null +++ b/containers/tutorial/dockerfile @@ -0,0 +1,41 @@ +############################################################################### +# Copyright (c) 2016-22, Lawrence Livermore National Security, LLC +# and RAJA project contributors. See the RAJA/LICENSE file for details. +# +# SPDX-License-Identifier: (BSD-3-Clause) +############################################################################### + +FROM ghcr.io/llnl/radiuss:cuda-12-3-ubuntu-22.04 + +ARG USER=rajadev +ENV HOME /home/${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 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 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 mkdir -p ${HOME}/tutorial/caliper_build && cd ${HOME}/tutorial/caliper_build && \ + cmake -DWITH_NVTX=ON -DWITH_CUPTI=ON -DCMAKE_INSTALL_PREFIX=$(pwd) ../tpl/caliper/ && make install -j + +ENV CALIPER_PATH ${HOME}/tutorial/caliper_build + +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 -DRAJA_ENABLE_CALIPER=ON -Dcaliper_DIR=$(CALIPER_PATH)/share/cmake/caliper .. \ + && make -j RAJA \ + && make -j umpire + +USER root +ADD ./containers/tutorial/supervisord.conf /etc/supervisord.conf +RUN sed -i "s/XXX/${USER}/g" /etc/supervisord.conf + +RUN touch /var/log/openvscode-server.log && chown -R ${USER}:${USER} /var/log/openvscode-server.log + +CMD ["/usr/bin/supervisord"] From 0c284d98754dd904dc234ff62971299b82219f66 Mon Sep 17 00:00:00 2001 From: Arturo Vargas Date: Thu, 24 Jul 2025 17:02:17 -0700 Subject: [PATCH 2/3] Update containers/tutorial/dockerfile Co-authored-by: Rich Hornung --- containers/tutorial/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/tutorial/dockerfile b/containers/tutorial/dockerfile index c8eea6a..e0460f1 100644 --- a/containers/tutorial/dockerfile +++ b/containers/tutorial/dockerfile @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2016-22, Lawrence Livermore National Security, LLC +# Copyright (c) 2016-25, Lawrence Livermore National Security, LLC # and RAJA project contributors. See the RAJA/LICENSE file for details. # # SPDX-License-Identifier: (BSD-3-Clause) From 5d02fffcfc94a0bedf5655a7c32aec9022268c68 Mon Sep 17 00:00:00 2001 From: Arturo Vargas Date: Thu, 24 Jul 2025 17:03:53 -0700 Subject: [PATCH 3/3] Delete containers/tutorial/dockerfile --- containers/tutorial/dockerfile | 41 ---------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 containers/tutorial/dockerfile diff --git a/containers/tutorial/dockerfile b/containers/tutorial/dockerfile deleted file mode 100644 index e0460f1..0000000 --- a/containers/tutorial/dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# Copyright (c) 2016-25, Lawrence Livermore National Security, LLC -# and RAJA project contributors. See the RAJA/LICENSE file for details. -# -# SPDX-License-Identifier: (BSD-3-Clause) -############################################################################### - -FROM ghcr.io/llnl/radiuss:cuda-12-3-ubuntu-22.04 - -ARG USER=rajadev -ENV HOME /home/${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 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 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 mkdir -p ${HOME}/tutorial/caliper_build && cd ${HOME}/tutorial/caliper_build && \ - cmake -DWITH_NVTX=ON -DWITH_CUPTI=ON -DCMAKE_INSTALL_PREFIX=$(pwd) ../tpl/caliper/ && make install -j - -ENV CALIPER_PATH ${HOME}/tutorial/caliper_build - -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 -DRAJA_ENABLE_CALIPER=ON -Dcaliper_DIR=$(CALIPER_PATH)/share/cmake/caliper .. \ - && make -j RAJA \ - && make -j umpire - -USER root -ADD ./containers/tutorial/supervisord.conf /etc/supervisord.conf -RUN sed -i "s/XXX/${USER}/g" /etc/supervisord.conf - -RUN touch /var/log/openvscode-server.log && chown -R ${USER}:${USER} /var/log/openvscode-server.log - -CMD ["/usr/bin/supervisord"]