fix(Linux/Fedora): re-enable CUDA and bump to 12.4.0 (#2247)
This commit is contained in:
Crashdummy
@@ -68,28 +68,27 @@ dnf clean all
|
|||||||
rm -rf /var/cache/yum
|
rm -rf /var/cache/yum
|
||||||
_DEPS
|
_DEPS
|
||||||
|
|
||||||
# todo - enable cuda once it's supported for gcc 13 and fedora 38
|
|
||||||
## install cuda
|
## install cuda
|
||||||
#WORKDIR /build/cuda
|
WORKDIR /build/cuda
|
||||||
## versions: https://developer.nvidia.com/cuda-toolkit-archive
|
## versions: https://developer.nvidia.com/cuda-toolkit-archive
|
||||||
#ENV CUDA_VERSION="12.0.0"
|
ENV CUDA_VERSION="12.4.0"
|
||||||
#ENV CUDA_BUILD="525.60.13"
|
ENV CUDA_BUILD="550.54.14"
|
||||||
## hadolint ignore=SC3010
|
## hadolint ignore=SC3010
|
||||||
#RUN <<_INSTALL_CUDA
|
RUN <<_INSTALL_CUDA
|
||||||
##!/bin/bash
|
#!/bin/bash
|
||||||
#set -e
|
set -e
|
||||||
#cuda_prefix="https://developer.download.nvidia.com/compute/cuda/"
|
cuda_prefix="https://developer.download.nvidia.com/compute/cuda/"
|
||||||
#cuda_suffix=""
|
cuda_suffix=""
|
||||||
#if [[ "${TARGETPLATFORM}" == 'linux/arm64' ]]; then
|
if [[ "${TARGETPLATFORM}" == 'linux/arm64' ]]; then
|
||||||
# cuda_suffix="_sbsa"
|
cuda_suffix="_sbsa"
|
||||||
#fi
|
fi
|
||||||
#url="${cuda_prefix}${CUDA_VERSION}/local_installers/cuda_${CUDA_VERSION}_${CUDA_BUILD}_linux${cuda_suffix}.run"
|
url="${cuda_prefix}${CUDA_VERSION}/local_installers/cuda_${CUDA_VERSION}_${CUDA_BUILD}_linux${cuda_suffix}.run"
|
||||||
#echo "cuda url: ${url}"
|
echo "cuda url: ${url}"
|
||||||
#wget "$url" --progress=bar:force:noscroll -q --show-progress -O ./cuda.run
|
wget "$url" --progress=bar:force:noscroll -q --show-progress -O ./cuda.run
|
||||||
#chmod a+x ./cuda.run
|
chmod a+x ./cuda.run
|
||||||
#./cuda.run --silent --toolkit --toolkitpath=/build/cuda --no-opengl-libs --no-man-page --no-drm
|
./cuda.run --silent --toolkit --toolkitpath=/build/cuda --no-opengl-libs --no-man-page --no-drm
|
||||||
#rm ./cuda.run
|
rm ./cuda.run
|
||||||
#_INSTALL_CUDA
|
_INSTALL_CUDA
|
||||||
|
|
||||||
# copy repository
|
# copy repository
|
||||||
WORKDIR /build/sunshine/
|
WORKDIR /build/sunshine/
|
||||||
@@ -99,12 +98,11 @@ COPY --link .. .
|
|||||||
WORKDIR /build/sunshine/build
|
WORKDIR /build/sunshine/build
|
||||||
|
|
||||||
# cmake and cpack
|
# cmake and cpack
|
||||||
# todo - add cmake argument back in for cuda support "-DCMAKE_CUDA_COMPILER:PATH=/build/cuda/bin/nvcc \"
|
|
||||||
# todo - re-enable "DSUNSHINE_ENABLE_CUDA"
|
|
||||||
RUN <<_MAKE
|
RUN <<_MAKE
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
cmake \
|
cmake \
|
||||||
|
-DCMAKE_CUDA_COMPILER:PATH=/build/cuda/bin/nvcc \
|
||||||
-DBUILD_WERROR=ON \
|
-DBUILD_WERROR=ON \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
@@ -113,7 +111,7 @@ cmake \
|
|||||||
-DSUNSHINE_ENABLE_WAYLAND=ON \
|
-DSUNSHINE_ENABLE_WAYLAND=ON \
|
||||||
-DSUNSHINE_ENABLE_X11=ON \
|
-DSUNSHINE_ENABLE_X11=ON \
|
||||||
-DSUNSHINE_ENABLE_DRM=ON \
|
-DSUNSHINE_ENABLE_DRM=ON \
|
||||||
-DSUNSHINE_ENABLE_CUDA=OFF \
|
-DSUNSHINE_ENABLE_CUDA=ON \
|
||||||
/build/sunshine
|
/build/sunshine
|
||||||
make -j "$(nproc)"
|
make -j "$(nproc)"
|
||||||
cpack -G RPM
|
cpack -G RPM
|
||||||
|
|||||||
@@ -68,28 +68,27 @@ dnf clean all
|
|||||||
rm -rf /var/cache/yum
|
rm -rf /var/cache/yum
|
||||||
_DEPS
|
_DEPS
|
||||||
|
|
||||||
# todo - enable cuda once it's supported for gcc 13 and fedora 39
|
# install cuda
|
||||||
## install cuda
|
WORKDIR /build/cuda
|
||||||
#WORKDIR /build/cuda
|
# versions: https://developer.nvidia.com/cuda-toolkit-archive
|
||||||
## versions: https://developer.nvidia.com/cuda-toolkit-archive
|
ENV CUDA_VERSION="12.4.0"
|
||||||
#ENV CUDA_VERSION="12.0.0"
|
ENV CUDA_BUILD="550.54.14"
|
||||||
#ENV CUDA_BUILD="525.60.13"
|
# hadolint ignore=SC3010
|
||||||
## hadolint ignore=SC3010
|
RUN <<_INSTALL_CUDA
|
||||||
#RUN <<_INSTALL_CUDA
|
#!/bin/bash
|
||||||
##!/bin/bash
|
set -e
|
||||||
#set -e
|
cuda_prefix="https://developer.download.nvidia.com/compute/cuda/"
|
||||||
#cuda_prefix="https://developer.download.nvidia.com/compute/cuda/"
|
cuda_suffix=""
|
||||||
#cuda_suffix=""
|
if [[ "${TARGETPLATFORM}" == 'linux/arm64' ]]; then
|
||||||
#if [[ "${TARGETPLATFORM}" == 'linux/arm64' ]]; then
|
cuda_suffix="_sbsa"
|
||||||
# cuda_suffix="_sbsa"
|
fi
|
||||||
#fi
|
url="${cuda_prefix}${CUDA_VERSION}/local_installers/cuda_${CUDA_VERSION}_${CUDA_BUILD}_linux${cuda_suffix}.run"
|
||||||
#url="${cuda_prefix}${CUDA_VERSION}/local_installers/cuda_${CUDA_VERSION}_${CUDA_BUILD}_linux${cuda_suffix}.run"
|
echo "cuda url: ${url}"
|
||||||
#echo "cuda url: ${url}"
|
wget "$url" --progress=bar:force:noscroll -q --show-progress -O ./cuda.run
|
||||||
#wget "$url" --progress=bar:force:noscroll -q --show-progress -O ./cuda.run
|
chmod a+x ./cuda.run
|
||||||
#chmod a+x ./cuda.run
|
./cuda.run --silent --toolkit --toolkitpath=/build/cuda --no-opengl-libs --no-man-page --no-drm
|
||||||
#./cuda.run --silent --toolkit --toolkitpath=/build/cuda --no-opengl-libs --no-man-page --no-drm
|
rm ./cuda.run
|
||||||
#rm ./cuda.run
|
_INSTALL_CUDA
|
||||||
#_INSTALL_CUDA
|
|
||||||
|
|
||||||
# copy repository
|
# copy repository
|
||||||
WORKDIR /build/sunshine/
|
WORKDIR /build/sunshine/
|
||||||
@@ -99,12 +98,11 @@ COPY --link .. .
|
|||||||
WORKDIR /build/sunshine/build
|
WORKDIR /build/sunshine/build
|
||||||
|
|
||||||
# cmake and cpack
|
# cmake and cpack
|
||||||
# todo - add cmake argument back in for cuda support "-DCMAKE_CUDA_COMPILER:PATH=/build/cuda/bin/nvcc \"
|
|
||||||
# todo - re-enable "DSUNSHINE_ENABLE_CUDA"
|
|
||||||
RUN <<_MAKE
|
RUN <<_MAKE
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
cmake \
|
cmake \
|
||||||
|
-DCMAKE_CUDA_COMPILER:PATH=/build/cuda/bin/nvcc \
|
||||||
-DBUILD_WERROR=ON \
|
-DBUILD_WERROR=ON \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
@@ -113,7 +111,7 @@ cmake \
|
|||||||
-DSUNSHINE_ENABLE_WAYLAND=ON \
|
-DSUNSHINE_ENABLE_WAYLAND=ON \
|
||||||
-DSUNSHINE_ENABLE_X11=ON \
|
-DSUNSHINE_ENABLE_X11=ON \
|
||||||
-DSUNSHINE_ENABLE_DRM=ON \
|
-DSUNSHINE_ENABLE_DRM=ON \
|
||||||
-DSUNSHINE_ENABLE_CUDA=OFF \
|
-DSUNSHINE_ENABLE_CUDA=ON \
|
||||||
/build/sunshine
|
/build/sunshine
|
||||||
make -j "$(nproc)"
|
make -j "$(nproc)"
|
||||||
cpack -G RPM
|
cpack -G RPM
|
||||||
|
|||||||
@@ -43,8 +43,8 @@ Install
|
|||||||
sunshine_{arch}.flatpak 12.0.0 525.60.13 50;52;60;61;62;70;75;80;86;90
|
sunshine_{arch}.flatpak 12.0.0 525.60.13 50;52;60;61;62;70;75;80;86;90
|
||||||
sunshine-debian-bookworm-{arch}.deb 12.0.0 525.60.13 50;52;60;61;62;70;75;80;86;90
|
sunshine-debian-bookworm-{arch}.deb 12.0.0 525.60.13 50;52;60;61;62;70;75;80;86;90
|
||||||
sunshine-debian-bullseye-{arch}.deb 11.8.0 450.80.02 35;50;52;60;61;62;70;75;80;86;90
|
sunshine-debian-bullseye-{arch}.deb 11.8.0 450.80.02 35;50;52;60;61;62;70;75;80;86;90
|
||||||
sunshine-fedora-38-{arch}.rpm unavailable unavailable none
|
sunshine-fedora-38-{arch}.rpm 12.4.0 525.60.13 50;52;60;61;62;70;75;80;86;90
|
||||||
sunshine-fedora-39-{arch}.rpm unavailable unavailable none
|
sunshine-fedora-39-{arch}.rpm 12.4.0 525.60.13 50;52;60;61;62;70;75;80;86;90
|
||||||
sunshine-ubuntu-20.04-{arch}.deb 11.8.0 450.80.02 35;50;52;60;61;62;70;75;80;86;90
|
sunshine-ubuntu-20.04-{arch}.deb 11.8.0 450.80.02 35;50;52;60;61;62;70;75;80;86;90
|
||||||
sunshine-ubuntu-22.04-{arch}.deb 11.8.0 450.80.02 35;50;52;60;61;62;70;75;80;86;90
|
sunshine-ubuntu-22.04-{arch}.deb 11.8.0 450.80.02 35;50;52;60;61;62;70;75;80;86;90
|
||||||
=========================================== ============== ============== ================================
|
=========================================== ============== ============== ================================
|
||||||
|
|||||||
Reference in New Issue
Block a user