Jimver#379 ARM Runner + CUDA (Jimver#378)

johnnynunez · Jimver · web-flow · commit 8022558310ea · 2025-01-27T00:07:17.000Z
* Add support for ARM architecture for linux local/network installs

---------

Co-authored-by: Jimver &lt;jim.verheijde@hotmail.com&gt;
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "Ubuntu",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/base:jammy",
+	"image": "mcr.microsoft.com/devcontainers/base:noble",
 	"features": {
 		"ghcr.io/devcontainers-contrib/features/volta:1": {}
 	}
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, windows-2019, ubuntu-22.04, ubuntu-20.04]
+        os: [windows-2025, windows-2022, ubuntu-24.04, ubuntu-22.04, ubuntu-24.04-arm, ubuntu-22.04-arm]
         method: [local, network]
     runs-on: ${{ matrix.os }}
 
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This action installs the [NVIDIA® CUDA® Toolkit](https://developer.nvidia.com/
 
 **Optional** The CUDA version to install. View `src/link/windows-links.ts` and `src/link/linux-links.ts` for available versions.
 
-Default: `'12.6.1'`.
+Default: `'12.8.0'`.
 
 ### `sub-packages`
 
@@ -88,7 +88,7 @@ The path where cuda is installed (same as `CUDA_PATH` in `GITHUB_ENV`).
 
 ```yaml
 steps:
-- uses: Jimver/cuda-toolkit@v0.2.20
+- uses: Jimver/cuda-toolkit@v0.2.21
   id: cuda-toolkit
   with:
     cuda: '12.5.0'
diff --git a/__tests__/arch.test.ts b/__tests__/arch.test.ts
@@ -0,0 +1,23 @@
+import {CPUArch, getArch} from '../src/arch'
+import os from 'os'
+
+test.concurrent('Return either x64 or arm64 architecture', async () => {
+  const archString = os.arch()
+  let expected: CPUArch
+  switch (archString) {
+    case 'x64':
+      expected = CPUArch.x86_64
+      break
+    case 'arm64':
+      expected = CPUArch.arm64
+      break
+    default:
+      await expect(getArch()).rejects.toThrow(
+        `Unsupported architecture: ${archString}`
+      )
+      return
+  }
+
+  const detectedArch = await getArch()
+  expect(detectedArch).toBe(expected)
+})
diff --git a/__tests__/links/linux-links.test.ts b/__tests__/links/linux-links.test.ts
@@ -16,7 +16,8 @@ test.concurrent(
   'Linux Cuda version to URL map contains valid URLs',
   async () => {
     for (const version of LinuxLinks.Instance.getAvailableLocalCudaVersions()) {
-      const url: URL = LinuxLinks.Instance.getLocalURLFromCudaVersion(version)
+      const url: URL =
+        await LinuxLinks.Instance.getLocalURLFromCudaVersion(version)
       expect(url).toBeInstanceOf(URL)
     }
   }
diff --git a/__tests__/links/windows-links.test.ts b/__tests__/links/windows-links.test.ts
@@ -16,7 +16,8 @@ test.concurrent(
   'Windows Cuda version to URL map contains valid URLs',
   async () => {
     for (const version of WindowsLinks.Instance.getAvailableLocalCudaVersions()) {
-      const url: URL = WindowsLinks.Instance.getLocalURLFromCudaVersion(version)
+      const url: URL =
+        await WindowsLinks.Instance.getLocalURLFromCudaVersion(version)
       expect(url).toBeInstanceOf(URL)
     }
   }
diff --git a/action.yml b/action.yml
@@ -5,7 +5,7 @@ inputs:
   cuda:
     description: 'Cuda version'
     required: false
-    default: '12.6.1'
+    default: '12.8.0'
   sub-packages:
     description: 'Only installs specified subpackages, must be in the form of a JSON array. For example, if you only want to install nvcc and visual studio integration: ["nvcc", "visual_studio_integration"] double quotes required! Note that if you want to use this on Linux, ''network'' method MUST be used.'
     required: false
diff --git a/dist/index.js b/dist/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cuda-toolkit",
-  "version": "0.2.20",
+  "version": "0.2.21",
   "description": "GitHub Action to install the NVIDIA CUDA Toolkit",
   "main": "lib/main.js",
   "scripts": {
diff --git a/src/apt-installer.ts b/src/apt-installer.ts
@@ -4,6 +4,7 @@ import {Method} from './method'
 import {SemVer} from 'semver'
 import {exec} from '@actions/exec'
 import {execReturnOutput} from './run-command'
+import {CPUArch, getArch} from './arch'
 
 export async function useApt(method: Method): Promise<boolean> {
   return method === 'network' && (await getOs()) === OSType.linux
@@ -19,8 +20,21 @@ export async function aptSetup(version: SemVer): Promise<void> {
   core.debug(`Setup packages for ${version}`)
   const ubuntuVersion: string = await execReturnOutput('lsb_release', ['-sr'])
   const ubuntuVersionNoDot = ubuntuVersion.replace('.', '')
+
+  // Dynamically determine architecture
+  let arch = 'x86_64' // Default to x86_64
+  try {
+    if ((await getArch()) === CPUArch.arm64) {
+      arch = 'sbsa' // This might not work in the future, they are merging arm64 and sbsa
+    }
+  } catch (error) {
+    core.warning(`Could not detect architecture, using default ${arch}`)
+  }
+  core.debug(
+    `Detected architecture: ${process.arch}, using arch string: ${arch}`
+  )
+
   const pinFilename = `cuda-ubuntu${ubuntuVersionNoDot}.pin`
-  const arch = `x86_64`
   const pinUrl = `https://developer.download.nvidia.com/compute/cuda/repos/ubuntu${ubuntuVersionNoDot}/${arch}/${pinFilename}`
   const repoUrl = `http://developer.download.nvidia.com/compute/cuda/repos/ubuntu${ubuntuVersionNoDot}/${arch}/`
   const keyRingVersion = `1.1-1`
diff --git a/src/arch.ts b/src/arch.ts
@@ -0,0 +1,20 @@
+import {debug} from '@actions/core'
+import os from 'os'
+
+export enum CPUArch {
+  x86_64 = 'x64',
+  arm64 = 'arm64'
+}
+
+export async function getArch(): Promise<CPUArch> {
+  const arch = os.arch()
+  switch (arch) {
+    case 'x64':
+      return CPUArch.x86_64
+    case 'arm64':
+      return CPUArch.arm64
+    default:
+      debug(`Unsupported architecture: ${arch}`)
+      throw new Error(`Unsupported architecture: ${arch}`)
+  }
+}
diff --git a/src/downloader.ts b/src/downloader.ts
diff --git a/src/links/links.ts b/src/links/links.ts
diff --git a/src/links/linux-links.ts b/src/links/linux-links.ts

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`"name": "Ubuntu",`
`5`	`5`	`// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile`
`6`		`- "image": "mcr.microsoft.com/devcontainers/base:jammy",`
	`6`	`+ "image": "mcr.microsoft.com/devcontainers/base:noble",`
`7`	`7`	`"features": {`
`8`	`8`	`"ghcr.io/devcontainers-contrib/features/volta:1": {}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ test.concurrent(`
`16`	`16`	`'Linux Cuda version to URL map contains valid URLs',`
`17`	`17`	`async () => {`
`18`	`18`	`for (const version of LinuxLinks.Instance.getAvailableLocalCudaVersions()) {`
`19`		`- const url: URL = LinuxLinks.Instance.getLocalURLFromCudaVersion(version)`
	`19`	`+ const url: URL =`
	`20`	`+ await LinuxLinks.Instance.getLocalURLFromCudaVersion(version)`
`20`	`21`	`expect(url).toBeInstanceOf(URL)`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cuda-toolkit",`
`3`		`- "version": "0.2.20",`
	`3`	`+ "version": "0.2.21",`
`4`	`4`	`"description": "GitHub Action to install the NVIDIA CUDA Toolkit",`
`5`	`5`	`"main": "lib/main.js",`
`6`	`6`	`"scripts": {`