From 7cf83052598cbf296594766626f6fff01d1a7e38 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Wed, 24 Jul 2024 13:35:43 -0700
Subject: [PATCH 01/22] update tpls

---
 tpl/raja   | 2 +-
 tpl/umpire | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

From d967cbbef5df1f3d6c1214fac6e45061ff909ca0 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Thu, 25 Jul 2024 10:05:01 -0700
Subject: [PATCH 02/22] update blt version

---
 CMakeLists.txt | 2 +-
 blt            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

From 74a22f06d98d9b4899461ed14fcc64fe53765c80 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Thu, 25 Jul 2024 10:56:13 -0700
Subject: [PATCH 03/22] try to module load cmake/3.23.1

---
 .github/workflows/tutorial-docker-image.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tutorial-docker-image.yml b/.github/workflows/tutorial-docker-image.yml
index 443aec9..c74733f 100644
--- a/.github/workflows/tutorial-docker-image.yml
+++ b/.github/workflows/tutorial-docker-image.yml
@@ -31,7 +31,9 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: build docker image
-      run: docker build --build-arg njobs=2 --file containers/tutorial/Dockerfile --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest .
+      run: |
+      	   module load cmake/3.23.1
+      	   docker build --build-arg njobs=2 --file containers/tutorial/Dockerfile --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest .
 
     - name: push docker image
       if: github.event_name != 'pull_request'

From a00b37c7119fa78ebd46ad98a0abc021f5b82367 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <artvar3@yahoo.com>
Date: Thu, 25 Jul 2024 11:03:39 -0700
Subject: [PATCH 04/22] Update tutorial-docker-image.yml

---
 .github/workflows/tutorial-docker-image.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tutorial-docker-image.yml b/.github/workflows/tutorial-docker-image.yml
index c74733f..030d9f3 100644
--- a/.github/workflows/tutorial-docker-image.yml
+++ b/.github/workflows/tutorial-docker-image.yml
@@ -31,10 +31,8 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: build docker image
-      run: |
-      	   module load cmake/3.23.1
-      	   docker build --build-arg njobs=2 --file containers/tutorial/Dockerfile --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest .
-
+      run: module load cmake/3.23.1 && docker build --build-arg njobs=2 --file containers/tutorial/Dockerfile --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest .
+      
     - name: push docker image
       if: github.event_name != 'pull_request'
       run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

From 9cfee5f131c6b5b3dc2f7f10fd2167effd23298f Mon Sep 17 00:00:00 2001
From: Arturo Vargas <artvar3@yahoo.com>
Date: Thu, 25 Jul 2024 11:17:22 -0700
Subject: [PATCH 05/22] Update tutorial-docker-image.yml

---
 .github/workflows/tutorial-docker-image.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tutorial-docker-image.yml b/.github/workflows/tutorial-docker-image.yml
index 030d9f3..881d162 100644
--- a/.github/workflows/tutorial-docker-image.yml
+++ b/.github/workflows/tutorial-docker-image.yml
@@ -13,7 +13,10 @@ env:
 jobs:
 
   build:
-
+  
+  container:
+    image: kitware/cmake:3.23.1
+  
     runs-on: ubuntu-latest
 
     steps:
@@ -31,7 +34,7 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: build docker image
-      run: module load cmake/3.23.1 && docker build --build-arg njobs=2 --file containers/tutorial/Dockerfile --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest .
+      run: docker build --build-arg njobs=2 --file containers/tutorial/Dockerfile --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest .
       
     - name: push docker image
       if: github.event_name != 'pull_request'

From 680d4904757a72713cb991630862c94d4bdc3cd9 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Thu, 25 Jul 2024 11:20:00 -0700
Subject: [PATCH 06/22] update docker image

---
 .github/workflows/tutorial-docker-image.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tutorial-docker-image.yml b/.github/workflows/tutorial-docker-image.yml
index 881d162..a56d97b 100644
--- a/.github/workflows/tutorial-docker-image.yml
+++ b/.github/workflows/tutorial-docker-image.yml
@@ -13,10 +13,10 @@ env:
 jobs:
 
   build:
-  
-  container:
-    image: kitware/cmake:3.23.1
-  
+
+    container:
+        image: kitware/cmake:3.23.1
+
     runs-on: ubuntu-latest
 
     steps:
@@ -35,7 +35,7 @@ jobs:
 
     - name: build docker image
       run: docker build --build-arg njobs=2 --file containers/tutorial/Dockerfile --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest .
-      
+
     - name: push docker image
       if: github.event_name != 'pull_request'
       run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

From 14b1b7517aed2a548fd1e429e85013eb6abb0b0a Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Thu, 25 Jul 2024 13:41:41 -0700
Subject: [PATCH 07/22] update docker image

---
 .github/workflows/tutorial-docker-image.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tutorial-docker-image.yml b/.github/workflows/tutorial-docker-image.yml
index a56d97b..c715f6f 100644
--- a/.github/workflows/tutorial-docker-image.yml
+++ b/.github/workflows/tutorial-docker-image.yml
@@ -14,17 +14,21 @@ jobs:
 
   build:
 
-    container:
-        image: kitware/cmake:3.23.1
-
     runs-on: ubuntu-latest
 
+    container:
+      image: kitware/cmake:3.23.1
+
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 
+    - name: Set up CMake
+      run: |
+        cmake --version
+
     - name: Log into registry ${{ env.REGISTRY }}
       if: github.event_name != 'pull_request'
       uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c

From a0aaf3a622b933333057e72b3e2d81d4863933d9 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Fri, 2 Aug 2024 16:31:37 -0700
Subject: [PATCH 08/22] update local docker

---
 .github/workflows/tutorial-docker-image.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/tutorial-docker-image.yml b/.github/workflows/tutorial-docker-image.yml
index c715f6f..d598d93 100644
--- a/.github/workflows/tutorial-docker-image.yml
+++ b/.github/workflows/tutorial-docker-image.yml
@@ -16,9 +16,6 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    container:
-      image: kitware/cmake:3.23.1
-
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3

From c0319235eea9b2176d91af517dade372c33e33c8 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Fri, 2 Aug 2024 16:39:02 -0700
Subject: [PATCH 09/22] use a newer cmake

---
 .github/workflows/tutorial-docker-image.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/tutorial-docker-image.yml b/.github/workflows/tutorial-docker-image.yml
index d598d93..530a5d0 100644
--- a/.github/workflows/tutorial-docker-image.yml
+++ b/.github/workflows/tutorial-docker-image.yml
@@ -24,6 +24,8 @@ jobs:
 
     - name: Set up CMake
       run: |
+        apt-get update
+        apt-get install cmake
         cmake --version
 
     - name: Log into registry ${{ env.REGISTRY }}

From 4ddb93594348b43b5a2df06dd6896cfe26a96c88 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Fri, 2 Aug 2024 16:40:30 -0700
Subject: [PATCH 10/22] use sudo to update cmake

---
 .github/workflows/tutorial-docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tutorial-docker-image.yml b/.github/workflows/tutorial-docker-image.yml
index 530a5d0..2473152 100644
--- a/.github/workflows/tutorial-docker-image.yml
+++ b/.github/workflows/tutorial-docker-image.yml
@@ -24,8 +24,8 @@ jobs:
 
     - name: Set up CMake
       run: |
-        apt-get update
-        apt-get install cmake
+        sudo apt-get update
+        sudo apt-get install cmake
         cmake --version
 
     - name: Log into registry ${{ env.REGISTRY }}

From 0257a2f1198e82f6e2b0998ccae74c8299e607c9 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Fri, 2 Aug 2024 16:44:25 -0700
Subject: [PATCH 11/22] update cmake

---
 .github/workflows/tutorial-docker-image.yml | 6 ------
 containers/tutorial/Dockerfile              | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/tutorial-docker-image.yml b/.github/workflows/tutorial-docker-image.yml
index 2473152..443aec9 100644
--- a/.github/workflows/tutorial-docker-image.yml
+++ b/.github/workflows/tutorial-docker-image.yml
@@ -22,12 +22,6 @@ jobs:
       with:
         submodules: 'recursive'
 
-    - name: Set up CMake
-      run: |
-        sudo apt-get update
-        sudo apt-get install cmake
-        cmake --version
-
     - name: Log into registry ${{ env.REGISTRY }}
       if: github.event_name != 'pull_request'
       uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index aba5e0d..8b6b70a 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -11,6 +11,7 @@ ARG USER=rajadev
 ENV HOME /home/${USER}
 
 RUN apt-get update && apt-get install -y supervisor
+RUN apt-get install cmake
 RUN useradd --create-home --shell /bin/bash ${USER}
 
 WORKDIR /opt/archives

From 40daaa2bf73de2e1c9efc9d001a98f2d1ef1026e Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Fri, 2 Aug 2024 16:50:06 -0700
Subject: [PATCH 12/22] add cmake version checks

---
 containers/tutorial/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index 8b6b70a..edfb95e 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -12,6 +12,7 @@ ENV HOME /home/${USER}
 
 RUN apt-get update && apt-get install -y supervisor
 RUN apt-get install cmake
+RUN cmake --version
 RUN useradd --create-home --shell /bin/bash ${USER}
 
 WORKDIR /opt/archives
@@ -22,6 +23,7 @@ RUN tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && chown -R ${USER}:${USE
 USER ${USER}
 
 COPY --chown=rajadev:rajadev . $HOME/tutorial/
+RUN cmake --version
 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 .. \
     && make -j RAJA \

From 660a0134d0ac6deb227d8a79bc72b1219ed8ab5b Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Fri, 2 Aug 2024 17:02:47 -0700
Subject: [PATCH 13/22] use system cmake

---
 containers/tutorial/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index edfb95e..8d0105b 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -11,8 +11,8 @@ ARG USER=rajadev
 ENV HOME /home/${USER}
 
 RUN apt-get update && apt-get install -y supervisor
-RUN apt-get install cmake
-RUN cmake --version
+RUN ln -s `which cmake` system_cmake
+RUN system_cmake --version
 RUN useradd --create-home --shell /bin/bash ${USER}
 
 WORKDIR /opt/archives
@@ -23,9 +23,9 @@ RUN tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && chown -R ${USER}:${USE
 USER ${USER}
 
 COPY --chown=rajadev:rajadev . $HOME/tutorial/
-RUN cmake --version
-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 system_cmake --version
+RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && mkdir -p ${HOME}/tutorial/build && cd ${HOME}/tutorial/build
+RUN system_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 .. \
     && make -j RAJA \
     && make -j umpire
 

From 060574c86367d6f3238fff90306c5de84ba56c90 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Fri, 2 Aug 2024 17:08:48 -0700
Subject: [PATCH 14/22] remove version check for cmake

---
 containers/tutorial/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index 8d0105b..d80053b 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -12,7 +12,6 @@ ENV HOME /home/${USER}
 
 RUN apt-get update && apt-get install -y supervisor
 RUN ln -s `which cmake` system_cmake
-RUN system_cmake --version
 RUN useradd --create-home --shell /bin/bash ${USER}
 
 WORKDIR /opt/archives
@@ -23,7 +22,6 @@ RUN tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && chown -R ${USER}:${USE
 USER ${USER}
 
 COPY --chown=rajadev:rajadev . $HOME/tutorial/
-RUN system_cmake --version
 RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && mkdir -p ${HOME}/tutorial/build && cd ${HOME}/tutorial/build
 RUN system_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 .. \
     && make -j RAJA \

From 3baa974ef7249efafff3c711a5d2c01f67d2ae07 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Wed, 7 Aug 2024 11:42:44 -0700
Subject: [PATCH 15/22] update docker container to 22.04

---
 containers/tutorial/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index d80053b..4c039d5 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -5,13 +5,12 @@
 # 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:ubuntu-22.04-gcc-13 AS nvcc11
 
 ARG USER=rajadev
 ENV HOME /home/${USER}
 
 RUN apt-get update && apt-get install -y supervisor
-RUN ln -s `which cmake` system_cmake
 RUN useradd --create-home --shell /bin/bash ${USER}
 
 WORKDIR /opt/archives
@@ -22,8 +21,8 @@ RUN tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && chown -R ${USER}:${USE
 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
-RUN system_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 . /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 .. \
     && make -j RAJA \
     && make -j umpire
 

From 54ba84fb84eec87726d9dbc4f015bfb600466804 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Wed, 7 Aug 2024 13:44:47 -0700
Subject: [PATCH 16/22] add sudo

---
 containers/tutorial/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index 4c039d5..66112e4 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -10,7 +10,7 @@ FROM ghcr.io/llnl/radiuss:ubuntu-22.04-gcc-13 AS nvcc11
 ARG USER=rajadev
 ENV HOME /home/${USER}
 
-RUN apt-get update && apt-get install -y supervisor
+RUN sudo apt-get update && sudo apt-get install -y supervisor
 RUN useradd --create-home --shell /bin/bash ${USER}
 
 WORKDIR /opt/archives

From be0754d1cf07eb2c3a2cc75c637821750d7d3d93 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Wed, 7 Aug 2024 14:58:30 -0700
Subject: [PATCH 17/22] add sudo to run command

---
 containers/tutorial/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index 66112e4..7e4604f 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -11,7 +11,7 @@ ARG USER=rajadev
 ENV HOME /home/${USER}
 
 RUN sudo apt-get update && sudo apt-get install -y supervisor
-RUN useradd --create-home --shell /bin/bash ${USER}
+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 > \

From 4bab0741c9b5d6d7d423acc7e04357a0c4aabc9b Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Wed, 7 Aug 2024 15:21:44 -0700
Subject: [PATCH 18/22] use sudo -i

---
 containers/tutorial/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index 7e4604f..0cd632b 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -10,8 +10,10 @@ FROM ghcr.io/llnl/radiuss:ubuntu-22.04-gcc-13 AS nvcc11
 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}
+RUN sudo -i
+
+RUN apt-get update && apt-get install -y supervisor
+RUN 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 > \

From 94c03fadfc741f6616829f4a25b03a98747a9b34 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Wed, 7 Aug 2024 15:57:55 -0700
Subject: [PATCH 19/22] use sudo

---
 containers/tutorial/Dockerfile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index 0cd632b..09058c0 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -10,20 +10,18 @@ FROM ghcr.io/llnl/radiuss:ubuntu-22.04-gcc-13 AS nvcc11
 ARG USER=rajadev
 ENV HOME /home/${USER}
 
-RUN sudo -i
-
-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 && 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 && \
+RUN sudo . /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 .. \
     && make -j RAJA \
     && make -j umpire
@@ -31,8 +29,8 @@ RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && mkdir -p ${HOME}
 
 USER root
 ADD ./containers/tutorial/supervisord.conf /etc/supervisord.conf
-RUN sed -i "s/XXX/${USER}/g" /etc/supervisord.conf
+RUN sudo 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
+RUN sudo touch /var/log/openvscode-server.log && chown -R ${USER}:${USER} /var/log/openvscode-server.log
 
 CMD ["/usr/bin/supervisord"]

From 9d49e4fa29ad34328392665bf6a3278de154d8f9 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Thu, 8 Aug 2024 16:19:16 -0700
Subject: [PATCH 20/22] update docker container and sudo usage

---
 containers/tutorial/Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index 09058c0..e214d99 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: (BSD-3-Clause)
 ###############################################################################
 
-FROM ghcr.io/llnl/radiuss:ubuntu-22.04-gcc-13 AS nvcc11
+FROM ghcr.io/llnl/radiuss:cuda-12-3-ubuntu-22.04
 
 ARG USER=rajadev
 ENV HOME /home/${USER}
@@ -16,21 +16,21 @@ 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 && 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 sudo . /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 . /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_ARCHITECTURES=70 -DCMAKE_CUDA_FLAGS="--expt-extended-lambda" -DENABLE_OPENMP=On .. \
     && make -j RAJA \
     && make -j umpire
 
 
 USER root
 ADD ./containers/tutorial/supervisord.conf /etc/supervisord.conf
-RUN sudo sed -i "s/XXX/${USER}/g" /etc/supervisord.conf
+RUN sed -i "s/XXX/${USER}/g" /etc/supervisord.conf
 
-RUN sudo touch /var/log/openvscode-server.log && chown -R ${USER}:${USER} /var/log/openvscode-server.log
+RUN touch /var/log/openvscode-server.log && chown -R ${USER}:${USER} /var/log/openvscode-server.log
 
 CMD ["/usr/bin/supervisord"]

From 06d9233dcf44c82eb4fa035d3dcb004492d0b8cc Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Thu, 8 Aug 2024 16:30:53 -0700
Subject: [PATCH 21/22] do not use spack

---
 containers/tutorial/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index e214d99..a8ee274 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -21,7 +21,7 @@ RUN sudo tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && sudo chown -R ${U
 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 && \
+RUN  mkdir -p ${HOME}/tutorial/build && cd ${HOME}/tutorial/build && \
     cmake -DCMAKE_CXX_COMPILER=g++ -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

From 207e7bf78c4543ed544e90f1a50c5dfca2648894 Mon Sep 17 00:00:00 2001
From: Arturo Vargas <vargas45@llnl.gov>
Date: Thu, 8 Aug 2024 16:36:50 -0700
Subject: [PATCH 22/22] add cuda tool kit dir

---
 containers/tutorial/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/tutorial/Dockerfile b/containers/tutorial/Dockerfile
index a8ee274..e640ad2 100644
--- a/containers/tutorial/Dockerfile
+++ b/containers/tutorial/Dockerfile
@@ -22,7 +22,7 @@ USER ${USER}
 
 COPY --chown=rajadev:rajadev . $HOME/tutorial/
 RUN  mkdir -p ${HOME}/tutorial/build && cd ${HOME}/tutorial/build && \
-    cmake -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DBLT_CXX_STD=c++14 -DCMAKE_CUDA_ARCHITECTURES=70 -DCMAKE_CUDA_FLAGS="--expt-extended-lambda" -DENABLE_OPENMP=On .. \
+    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