diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index 6193a007..8695e67d 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -87,8 +87,9 @@ 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" --extra-cudaldflags="-L/usr/local/cuda/targets/${{ matrix.arch }}-linux/lib/stubs" + 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 ./build_${{ env.PKG_TYPE }}.sh diff --git a/docker/docker_ubuntu1804_cuda10 b/docker/docker_ubuntu1804_cuda10 index b69e6be2..e7afdff9 100644 --- a/docker/docker_ubuntu1804_cuda10 +++ b/docker/docker_ubuntu1804_cuda10 @@ -39,10 +39,11 @@ RUN apt update \ && dpkg -i ${CUDA_DEB_NAME} \ && apt-key add ${CUDA_PUB_PATH} \ && 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-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} cuda-curand-dev-${CUDA_VER_MAJOR}-${CUDA_VER_MINOR} cuda-npp-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/* + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/local/cuda-${CUDA_VER_MAJOR}.${CUDA_VER_MINOR} /usr/local/cuda RUN useradd -u $LOCAL_USER_ID -m --user-group --shell /bin/bash rigaya RUN groupmod -og $LOCAL_GROUP_ID rigaya diff --git a/docker/docker_ubuntu2004_cuda11 b/docker/docker_ubuntu2004_cuda11 index 933905d4..7b4c47de 100644 --- a/docker/docker_ubuntu2004_cuda11 +++ b/docker/docker_ubuntu2004_cuda11 @@ -38,7 +38,8 @@ RUN apt 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} \ && rm -f ${CUDA_DEB_NAME} \ && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/local/cuda-${CUDA_VER_MAJOR}.${CUDA_VER_MINOR} /usr/local/cuda RUN useradd -u $LOCAL_USER_ID -m --user-group --shell /bin/bash rigaya RUN groupmod -og $LOCAL_GROUP_ID rigaya diff --git a/docker/docker_ubuntu2404_cuda12 b/docker/docker_ubuntu2404_cuda12 index 37461a2f..4ec86b04 100644 --- a/docker/docker_ubuntu2404_cuda12 +++ b/docker/docker_ubuntu2404_cuda12 @@ -38,7 +38,8 @@ RUN apt 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} \ && rm -f ${CUDA_DEB_NAME} \ && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/local/cuda-${CUDA_VER_MAJOR}.${CUDA_VER_MINOR} /usr/local/cuda RUN useradd -u $LOCAL_USER_ID -m --user-group --shell /bin/bash rigaya RUN groupmod -og $LOCAL_GROUP_ID rigaya