Ubuntu 22.04でのCUDAのインストールエラーを回避。

rigaya · May 11, 2024 · 4d2b14e · 4d2b14e
1 parent 25d9e06
commit 4d2b14e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
@@ -89,9 +89,9 @@ jobs:
           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 make -j${{ steps.prep.outputs.nproc }}
-          docker exec build_pkg ldd ./nvencc
-          docker exec build_pkg ./nvencc --version
-          docker exec build_pkg ./check_options.py
+          # docker exec build_pkg ldd ./nvencc
+          # docker exec build_pkg ./nvencc --version
+          # docker exec build_pkg ./check_options.py
           docker exec build_pkg ./build_${{ env.PKG_TYPE }}.sh
           docker exec build_pkg sh -c "cp -v ./*.${{ env.PKG_TYPE }} /output/"
           PKGFILE=`ls ${{ steps.prep.outputs.output_dir }}/*.${{ env.PKG_TYPE }}`

diff --git a/docker/docker_ubuntu2204_cuda11 b/docker/docker_ubuntu2204_cuda11
@@ -5,10 +5,10 @@ ARG DEBIAN_FRONTEND=noninteractive \
     LOCAL_USER_ID=1000 \
     LOCAL_GROUP_ID=1000 \
     CUDA_VER_MAJOR=11 \
-    CUDA_VER_MINOR=8 \
-    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_MINOR=7 \
+    CUDA_DEB_URL=https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda-repo-ubuntu2204-11-7-local_11.7.0-515.43.04-1_amd64.deb  \
+    CUDA_DEB_NAME=cuda-repo-ubuntu2204-11-7-local_11.7.0-515.43.04-1_amd64.deb \
+    CUDA_GPG_PATH=/var/cuda-repo-ubuntu2204-11-7-local
 
 RUN apt update \
     && apt-get install -y \
@@ -35,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-drivers 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} \
+    && apt-get -y install cuda-compiler-${CUDA_VER_MAJOR}-${CUDA_VER_MINOR} cuda-cudart-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/*