tree-wide: cudaPackages.flags updates

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
This commit is contained in:
Connor Baker 2025-05-15 20:49:17 +00:00
parent 765529dfff
commit ead6581362
7 changed files with 8 additions and 8 deletions

View file

@ -46,7 +46,7 @@ stdenv'.mkDerivation rec {
cmakeFlags = lib.optionals cudaSupport [
(lib.cmakeBool "CUDA_ENABLED" true)
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" (
lib.strings.concatStringsSep ";" (map cudaPackages.flags.dropDot cudaCapabilities)
lib.strings.concatStringsSep ";" (map cudaPackages.flags.dropDots cudaCapabilities)
))
];

View file

@ -42,7 +42,7 @@
]
++ lib.optionals cudaSupport [
(lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (
builtins.concatStringsSep "," (with cudaPackages.flags; map dropDot cudaCapabilities)
builtins.concatStringsSep "," (with cudaPackages.flags; map dropDots cudaCapabilities)
))
];

View file

@ -17,7 +17,7 @@ let
cuda_nvcc
libcublas
;
inherit (cudaPackages.flags) cudaCapabilities dropDot isJetsonBuild;
inherit (cudaPackages.flags) cudaCapabilities dropDots isJetsonBuild;
in
backendStdenv.mkDerivation {
pname = "gpu-burn";
@ -53,7 +53,7 @@ backendStdenv.mkDerivation {
makeFlags = [
"CUDAPATH=${getBin cuda_nvcc}"
"COMPUTE=${last (map dropDot cudaCapabilities)}"
"COMPUTE=${last (map dropDots cudaCapabilities)}"
"IS_JETSON=${boolToString isJetsonBuild}"
];

View file

@ -60,7 +60,7 @@ let
))
else
cudaCapability;
cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString);
cudaCapability' = lib.toInt (cudaPackages.flags.dropDots cudaCapabilityString);
mklSupport =
assert accelIsValid;

View file

@ -38,7 +38,7 @@ let
))
else
cudaCapability;
cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString);
cudaCapability' = lib.toInt (cudaPackages.flags.dropDots cudaCapabilityString);
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "moshi";

View file

@ -43,7 +43,7 @@ let
cudaCapabilities = lists.subtractLists unsupportedCudaCapabilities flags.cudaCapabilities;
cudaArchitecturesString = strings.concatMapStringsSep ";" flags.dropDot cudaCapabilities;
cudaArchitecturesString = strings.concatMapStringsSep ";" flags.dropDots cudaCapabilities;
in
stdenv.mkDerivation (finalAttrs: {
pname = "tiny-cuda-nn";

View file

@ -94,7 +94,7 @@ let
minArch =
let
# 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);
in
# "75" -> "750" Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L200-L201