Merge pull request #49 from ArangoGutierrez/fix_base

Bump CUDA_SAMPLES_VERSION to 13.0

Author: ArangoGutierrez

deployments/container/Dockerfile

@@ -18,23 +18,18 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
         build-essential \
         cmake \
-        cuda-nvcc-12-9 \
+        cuda-nvcc-13-0 \
         g++ \
         curl \
     && \
         rm -rf /var/lib/apt/lists/*
 
-# TODO: The cuda-nvvcc-12-9 package should either depend on the CUDA version or
-# the sample version. IFF we match the sample version, we need to also ensure
-# that the right alternative is used here.
-RUN update-alternatives --set cuda /usr/local/cuda-12.9
-
 WORKDIR /build
 
 ARG SAMPLE_NAME
 ENV SAMPLE_NAME=${SAMPLE_NAME}
 
-ARG CUDA_SAMPLES_VERSION=v12.9
+ARG CUDA_SAMPLES_VERSION=v13.0
 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}") && \

deployments/container/nbody/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04 AS builder
+FROM nvcr.io/nvidia/cuda:13.0.0-base-ubuntu22.04 AS builder
 
 ARG SAMPLE_NAME=nbody
 ENV SAMPLE_NAME=${SAMPLE_NAME}
@@ -21,7 +21,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
         build-essential \
         cmake \
-        cuda-nvcc-12-9 \
+        cuda-nvcc-13-0 \
         g++ \
         curl \
         freeglut3-dev \
@@ -34,15 +34,15 @@ WORKDIR /build
 
 ARG TARGETARCH
 
-ARG CUDA_SAMPLES_VERSION=v12.9
+ARG CUDA_SAMPLES_VERSION=v13.0
 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}") && \
     cmake . && \
     make && \
     cp ${SAMPLE_NAME} /build/${SAMPLE_NAME}
 
-FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04
+FROM nvcr.io/nvidia/cuda:13.0.0-base-ubuntu22.04
 ARG SAMPLE_NAME=nbody
 LABEL io.k8s.display-name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL name="NVIDIA CUDA ${SAMPLE_NAME} sample"

deployments/container/nvbandwidth/Dockerfile

@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04 AS builder
+FROM nvcr.io/nvidia/cuda:13.0.0-base-ubuntu22.04 AS builder
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
         build-essential \
         cmake \
-        cuda-nvcc-12-9 \
-        cuda-nvml-dev-12-9 \
+        cuda-nvcc-13-0 \
+        cuda-nvml-dev-13-0 \
         g++ \
         git \
         gcc \
@@ -40,7 +40,7 @@ RUN git clone --branch ${NVBANDWIDTH_VERSION} --depth 1 --single-branch https://
     cmake -DMULTINODE=1 . && \
     make -j$(nproc)
 
-FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04
+FROM nvcr.io/nvidia/cuda:13.0.0-base-ubuntu22.04
 
 ARG port=2222
 

deployments/container/vulkan/Dockerfile

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04 AS builder
+FROM nvcr.io/nvidia/cuda:13.0.0-base-ubuntu22.04 AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
@@ -63,7 +63,7 @@ RUN git clone --depth=1 https://github.com/SaschaWillems/Vulkan.git \
     && cmake -D RESOURCE_INSTALL_DIR=/cuda-samples ..  \
     && make ${BUILD_EXAMPLES}
 
-FROM nvcr.io/nvidia/cuda:12.9.1-base-ubuntu22.04
+FROM nvcr.io/nvidia/cuda:13.0.0-base-ubuntu22.04
 
 LABEL io.k8s.display-name="NVIDIA CUDA Vulkan samples"
 LABEL name="NVIDIA CUDA Vulkan samples"

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.9
+CUDA_SAMPLES_VERSION := v13.0
 
 ifeq ($(IMAGE_NAME),)
 REGISTRY ?= nvcr.io/nvidia/k8s