treewide: remove already‐obsolete CUDA version conditions
This commit is contained in:
@@ -44,10 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
shopt -s globstar
|
||||
for cmakelists in **/CMakeLists.*; do
|
||||
sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists
|
||||
${lib.optionalString (cudaPackages.cudaOlder "11.8") ''
|
||||
sed -i 's/-gencode=arch=compute_89,code=sm_89//g' $cmakelists
|
||||
sed -i 's/-gencode=arch=compute_90,code=sm_90//g' $cmakelists
|
||||
''}
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
autoPatchelfHook,
|
||||
blas,
|
||||
cmake,
|
||||
cudaPackages_11 ? null,
|
||||
cudaPackages,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
fetchurl,
|
||||
@@ -158,11 +157,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cuda_cudart # cuda_runtime.h
|
||||
libcublas # cublas_v2.h
|
||||
libcusparse # cusparse.h
|
||||
]
|
||||
++ lists.optionals (cudaOlder "11.8") [
|
||||
cuda_nvprof # <cuda_profiler_api.h>
|
||||
]
|
||||
++ lists.optionals (cudaAtLeast "11.8") [
|
||||
cuda_profiler_api # <cuda_profiler_api.h>
|
||||
]
|
||||
)
|
||||
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Remove this once a release is made with
|
||||
# https://github.com/NVlabs/tiny-cuda-nn/commit/78a14fe8c292a69f54e6d0d47a09f52b777127e1
|
||||
postPatch = lib.optionals (cudaAtLeast "11.0") ''
|
||||
postPatch = ''
|
||||
substituteInPlace bindings/torch/setup.py --replace-fail \
|
||||
"-std=c++14" "-std=c++17"
|
||||
'';
|
||||
|
||||
@@ -194,7 +194,6 @@ effectiveStdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
|
||||
homepage = "https://github.com/dmlc/xgboost";
|
||||
broken = cudaSupport && cudaPackages.cudaOlder "11.4";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "xgboost";
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -114,7 +114,7 @@ in
|
||||
xorg.libXtst
|
||||
]
|
||||
# NOTE(@connorbaker): Seems to be required only for aarch64-linux.
|
||||
++ lib.optionals (stdenv.hostPlatform.isAarch64 && cudaAtLeast "11.8") [
|
||||
++ lib.optionals stdenv.hostPlatform.isAarch64 [
|
||||
gst_all_1.gst-plugins-bad
|
||||
];
|
||||
|
||||
|
||||
@@ -74,17 +74,11 @@ let
|
||||
# The subdirectories in lib/ tell us which versions of CUDA are supported.
|
||||
# Typically the names will look like this:
|
||||
#
|
||||
# - 10.2
|
||||
# - 11
|
||||
# - 11.0
|
||||
# - 12
|
||||
|
||||
# libPath :: String
|
||||
libPath =
|
||||
let
|
||||
cudaMajorVersion = versions.major cudaMajorMinorVersion;
|
||||
in
|
||||
if cudaMajorMinorVersion == "10.2" then cudaMajorMinorVersion else cudaMajorVersion;
|
||||
libPath = versions.major cudaMajorMinorVersion;
|
||||
|
||||
# A release is supported if it has a libPath that matches our CUDA version for our platform.
|
||||
# LibPath are not constant across the same release -- one platform may support fewer
|
||||
|
||||
@@ -99,6 +99,6 @@ stdenv'.mkDerivation rec {
|
||||
hexa
|
||||
misuzu
|
||||
];
|
||||
broken = (cudaPackages.cudaOlder "11.4") || !(withCuDNN -> withCUDA);
|
||||
broken = !(withCuDNN -> withCUDA);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -552,10 +552,7 @@ buildPythonPackage rec {
|
||||
# Some platforms do not support NCCL (i.e., Jetson)
|
||||
nccl # Provides nccl.h AND a static copy of NCCL!
|
||||
]
|
||||
++ lists.optionals (cudaOlder "11.8") [
|
||||
cuda_nvprof # <cuda_profiler_api.h>
|
||||
]
|
||||
++ lists.optionals (cudaAtLeast "11.8") [
|
||||
++ [
|
||||
cuda_profiler_api # <cuda_profiler_api.h>
|
||||
]
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user