mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
tree-wide: cudaPackages.flags updates
Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
This commit is contained in:
parent
765529dfff
commit
ead6581362
7 changed files with 8 additions and 8 deletions
|
@ -46,7 +46,7 @@ stdenv'.mkDerivation rec {
|
||||||
cmakeFlags = lib.optionals cudaSupport [
|
cmakeFlags = lib.optionals cudaSupport [
|
||||||
(lib.cmakeBool "CUDA_ENABLED" true)
|
(lib.cmakeBool "CUDA_ENABLED" true)
|
||||||
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" (
|
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" (
|
||||||
lib.strings.concatStringsSep ";" (map cudaPackages.flags.dropDot cudaCapabilities)
|
lib.strings.concatStringsSep ";" (map cudaPackages.flags.dropDots cudaCapabilities)
|
||||||
))
|
))
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
]
|
]
|
||||||
++ lib.optionals cudaSupport [
|
++ lib.optionals cudaSupport [
|
||||||
(lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (
|
(lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (
|
||||||
builtins.concatStringsSep "," (with cudaPackages.flags; map dropDot cudaCapabilities)
|
builtins.concatStringsSep "," (with cudaPackages.flags; map dropDots cudaCapabilities)
|
||||||
))
|
))
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ let
|
||||||
cuda_nvcc
|
cuda_nvcc
|
||||||
libcublas
|
libcublas
|
||||||
;
|
;
|
||||||
inherit (cudaPackages.flags) cudaCapabilities dropDot isJetsonBuild;
|
inherit (cudaPackages.flags) cudaCapabilities dropDots isJetsonBuild;
|
||||||
in
|
in
|
||||||
backendStdenv.mkDerivation {
|
backendStdenv.mkDerivation {
|
||||||
pname = "gpu-burn";
|
pname = "gpu-burn";
|
||||||
|
@ -53,7 +53,7 @@ backendStdenv.mkDerivation {
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"CUDAPATH=${getBin cuda_nvcc}"
|
"CUDAPATH=${getBin cuda_nvcc}"
|
||||||
"COMPUTE=${last (map dropDot cudaCapabilities)}"
|
"COMPUTE=${last (map dropDots cudaCapabilities)}"
|
||||||
"IS_JETSON=${boolToString isJetsonBuild}"
|
"IS_JETSON=${boolToString isJetsonBuild}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ let
|
||||||
))
|
))
|
||||||
else
|
else
|
||||||
cudaCapability;
|
cudaCapability;
|
||||||
cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString);
|
cudaCapability' = lib.toInt (cudaPackages.flags.dropDots cudaCapabilityString);
|
||||||
|
|
||||||
mklSupport =
|
mklSupport =
|
||||||
assert accelIsValid;
|
assert accelIsValid;
|
||||||
|
|
|
@ -38,7 +38,7 @@ let
|
||||||
))
|
))
|
||||||
else
|
else
|
||||||
cudaCapability;
|
cudaCapability;
|
||||||
cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString);
|
cudaCapability' = lib.toInt (cudaPackages.flags.dropDots cudaCapabilityString);
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "moshi";
|
pname = "moshi";
|
||||||
|
|
|
@ -43,7 +43,7 @@ let
|
||||||
|
|
||||||
cudaCapabilities = lists.subtractLists unsupportedCudaCapabilities flags.cudaCapabilities;
|
cudaCapabilities = lists.subtractLists unsupportedCudaCapabilities flags.cudaCapabilities;
|
||||||
|
|
||||||
cudaArchitecturesString = strings.concatMapStringsSep ";" flags.dropDot cudaCapabilities;
|
cudaArchitecturesString = strings.concatMapStringsSep ";" flags.dropDots cudaCapabilities;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "tiny-cuda-nn";
|
pname = "tiny-cuda-nn";
|
||||||
|
|
|
@ -94,7 +94,7 @@ let
|
||||||
minArch =
|
minArch =
|
||||||
let
|
let
|
||||||
# E.g. [ "80" "86" "90" ]
|
# E.g. [ "80" "86" "90" ]
|
||||||
cudaArchitectures = (builtins.map flags.dropDot flags.cudaCapabilities);
|
cudaArchitectures = (builtins.map flags.dropDots flags.cudaCapabilities);
|
||||||
minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures);
|
minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures);
|
||||||
in
|
in
|
||||||
# "75" -> "750" Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L200-L201
|
# "75" -> "750" Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L200-L201
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue