From fe74f7adb6fadd4be424f5bcb78b069e2605841b Mon Sep 17 00:00:00 2001 From: Brian Han Date: Tue, 25 Jun 2024 14:06:20 -0700 Subject: [PATCH 1/5] Update required dependencies versions --- .../spack/configs/docker/ubuntu20_cuda/spack.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml index 83b34e5150..e17bb18952 100644 --- a/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml +++ b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml @@ -166,22 +166,22 @@ spack: caliper: require: "@2.10.0~kokkos" camp: - require: "@2023.06.0" + require: "@2024.02.0" conduit: - require: "@0.8.8~shared~test~examples~utilities" + require: "@0.9.1~shared~test~examples~utilities" hdf5: variants: ~shared~mpi hypre: version: [2.24.0] # do shared mfem to allow PIC flag in mfem mfem: - require: "@4.5.2+shared~static" + require: "@4.6.0" raja: - require: "@2023.06.0~shared~examples~exercises" + require: "@2024.02.0~shared~examples~exercises" scr: - require: "@develop~shared" + require: "@3.0.1~shared~tests~examples" umpire: - require: "@2023.06.0~shared~examples" + require: "@2024.02.0~shared~examples~werror" # Globally lock in version of devtools cmake: From 396a034a3a928c5a371bd9ad196b5fa21d4080b9 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Tue, 25 Jun 2024 14:41:44 -0700 Subject: [PATCH 2/5] Try to update cmake version to appease conduit constraint --- scripts/docker/dockerfile_gcc-9_cuda-11 | 8 ++++++++ scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 263aa44a63..952f1139a2 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -29,6 +29,14 @@ RUN tar xzf openvscode-server-v1.69.1-linux-x64.tar.gz && chown -R ${USER}:${USE WORKDIR ${HOME} USER ${USER} +# Install CMake +RUN wget -q --no-check-certificate https://cmake.org/files/v3.21/cmake-3.21.7-linux-x86_64.tar.gz && \ + tar -xzf cmake-3.21.7-linux-x86_64.tar.gz && \ + rm -r cmake-3.21.7-linux-x86_64/share/vim/vimfiles && \ + cp -fR cmake-3.21.7-linux-x86_64/* /usr && \ + rm -rf cmake-3.21.7-linux-x86_64 && \ + rm cmake-3.21.7-linux-x86_64.tar.gz + # Clone axom at axom_repo directory RUN git clone --recursive --branch $branch https://github.com/LLNL/axom.git axom_repo diff --git a/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml index e17bb18952..4d74dbd358 100644 --- a/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml +++ b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml @@ -185,11 +185,11 @@ spack: # Globally lock in version of devtools cmake: - version: [3.20.4] + version: [3.21.7] buildable: false externals: - - spec: cmake@3.20.4 - prefix: /opt/view + - spec: cmake@3.21.7 + prefix: /usr doxygen: version: [1.8.17] buildable: false From cccf3ebe815ad565367a2e83e128836db4edb7ed Mon Sep 17 00:00:00 2001 From: Brian Han Date: Tue, 25 Jun 2024 14:59:19 -0700 Subject: [PATCH 3/5] Use root privilege for wget --- scripts/docker/dockerfile_gcc-9_cuda-11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 952f1139a2..cabb410c53 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -30,7 +30,7 @@ WORKDIR ${HOME} USER ${USER} # Install CMake -RUN wget -q --no-check-certificate https://cmake.org/files/v3.21/cmake-3.21.7-linux-x86_64.tar.gz && \ +RUN sudo wget -q --no-check-certificate https://cmake.org/files/v3.21/cmake-3.21.7-linux-x86_64.tar.gz && \ tar -xzf cmake-3.21.7-linux-x86_64.tar.gz && \ rm -r cmake-3.21.7-linux-x86_64/share/vim/vimfiles && \ cp -fR cmake-3.21.7-linux-x86_64/* /usr && \ From dd6a3c1a46bc42cfea1cbbca13f95a2dfbf664fd Mon Sep 17 00:00:00 2001 From: Brian Han Date: Tue, 25 Jun 2024 15:15:21 -0700 Subject: [PATCH 4/5] Move cmake command to dev user --- scripts/docker/dockerfile_gcc-9_cuda-11 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index cabb410c53..66547340cd 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -21,14 +21,6 @@ RUN sudo apt-get install -y supervisor RUN sudo useradd --create-home --shell /bin/bash ${USER} RUN sudo apt-get install doxygen elfutils gfortran graphviz language-pack-en-base less libopenblas-dev libomp-dev mpich python3-sphinx ssh texlive-full tree -fy -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 > \ - /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 - -WORKDIR ${HOME} -USER ${USER} - # Install CMake RUN sudo wget -q --no-check-certificate https://cmake.org/files/v3.21/cmake-3.21.7-linux-x86_64.tar.gz && \ tar -xzf cmake-3.21.7-linux-x86_64.tar.gz && \ @@ -37,6 +29,14 @@ RUN sudo wget -q --no-check-certificate https://cmake.org/files/v3.21/cmake-3.21 rm -rf cmake-3.21.7-linux-x86_64 && \ rm cmake-3.21.7-linux-x86_64.tar.gz +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 > \ + /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 + +WORKDIR ${HOME} +USER ${USER} + # Clone axom at axom_repo directory RUN git clone --recursive --branch $branch https://github.com/LLNL/axom.git axom_repo From 8c8be4b81e3154816494974602a1c1f93d467046 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Wed, 26 Jun 2024 09:23:09 -0700 Subject: [PATCH 5/5] Try without sudo --- scripts/docker/dockerfile_gcc-9_cuda-11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11 index 66547340cd..8ac006f24b 100644 --- a/scripts/docker/dockerfile_gcc-9_cuda-11 +++ b/scripts/docker/dockerfile_gcc-9_cuda-11 @@ -22,7 +22,7 @@ RUN sudo useradd --create-home --shell /bin/bash ${USER} RUN sudo apt-get install doxygen elfutils gfortran graphviz language-pack-en-base less libopenblas-dev libomp-dev mpich python3-sphinx ssh texlive-full tree -fy # Install CMake -RUN sudo wget -q --no-check-certificate https://cmake.org/files/v3.21/cmake-3.21.7-linux-x86_64.tar.gz && \ +RUN wget -q --no-check-certificate https://cmake.org/files/v3.21/cmake-3.21.7-linux-x86_64.tar.gz && \ tar -xzf cmake-3.21.7-linux-x86_64.tar.gz && \ rm -r cmake-3.21.7-linux-x86_64/share/vim/vimfiles && \ cp -fR cmake-3.21.7-linux-x86_64/* /usr && \