Unverified Commit c0ecb205 authored by Someone's avatar Someone Committed by GitHub
Browse files

tree-wide: cudaPackages.cudaFlags -> cudaPackages.flags (#406545)

parents 6e7174e9 4938f79c

pkgs/applications/science/misc/colmap/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
  qt5,

  xorg,

  cudaSupport ? config.cudaSupport,

  cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities,

  cudaCapabilities ? cudaPackages.flags.cudaCapabilities,

  cudaPackages,

}:
@@ -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.cudaFlags.dropDot cudaCapabilities)

      lib.strings.concatStringsSep ";" (map cudaPackages.flags.dropDot cudaCapabilities)

    ))

  ];

pkgs/by-name/gp/gpu-burn/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ let 
    cuda_nvcc

    libcublas

    ;

  inherit (cudaPackages.cudaFlags) cudaCapabilities dropDot isJetsonBuild;

  inherit (cudaPackages.flags) cudaCapabilities dropDot isJetsonBuild;

in

backendStdenv.mkDerivation {

  pname = "gpu-burn";

pkgs/by-name/ko/koboldcpp/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
  cublasSupport ? config.cudaSupport,

  # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/

  # For example if you're on an RTX 3060 that means you're using "Ampere" and you need to pass "sm_86"

  cudaArches ? cudaPackages.cudaFlags.realArches or [ ],

  cudaArches ? cudaPackages.flags.realArches or [ ],



  clblastSupport ? stdenv.hostPlatform.isLinux,

  clblast,

pkgs/by-name/mi/mistral-rs/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ let 
    (acceleration == "cuda") || (config.cudaSupport && acceleration == null);



  minRequiredCudaCapability = "6.1"; # build fails with 6.0

  inherit (cudaPackages.cudaFlags) cudaCapabilities;

  inherit (cudaPackages.flags) cudaCapabilities;

  cudaCapabilityString =

    if cudaCapability == null then

      (builtins.head (
@@ -60,7 +60,7 @@ let 
      ))

    else

      cudaCapability;

  cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString);

  cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString);



  mklSupport =

    assert accelIsValid;

pkgs/by-name/mo/moshi/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


let

  minRequiredCudaCapability = "6.1"; # build fails with 6.0

  inherit (cudaPackages.cudaFlags) cudaCapabilities;

  inherit (cudaPackages.flags) cudaCapabilities;

  cudaCapabilityString =

    if cudaCapability == null then

      (builtins.head (
@@ -38,7 +38,7 @@ let 
      ))

    else

      cudaCapability;

  cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString);

  cudaCapability' = lib.toInt (cudaPackages.flags.dropDot cudaCapabilityString);

in

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "moshi";