From bf0bf1d6f0b04808b896f52ed956e5102c7ec3ef Mon Sep 17 00:00:00 2001 From: Hien To Date: Tue, 9 Jan 2024 16:59:24 +0700 Subject: [PATCH 1/2] Upgrade cuda to 11.7.1 to compatible hmax --- ...kerfile => actions-runner-ubuntu-cuda-11-7.dockerfile} | 8 ++++---- .../runners/actions-runner-ubuntu-cuda-12-0.dockerfile | 2 +- ...erfile => actions-runner-windows-cuda-11-7.dockerfile} | 8 ++++---- .../runners/actions-runner-windows-cuda-12-0.dockerfile | 2 +- .github/workflows/build.yml | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) rename .github/runners/{actions-runner-ubuntu-cuda-11-4.dockerfile => actions-runner-ubuntu-cuda-11-7.dockerfile} (94%) rename .github/runners/{actions-runner-windows-cuda-11-4.dockerfile => actions-runner-windows-cuda-11-7.dockerfile} (95%) diff --git a/.github/runners/actions-runner-ubuntu-cuda-11-4.dockerfile b/.github/runners/actions-runner-ubuntu-cuda-11-7.dockerfile similarity index 94% rename from .github/runners/actions-runner-ubuntu-cuda-11-4.dockerfile rename to .github/runners/actions-runner-ubuntu-cuda-11-7.dockerfile index d2a1ad064..b5af471ba 100644 --- a/.github/runners/actions-runner-ubuntu-cuda-11-4.dockerfile +++ b/.github/runners/actions-runner-ubuntu-cuda-11-7.dockerfile @@ -1,7 +1,7 @@ # Use NVIDIA CUDA 12.0.0 development image with Ubuntu 18.04 as the base -FROM nvidia/cuda:11.4.3-devel-ubuntu18.04 +FROM nvidia/cuda:11.7.1-devel-ubuntu18.04 -ARG RUNNER_VERSION=2.298.2 +ARG RUNNER_VERSION=2.311.0 # Docker and Docker Compose arguments # Use 1001 and 121 for compatibility with GitHub-hosted runners @@ -95,8 +95,8 @@ ADD start.sh start.sh RUN chmod +x start.sh -# Add /usr/local/cuda-11.4/compat to LD_LIBRARY_PATH -ENV LD_LIBRARY_PATH=/usr/local/cuda-11.4/compat${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +# Add /usr/local/cuda-11.7/compat to LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH=/usr/local/cuda-11.7/compat${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} USER runner diff --git a/.github/runners/actions-runner-ubuntu-cuda-12-0.dockerfile b/.github/runners/actions-runner-ubuntu-cuda-12-0.dockerfile index 79b46d1d6..1e2ffc3f7 100644 --- a/.github/runners/actions-runner-ubuntu-cuda-12-0.dockerfile +++ b/.github/runners/actions-runner-ubuntu-cuda-12-0.dockerfile @@ -1,7 +1,7 @@ # Use NVIDIA CUDA 12.0.0 development image with Ubuntu 18.04 as the base FROM nvidia/cuda:12.0.0-devel-ubuntu18.04 -ARG RUNNER_VERSION=2.298.2 +ARG RUNNER_VERSION=2.311.0 # Docker and Docker Compose arguments # Use 1001 and 121 for compatibility with GitHub-hosted runners diff --git a/.github/runners/actions-runner-windows-cuda-11-4.dockerfile b/.github/runners/actions-runner-windows-cuda-11-7.dockerfile similarity index 95% rename from .github/runners/actions-runner-windows-cuda-11-4.dockerfile rename to .github/runners/actions-runner-windows-cuda-11-7.dockerfile index 4d8bc5bce..2ae193f53 100644 --- a/.github/runners/actions-runner-windows-cuda-11-4.dockerfile +++ b/.github/runners/actions-runner-windows-cuda-11-7.dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/windows/server:ltsc2022 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';$ProgressPreference='silentlyContinue';"] -ARG RUNNER_VERSION=2.298.2 +ARG RUNNER_VERSION=2.311.0 RUN Invoke-WebRequest \ -Uri 'https://aka.ms/install-powershell.ps1' \ @@ -39,11 +39,11 @@ RUN choco install visualstudio2019buildtools -y --package-parameters '"--add Mic RUN choco install gzip -y; -# Install cuda toolkit 11.4.4 -RUN choco install cuda --version=11.4.2.47141 -y +# Install cuda toolkit 11.7.4 +RUN choco install cuda --version=11.7.2.47141 -y # Copy integrated tools to MSBuild -RUN Copy-Item -Path 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\extras\visual_studio_integration\MSBuildExtensions\*' -Destination 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Microsoft\VC\v160\BuildCustomizations' +RUN Copy-Item -Path 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.7\extras\visual_studio_integration\MSBuildExtensions\*' -Destination 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Microsoft\VC\v160\BuildCustomizations' ADD runner.ps1 C:/runner.ps1 diff --git a/.github/runners/actions-runner-windows-cuda-12-0.dockerfile b/.github/runners/actions-runner-windows-cuda-12-0.dockerfile index 7f55c8bad..41fbd747e 100644 --- a/.github/runners/actions-runner-windows-cuda-12-0.dockerfile +++ b/.github/runners/actions-runner-windows-cuda-12-0.dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/windows/server:ltsc2022 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';$ProgressPreference='silentlyContinue';"] -ARG RUNNER_VERSION=2.298.2 +ARG RUNNER_VERSION=2.311.0 RUN Invoke-WebRequest \ -Uri 'https://aka.ms/install-powershell.ps1' \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c5928f26..2b4b2c86b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,7 +121,7 @@ jobs: echo "Version: $NEW_VERSION" ubuntu-amd64-build: - runs-on: ubuntu-18-04-cuda-11-4 + runs-on: ubuntu-18-04-cuda-11-7 needs: [create-draft-release, set-nitro-version] if: always() && (needs.create-draft-release.result == 'success' || needs.create-draft-release.result == 'skipped') && needs.set-nitro-version.result == 'success' permissions: @@ -182,7 +182,7 @@ jobs: contents: write strategy: matrix: - cuda: ["12-0", "11-4"] + cuda: ["12-0", "11-7"] steps: - name: Clone @@ -352,7 +352,7 @@ jobs: asset_content_type: application/gzip windows-amd64-build: - runs-on: windows-cuda-11-4 + runs-on: windows-cuda-11-7 needs: [create-draft-release, set-nitro-version] if: always() && (needs.create-draft-release.result == 'success' || needs.create-draft-release.result == 'skipped') && needs.set-nitro-version.result == 'success' permissions: @@ -431,7 +431,7 @@ jobs: strategy: matrix: - cuda: ["12-0", "11-4"] + cuda: ["12-0", "11-7"] steps: - name: Setup VSWhere.exe From e360c86a04a993798da81cc9dfa1339b0453cb03 Mon Sep 17 00:00:00 2001 From: Hien To Date: Tue, 9 Jan 2024 17:29:16 +0700 Subject: [PATCH 2/2] =?UTF-8?q?Correct=20cuda=20version=20download=20from?= =?UTF-8?q?=20ch=C3=B4c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/runners/actions-runner-windows-cuda-11-7.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/runners/actions-runner-windows-cuda-11-7.dockerfile b/.github/runners/actions-runner-windows-cuda-11-7.dockerfile index 2ae193f53..9ee7103e4 100644 --- a/.github/runners/actions-runner-windows-cuda-11-7.dockerfile +++ b/.github/runners/actions-runner-windows-cuda-11-7.dockerfile @@ -40,7 +40,7 @@ RUN choco install visualstudio2019buildtools -y --package-parameters '"--add Mic RUN choco install gzip -y; # Install cuda toolkit 11.7.4 -RUN choco install cuda --version=11.7.2.47141 -y +RUN choco install cuda --version=11.7.1.51694 -y # Copy integrated tools to MSBuild RUN Copy-Item -Path 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.7\extras\visual_studio_integration\MSBuildExtensions\*' -Destination 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Microsoft\VC\v160\BuildCustomizations'