diff --git a/.github/workflows/cpu_test.yml b/.github/workflows/cpu_test.yml index 70ea77b..e01973d 100644 --- 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/build-push-action@v4.1.1 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/build-push-action@v4.1.1 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/build-push-action@v4.1.1 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/build-push-action@v4.1.1 with: diff --git a/gen/Dockerfile.ubuntu-22.04-big b/gen/Dockerfile.ubuntu-22.04-big index 63153a6..e376b3c 100644 --- 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 \ No newline at end of file +ENV RETICULATE_PYTHON="/usr/bin/python3" \ No newline at end of file diff --git a/gen/Dockerfile.ubuntu-22.04-big-cuda-11.7 b/gen/Dockerfile.ubuntu-22.04-big-cuda-11.7 index d0875be..67e5c3b 100644 --- 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 \ No newline at end of file +ENV RETICULATE_PYTHON="/usr/bin/python3" \ No newline at end of file diff --git a/gen/Dockerfile.ubuntu-22.04-big-cuda-12.0 b/gen/Dockerfile.ubuntu-22.04-big-cuda-12.0 index 87fbfa7..027a118 100644 --- 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 \ No newline at end of file +ENV RETICULATE_PYTHON="/usr/bin/python3" \ No newline at end of file diff --git a/gen/Dockerfile.ubuntu-22.04-big-hip-5.4.1 b/gen/Dockerfile.ubuntu-22.04-big-hip-5.4.1 index 57faa94..cd0ec96 100644 --- 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 \ No newline at end of file +ENV RETICULATE_PYTHON="/usr/bin/python3" \ No newline at end of file diff --git a/gen/Dockerfile.ubuntu-22.04-cuda-11.7 b/gen/Dockerfile.ubuntu-22.04-cuda-11.7 index 48f4cac..5f8186a 100644 --- 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 \ No newline at end of file +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}" \ No newline at end of file diff --git a/gen/Dockerfile.ubuntu-22.04-cuda-12.0 b/gen/Dockerfile.ubuntu-22.04-cuda-12.0 index 3d57d02..07ed4b1 100644 --- 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 \ No newline at end of file +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}" \ No newline at end of file diff --git a/generate.Rt b/generate.Rt index e7141c5..e9c83ca 100644 --- 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-" +ENV PATH="${CUDA_PATH}/bin:${PATH}" +ENV LD_LIBRARY_PATH="${CUDA_PATH}/lib64:${LD_LIBRARY_PATH}" RUN pip3 install vtk -ENV RETICULATE_PYTHON=/usr/bin/python3