Merge pull request #264214 from mweinelt/wyoming-faster-whisper-device-param

nixos/wyoming/faster-whisper: pass device config to executable

authored by Martin Weinelt and committed by GitHub 3f224f06 b19b8779

+19 -1
+1
nixos/modules/services/audio/wyoming/faster-whisper.nix
··· 138 138 --data-dir $STATE_DIRECTORY \ 139 139 --download-dir $STATE_DIRECTORY \ 140 140 --uri ${options.uri} \ 141 + --device ${options.device} \ 141 142 --model ${options.model} \ 142 143 --language ${options.language} \ 143 144 --beam-size ${options.beamSize} ${options.extraArgs}
+13
pkgs/development/libraries/ctranslate2/default.nix
··· 5 5 , darwin # Accelerate 6 6 , llvmPackages # openmp 7 7 , withMkl ? false, mkl 8 + , withCUDA ? false 9 + , withCuDNN ? false 10 + , cudaPackages 8 11 # Enabling both withOneDNN and withOpenblas is broken 9 12 # https://github.com/OpenNMT/CTranslate2/issues/1294 10 13 , withOneDNN ? false, oneDNN ··· 33 36 34 37 nativeBuildInputs = [ 35 38 cmake 39 + ] ++ lib.optionals withCUDA [ 40 + cudaPackages.cuda_nvcc 36 41 ]; 37 42 38 43 cmakeFlags = [ ··· 40 45 # https://github.com/OpenNMT/CTranslate2/blob/54810350e662ebdb01ecbf8e4a746f02aeff1dd7/python/tools/prepare_build_environment_linux.sh#L53 41 46 # https://github.com/OpenNMT/CTranslate2/blob/59d223abcc7e636c1c2956e62482bc3299cc7766/python/tools/prepare_build_environment_macos.sh#L12 42 47 "-DOPENMP_RUNTIME=COMP" 48 + "-DWITH_CUDA=${cmakeBool withCUDA}" 49 + "-DWITH_CUDNN=${cmakeBool withCuDNN}" 43 50 "-DWITH_DNNL=${cmakeBool withOneDNN}" 44 51 "-DWITH_OPENBLAS=${cmakeBool withOpenblas}" 45 52 "-DWITH_RUY=${cmakeBool withRuy}" ··· 49 56 50 57 buildInputs = lib.optionals withMkl [ 51 58 mkl 59 + ] ++ lib.optionals withCUDA [ 60 + cudaPackages.cuda_cudart 61 + cudaPackages.libcublas 62 + cudaPackages.libcurand 63 + ] ++ lib.optionals withCuDNN [ 64 + cudaPackages.cudnn 52 65 ] ++ lib.optionals withOneDNN [ 53 66 oneDNN 54 67 ] ++ lib.optionals withOpenblas [
+5 -1
pkgs/top-level/all-packages.nix
··· 20947 20947 20948 20948 cpp-jwt = callPackage ../development/libraries/cpp-jwt { }; 20949 20949 20950 - ctranslate2 = callPackage ../development/libraries/ctranslate2 { }; 20950 + ctranslate2 = callPackage ../development/libraries/ctranslate2 { 20951 + stdenv = if pkgs.config.cudaSupport then gcc11Stdenv else stdenv; 20952 + withCUDA = pkgs.config.cudaSupport; 20953 + withCuDNN = pkgs.config.cudaSupport; 20954 + }; 20951 20955 20952 20956 ubus = callPackage ../development/libraries/ubus { }; 20953 20957