build: Remove unused CUDA_VERSION_MAJOR build argument

coreweave · Oct 31, 2024 · bf0c401 · bf0c401
1 parent 3691a2b
commit bf0c401
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,10 +15,7 @@ on:
       base-tag:
         required: true
         type: string
-      cuda-version-minor:
-        required: true
-        type: string
-      cuda-version-major:
+      cuda-version:
         required: true
         type: string
       nccl-version:
@@ -95,8 +92,7 @@ jobs:
           file: ${{ inputs.folder }}/${{ inputs.dockerfile }}
           build-args: |-
             BASE_IMAGE=${{ inputs.base-image }}:${{ inputs.base-tag }}
-            CUDA_VERSION_MINOR=${{ inputs.cuda-version-minor }}
-            CUDA_VERSION_MAJOR=${{ inputs.cuda-version-major }}
+            CUDA_VERSION=${{ inputs.cuda-version }}
             TARGET_NCCL_VERSION=${{ inputs.nccl-version }}
             CUDA_SAMPLES_VERSION=${{ inputs.cuda-samples-version }}
             HPCX_DISTRIBUTION=${{ inputs.hpcx-distribution }}

diff --git a/.github/workflows/ubuntu-20.yml b/.github/workflows/ubuntu-20.yml
@@ -19,8 +19,7 @@ jobs:
       dockerfile: Dockerfile.ubuntu20
       base-image: nvidia/cuda
       base-tag: 12.0.1-cudnn8-devel-ubuntu20.04
-      cuda-version-minor: "12.0.1"
-      cuda-version-major: "12.0"
+      cuda-version: "12.0.1"
       nccl-version: 2.23.4-1
       cuda-samples-version: "12.0"
       hpcx-distribution: "hpcx-v2.20-gcc-mlnx_ofed-ubuntu20.04-cuda12"
@@ -37,8 +36,7 @@ jobs:
       dockerfile: Dockerfile.ubuntu20
       base-image: nvidia/cuda
       base-tag: 12.2.2-cudnn8-devel-ubuntu20.04
-      cuda-version-minor: "12.2.2"
-      cuda-version-major: "12.2"
+      cuda-version: "12.2.2"
       nccl-version: 2.23.4-1
       cuda-samples-version: "12.2"
       hpcx-distribution: "hpcx-v2.20-gcc-mlnx_ofed-ubuntu20.04-cuda12"
@@ -55,8 +53,7 @@ jobs:
       dockerfile: Dockerfile.ubuntu20
       base-image: nvidia/cuda
       base-tag: 12.4.1-cudnn-devel-ubuntu20.04
-      cuda-version-minor: "12.4.1"
-      cuda-version-major: "12.4"
+      cuda-version: "12.4.1"
       nccl-version: 2.23.4-1
       cuda-samples-version: "12.4"
       hpcx-distribution: "hpcx-v2.20-gcc-mlnx_ofed-ubuntu20.04-cuda12"
@@ -73,8 +70,7 @@ jobs:
       dockerfile: Dockerfile.ubuntu20
       base-image: nvidia/cuda
       base-tag: 12.6.1-cudnn-devel-ubuntu20.04
-      cuda-version-minor: "12.6.1"
-      cuda-version-major: "12.6"
+      cuda-version: "12.6.1"
       nccl-version: 2.23.4-1
       cuda-samples-version: "12.5"
       hpcx-distribution: "hpcx-v2.20-gcc-mlnx_ofed-ubuntu20.04-cuda12"
diff --git a/.github/workflows/ubuntu-22.yml b/.github/workflows/ubuntu-22.yml
@@ -19,8 +19,7 @@ jobs:
       dockerfile: Dockerfile.ubuntu22
       base-image: nvidia/cuda
       base-tag: 12.0.1-cudnn8-devel-ubuntu22.04
-      cuda-version-minor: "12.0.1"
-      cuda-version-major: "12.0"
+      cuda-version: "12.0.1"
       nccl-version: 2.23.4-1
       cuda-samples-version: "12.0"
       hpcx-distribution: "hpcx-v2.20-gcc-mlnx_ofed-ubuntu22.04-cuda12"
@@ -37,8 +36,7 @@ jobs:
       dockerfile: Dockerfile.ubuntu22
       base-image: nvidia/cuda
       base-tag: 12.2.2-cudnn8-devel-ubuntu22.04
-      cuda-version-minor: "12.2.2"
-      cuda-version-major: "12.2"
+      cuda-version: "12.2.2"
       nccl-version: 2.23.4-1
       cuda-samples-version: "12.2"
       hpcx-distribution: "hpcx-v2.20-gcc-mlnx_ofed-ubuntu22.04-cuda12"
@@ -55,8 +53,7 @@ jobs:
       dockerfile: Dockerfile.ubuntu22
       base-image: nvidia/cuda
       base-tag: 12.4.1-cudnn-devel-ubuntu22.04
-      cuda-version-minor: "12.4.1"
-      cuda-version-major: "12.4"
+      cuda-version: "12.4.1"
       nccl-version: 2.23.4-1
       cuda-samples-version: "12.4"
       hpcx-distribution: "hpcx-v2.20-gcc-mlnx_ofed-ubuntu22.04-cuda12"
@@ -73,8 +70,7 @@ jobs:
       dockerfile: Dockerfile.ubuntu22
       base-image: nvidia/cuda
       base-tag: 12.6.1-cudnn-devel-ubuntu22.04
-      cuda-version-minor: "12.6.1"
-      cuda-version-major: "12.6"
+      cuda-version: "12.6.1"
       nccl-version: 2.23.4-1
       cuda-samples-version: "12.5"
       hpcx-distribution: "hpcx-v2.20-gcc-mlnx_ofed-ubuntu22.04-cuda12"
diff --git a/Dockerfile.ubuntu20 b/Dockerfile.ubuntu20
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.4
-ARG CUDA_VERSION_MINOR=12.4.1
-ARG CUDA_VERSION_MAJOR=12.4
-ARG BASE_IMAGE=nvidia/cuda:${CUDA_VERSION_MINOR}-cudnn-devel-ubuntu20.04
+
+ARG CUDA_VERSION=12.4.1
+ARG BASE_IMAGE=nvidia/cuda:${CUDA_VERSION}-cudnn-devel-ubuntu20.04
 FROM ${BASE_IMAGE} AS base
 
 ARG DEBIAN_FRONTEND=noninteractive

diff --git a/Dockerfile.ubuntu22 b/Dockerfile.ubuntu22
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.4
-ARG CUDA_VERSION_MINOR=12.4.1
-ARG CUDA_VERSION_MAJOR=12.4
-ARG BASE_IMAGE=nvidia/cuda:${CUDA_VERSION_MINOR}-cudnn-devel-ubuntu22.04
+
+ARG CUDA_VERSION=12.4.1
+ARG BASE_IMAGE=nvidia/cuda:${CUDA_VERSION}-cudnn-devel-ubuntu22.04
 FROM ${BASE_IMAGE} AS base
 
 ARG DEBIAN_FRONTEND=noninteractive