update cuda env variables

CFD-GO · Sep 7, 2023 · f3c61e2 · f3c61e2
1 parent 5377039
commit f3c61e2
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 14 deletions.
diff --git a/.github/workflows/cpu_test.yml b/.github/workflows/cpu_test.yml
@@ -50,14 +50,14 @@ jobs:
         push: true
         tags: cfdgo/tclb:ubuntu-22.04-hip-5.4.1,ghcr.io/cfd-go/tclb:ubuntu-22.04-hip-5.4.1
         file: gen/Dockerfile.ubuntu-22.04-hip-5.4.1 
-    - name: Build ubuntu-22.04 small hip 5.6.0
+    - name: Build ubuntu-22.04 small hip 5.6.1
       uses: docker/[email protected]
       with:
         context: .
         platforms: linux/amd64
         push: true
-        tags: cfdgo/tclb:ubuntu-22.04-hip-5.6.0,ghcr.io/cfd-go/tclb:ubuntu-22.04-hip-5.6.0
-        file: gen/Dockerfile.ubuntu-22.04-hip-5.6.0 
+        tags: cfdgo/tclb:ubuntu-22.04-hip-5.6.1,ghcr.io/cfd-go/tclb:ubuntu-22.04-hip-5.6.1
+        file: gen/Dockerfile.ubuntu-22.04-hip-5.6.1 
     - name: Build ubuntu-22.04 small cpu 
       uses: docker/[email protected]
       with:
@@ -90,14 +90,14 @@ jobs:
         push: true
         tags: cfdgo/tclb:ubuntu-22.04-big-hip-5.4.1,ghcr.io/cfd-go/tclb:ubuntu-22.04-big-hip-5.4.1
         file: gen/Dockerfile.ubuntu-22.04-big-hip-5.4.1 
-    - name: Build ubuntu-22.04 big hip 5.6.0
+    - name: Build ubuntu-22.04 big hip 5.6.1
       uses: docker/[email protected]
       with:
         context: .
         platforms: linux/amd64
         push: true
-        tags: cfdgo/tclb:ubuntu-22.04-big-hip-5.6.0,ghcr.io/cfd-go/tclb:ubuntu-22.04-big-hip-5.6.0
-        file: gen/Dockerfile.ubuntu-22.04-big-hip-5.6.0 
+        tags: cfdgo/tclb:ubuntu-22.04-big-hip-5.6.1,ghcr.io/cfd-go/tclb:ubuntu-22.04-big-hip-5.6.1
+        file: gen/Dockerfile.ubuntu-22.04-big-hip-5.6.1 
     - name: Build ubuntu-22.04 big cpu 
       uses: docker/[email protected]
       with:

diff --git a/gen/Dockerfile.ubuntu-22.04-big b/gen/Dockerfile.ubuntu-22.04-big
@@ -18,4 +18,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && sudo apt-get update && \
         libxml2 libxml2-dev libgl1-mesa-glx 
 RUN /tmp/install.sh --group --retry 3 --retry-delay 5 rinside reticulate --rpackage languageserver --rpackage png 
 RUN pip3 install vtk
-ENV RETICULATE_PYTHON=/usr/bin/python3 
+ENV RETICULATE_PYTHON="/usr/bin/python3" 
diff --git a/gen/Dockerfile.ubuntu-22.04-big-cuda-11.7 b/gen/Dockerfile.ubuntu-22.04-big-cuda-11.7
@@ -14,9 +14,12 @@ RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo r
 RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo openmpi 
 RUN /tmp/install.sh --group --retry 3 --retry-delay 5 rdep 
 RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo cuda 11.7 
+ENV CUDA_PATH="/usr/local/cuda-11.7"
+ENV PATH="${CUDA_PATH}/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${CUDA_PATH}/lib64:${LD_LIBRARY_PATH}" 
 RUN export DEBIAN_FRONTEND=noninteractive && sudo apt-get update && \
       sudo apt-get -y install --no-install-recommends \
         libxml2 libxml2-dev libgl1-mesa-glx 
 RUN /tmp/install.sh --group --retry 3 --retry-delay 5 rinside reticulate --rpackage languageserver --rpackage png 
 RUN pip3 install vtk
-ENV RETICULATE_PYTHON=/usr/bin/python3 
+ENV RETICULATE_PYTHON="/usr/bin/python3" 
diff --git a/gen/Dockerfile.ubuntu-22.04-big-cuda-12.0 b/gen/Dockerfile.ubuntu-22.04-big-cuda-12.0
@@ -14,9 +14,12 @@ RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo r
 RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo openmpi 
 RUN /tmp/install.sh --group --retry 3 --retry-delay 5 rdep 
 RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo cuda 12.0 
+ENV CUDA_PATH="/usr/local/cuda-12.0"
+ENV PATH="${CUDA_PATH}/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${CUDA_PATH}/lib64:${LD_LIBRARY_PATH}" 
 RUN export DEBIAN_FRONTEND=noninteractive && sudo apt-get update && \
       sudo apt-get -y install --no-install-recommends \
         libxml2 libxml2-dev libgl1-mesa-glx 
 RUN /tmp/install.sh --group --retry 3 --retry-delay 5 rinside reticulate --rpackage languageserver --rpackage png 
 RUN pip3 install vtk
-ENV RETICULATE_PYTHON=/usr/bin/python3 
+ENV RETICULATE_PYTHON="/usr/bin/python3" 
diff --git a/gen/Dockerfile.ubuntu-22.04-big-hip-5.4.1 b/gen/Dockerfile.ubuntu-22.04-big-hip-5.4.1
@@ -19,4 +19,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && sudo apt-get update && \
         libxml2 libxml2-dev libgl1-mesa-glx 
 RUN /tmp/install.sh --group --retry 3 --retry-delay 5 rinside reticulate --rpackage languageserver --rpackage png 
 RUN pip3 install vtk
-ENV RETICULATE_PYTHON=/usr/bin/python3 
+ENV RETICULATE_PYTHON="/usr/bin/python3" 
diff --git a/gen/Dockerfile.ubuntu-22.04-cuda-11.7 b/gen/Dockerfile.ubuntu-22.04-cuda-11.7
@@ -13,4 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && sudo apt-get update && \
 RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo r 
 RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo openmpi 
 RUN /tmp/install.sh --group --retry 3 --retry-delay 5 rdep 
-RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo cuda 11.7 
+RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo cuda 11.7 
+ENV CUDA_PATH="/usr/local/cuda-11.7"
+ENV PATH="${CUDA_PATH}/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${CUDA_PATH}/lib64:${LD_LIBRARY_PATH}" 
diff --git a/gen/Dockerfile.ubuntu-22.04-cuda-12.0 b/gen/Dockerfile.ubuntu-22.04-cuda-12.0
@@ -13,4 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && sudo apt-get update && \
 RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo r 
 RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo openmpi 
 RUN /tmp/install.sh --group --retry 3 --retry-delay 5 rdep 
-RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo cuda 12.0 
+RUN sudo /tmp/install.sh --group --retry 3 --retry-delay 5 --sudo cuda 12.0 
+ENV CUDA_PATH="/usr/local/cuda-12.0"
+ENV PATH="${CUDA_PATH}/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${CUDA_PATH}/lib64:${LD_LIBRARY_PATH}" 
diff --git a/generate.Rt b/generate.Rt
@@ -51,13 +51,18 @@ WORKDIR /home/vscode
         install_sh("r", sudo=TRUE)
         install_sh("openmpi", sudo=TRUE)
         install_sh("rdep")
-        if (d$arch == "cuda") install_sh(c("cuda",d$version), sudo=TRUE)
+        if (d$arch == "cuda") {
+            install_sh(c("cuda",d$version), sudo=TRUE) ?>
+ENV CUDA_PATH="/usr/local/cuda-<?%s d$version ?>"
+ENV PATH="${CUDA_PATH}/bin:${PATH}"
+ENV LD_LIBRARY_PATH="${CUDA_PATH}/lib64:${LD_LIBRARY_PATH}" <?R
+        }
         if (d$arch == "hip") install_sh(c("hip",d$version), sudo=TRUE)
         if (d$type == "big") {
             install_apt(c("libxml2","libxml2-dev","libgl1-mesa-glx"))
             install_sh(c("rinside","reticulate","--rpackage languageserver", "--rpackage png")) ?>
 RUN pip3 install vtk
-ENV RETICULATE_PYTHON=/usr/bin/python3 <?R
+ENV RETICULATE_PYTHON="/usr/bin/python3" <?R
         }
         sink()
     }