From 9398661ee8944129fb9c7ca64a27fbbe030172ab Mon Sep 17 00:00:00 2001
From: rigaya <rigaya34589@live.jp>
Date: Wed, 1 May 2024 07:28:40 +0900
Subject: [PATCH] =?UTF-8?q?Ubuntu=2024.04=E3=81=A7=E3=80=81cuda=E3=81=AE?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

パッケージの一部のみを導入するようにする。
---
 .github/workflows/build_packages.yml |  2 +-
 docker/docker_ubuntu2404_cuda11      | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
index b27e6294..0d6e65cd 100644
--- a/.github/workflows/build_packages.yml
+++ b/.github/workflows/build_packages.yml
@@ -84,7 +84,7 @@ jobs:
         run: |
           docker build --build-arg LOCAL_USER_ID=${{ steps.prep.outputs.local_user_id }} --build-arg LOCAL_GROUP_ID=${{ steps.prep.outputs.local_group_id }} --tag ${{ steps.prep.outputs.tagged_image }} --platform linux/${{ matrix.arch }} --file ${{ env.DOCKER_FILE }} ./
           docker run -dit --rm -v ${{ steps.prep.outputs.output_dir }}:/output -u "$(id -u):$(id -g)" --name build_pkg ${{ steps.prep.outputs.tagged_image }}
-          docker exec build_pkg ./configure --extra-cxxflags="-I./AviSynthPlus/avs_core/include -I./vapoursynth/include"
+          docker exec build_pkg ./configure --extra-cxxflags="-I./AviSynthPlus/avs_core/include -I./vapoursynth/include" --extra-cudaldflags="-L/usr/local/cuda/targets/${{ matrix.arch }}-linux/lib/stubs"
           docker exec build_pkg make -j${{ steps.prep.outputs.nproc }}
           docker exec build_pkg ./nvencc --version
           docker exec build_pkg ./check_options.py
diff --git a/docker/docker_ubuntu2404_cuda11 b/docker/docker_ubuntu2404_cuda11
index 951c40b1..28783b5a 100644
--- a/docker/docker_ubuntu2404_cuda11
+++ b/docker/docker_ubuntu2404_cuda11
@@ -1,12 +1,14 @@
 FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND=noninteractive \
-    OSVER=ubuntu2404 \
+    OSVER=ubuntu2204 \
     LOCAL_USER_ID=1000 \
     LOCAL_GROUP_ID=1000 \
-    CUDA_DEB_URL=https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda-repo-ubuntu2204-11-8-local_11.8.0-520.61.05-1_amd64.deb \
-    CUDA_DEB_NAME=cuda-repo-ubuntu2204-11-8-local_11.8.0-520.61.05-1_amd64.deb \
-    CUDA_GPG_PATH=/var/cuda-repo-ubuntu2204-11-8-local
+    CUDA_VER_MAJOR=12 \
+    CUDA_VER_MINOR=4 \
+    CUDA_DEB_URL=https://developer.download.nvidia.com/compute/cuda/12.4.1/local_installers/cuda-repo-ubuntu2204-12-4-local_12.4.1-550.54.15-1_amd64.deb \
+    CUDA_DEB_NAME=cuda-repo-ubuntu2204-12-4-local_12.4.1-550.54.15-1_amd64.deb \
+    CUDA_GPG_PATH=/var/cuda-repo-ubuntu2204-12-4-local
 
 RUN apt update \
     && apt-get install -y \
@@ -33,7 +35,7 @@ RUN apt update \
     && dpkg -i ${CUDA_DEB_NAME} \
     && cp ${CUDA_GPG_PATH}/cuda-*-keyring.gpg /usr/share/keyrings/ \
     && apt-get update \
-    && apt-get -y install cuda \
+    && apt-get -y install cuda-compiler-${CUDA_VER_MAJOR}-${CUDA_VER_MINOR} cuda-cudart-dev-${CUDA_VER_MAJOR}-${CUDA_VER_MINOR} cuda-driver-dev-${CUDA_VER_MAJOR}-${CUDA_VER_MINOR} cuda-nvrtc-dev-${CUDA_VER_MAJOR}-${CUDA_VER_MINOR} libcurand-dev-${CUDA_VER_MAJOR}-${CUDA_VER_MINOR} libnpp-dev-${CUDA_VER_MAJOR}-${CUDA_VER_MINOR} cuda-nvml-dev-${CUDA_VER_MAJOR}-${CUDA_VER_MINOR} \
     && rm -f ${CUDA_DEB_NAME} \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*