Merge pull request #33 from cdesiniotis/bump-samples-v12.9

Bump CUDA samples version to v12.9

Author: cdesiniotis

.github/workflows/image.yaml

@@ -28,7 +28,7 @@ on:
 
 jobs:
   build:
-    runs-on: linux-amd64-cpu4
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         dist:
@@ -60,7 +60,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
-          image: tonistiigi/binfmt:qemu-v7.0.0-28
+          image: tonistiigi/binfmt:qemu-v9.2.2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

deployments/container/Dockerfile.ubi9

@@ -12,24 +12,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubi9 AS builder
+FROM nvcr.io/nvidia/cuda:12.9.1-base-ubi9 AS builder
 
 ARG CUDA_VERSION
 RUN dnf install -y --allowerasing  \
+        cmake \
+        cuda-cudart-devel-12-9 \
+        cuda-nvcc-12-9 \
+        g++ \
         curl \
     && \
     dnf clean all
 
 WORKDIR /build
 
 ARG SAMPLE_NAME
-ENV SAMPLE_NAME ${SAMPLE_NAME}
-ARG CUDA_SAMPLES_VERSION=v12.0
+ENV SAMPLE_NAME=${SAMPLE_NAME}
+ARG CUDA_SAMPLES_VERSION=v12.9
 RUN curl -L https://codeload.github.com/NVIDIA/cuda-samples/tar.gz/refs/tags/${CUDA_SAMPLES_VERSION} | \
     tar -xzvf - --strip-components=1 --wildcards */${SAMPLE_NAME}/* --wildcards */Common/* && \
     cd $(find /build/Samples -iname "${SAMPLE_NAME}") && \
-    make build && \
-    cp $(find /build/bin -iname "${SAMPLE_NAME}") /build/${SAMPLE_NAME}
+    cmake . && \
+    make && \
+    cp ${SAMPLE_NAME} /build/${SAMPLE_NAME}
 
 FROM nvcr.io/nvidia/cuda:12.9.1-base-ubi9
 ARG SAMPLE_NAME

deployments/container/Dockerfile.ubuntu

@@ -12,13 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubuntu22.04 AS builder
+FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04 AS builder
 
 ARG SAMPLE_NAME
-ENV SAMPLE_NAME ${SAMPLE_NAME}
+ENV SAMPLE_NAME=${SAMPLE_NAME}
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
+        build-essential \
+        cmake \
+        cuda-nvcc-12-9 \
+        g++ \
         curl \
     && \
         rm -rf /var/lib/apt/lists/*
@@ -27,15 +31,16 @@ WORKDIR /build
 
 ARG TARGETARCH
 
-ARG CUDA_SAMPLES_VERSION=v12.0
+ARG CUDA_SAMPLES_VERSION=v12.9
 RUN curl -L https://codeload.github.com/NVIDIA/cuda-samples/tar.gz/refs/tags/${CUDA_SAMPLES_VERSION} | \
     tar -xzvf - --strip-components=1 --wildcards */${SAMPLE_NAME}/* --wildcards */Common/* && \
     cd $(find /build/Samples -iname "${SAMPLE_NAME}") && \
-    make build && \
-    cp $(find /build/bin -iname "${SAMPLE_NAME}") /build/${SAMPLE_NAME}
+    cmake . && \
+    make && \
+    cp ${SAMPLE_NAME} /build/${SAMPLE_NAME}
 
 FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04
-ARG SAMPLE_NAME=nbody
+ARG SAMPLE_NAME
 LABEL io.k8s.display-name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL vendor="NVIDIA"

deployments/container/nbody/Dockerfile

@@ -19,8 +19,9 @@ ENV SAMPLE_NAME=${SAMPLE_NAME}
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        cuda-nvcc-12-6 \
         build-essential \
+        cmake \
+        cuda-nvcc-12-9 \
         g++ \
         curl \
         freeglut3-dev \
@@ -33,15 +34,16 @@ WORKDIR /build
 
 ARG TARGETARCH
 
-ARG CUDA_SAMPLES_VERSION=v12.0
+ARG CUDA_SAMPLES_VERSION=v12.9
 RUN curl -L https://codeload.github.com/NVIDIA/cuda-samples/tar.gz/refs/tags/${CUDA_SAMPLES_VERSION} | \
     tar -xzvf - --strip-components=1 --wildcards */${SAMPLE_NAME}/* --wildcards */Common/* && \
     cd $(find /build/Samples -iname "${SAMPLE_NAME}") && \
-    make build && \
-    cp $(find /build/bin -iname "${SAMPLE_NAME}") /build/${SAMPLE_NAME}
+    cmake . && \
+    make && \
+    cp ${SAMPLE_NAME} /build/${SAMPLE_NAME}
 
 FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04
-ARG SAMPLE_NAME
+ARG SAMPLE_NAME=nbody
 LABEL io.k8s.display-name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL vendor="NVIDIA"

deployments/container/nvbandwidth/Dockerfile

@@ -12,26 +12,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubuntu22.04 AS builder
-
-ENV DEBIAN_FRONTEND=noninteractive
+FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04 AS builder
 
+ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    git \
-    cmake \
-    g++ \
-    gcc \
-    make \
-    libboost-program-options-dev \
-    openmpi-bin \
-    openmpi-common \
-    libopenmpi-dev && \
-    rm -rf /var/lib/apt/lists/*
+        build-essential \
+        cmake \
+        cuda-nvcc-12-9 \
+        cuda-nvml-dev-12-9 \
+        g++ \
+        git \
+        gcc \
+        make \
+        libboost-program-options-dev \
+        openmpi-bin \
+        openmpi-common \
+        libopenmpi-dev \
+    && \
+        rm -rf /var/lib/apt/lists/*
 
 WORKDIR /bandwidthtest
 
-ARG NVBANDWIDTH_VERSION=v0.7
+ARG NVBANDWIDTH_VERSION=v0.8
 
 RUN git clone --branch ${NVBANDWIDTH_VERSION} --depth 1 --single-branch https://github.com/NVIDIA/nvbandwidth.git && \
     cd nvbandwidth && \

versions.mk

@@ -17,7 +17,7 @@ VERSION ?= cuda$(shell  grep -Eo "FROM.*cuda:[0-9\.]+" deployments/container/Doc
 
 # Specify the tag for the https://github.com/NVIDIA/cuda-samples repository.
 # This need not match the CUDA_VERSION above.
-CUDA_SAMPLES_VERSION := v12.0
+CUDA_SAMPLES_VERSION := v12.9
 
 ifeq ($(IMAGE_NAME),)
 REGISTRY ?= nvcr.io/nvidia/k8s