Merge pull request #267334 from mweinelt/config-rocmSupport

config.rocmSupport: init option
This commit is contained in:
Connor Baker 2023-11-14 08:42:06 -05:00 committed by GitHub
commit a5f2970269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 6 deletions

View File

@ -10,7 +10,7 @@
, cudaSupport ? config.cudaSupport
, cudaPackages ? { }
, rocmSupport ? false
, rocmSupport ? config.rocmSupport
, rocmPackages ? { }
, openclSupport ? false

View File

@ -8,8 +8,9 @@
, libxml2
, libffi
, makeWrapper
, config
, rocmPackages
, rocmSupport ? false
, rocmSupport ? config.rocmSupport
}:
let
inherit (llvmPackages_15) stdenv;

View File

@ -24,7 +24,8 @@
, libpthreadstubs
, magmaRelease
, ninja
, rocmSupport ? false
, config
, rocmSupport ? config.rocmSupport
, static ? false
, stdenv
, symlinkJoin

View File

@ -42,8 +42,9 @@
pythonOlder,
# ROCm dependencies
rocmSupport ? false,
gpuTargets ? [ ], rocmPackages
rocmSupport ? config.rocmSupport,
rocmPackages,
gpuTargets ? [ ]
}:
let

View File

@ -123,6 +123,12 @@ let
feature = "build packages with CUDA support by default";
};
rocmSupport = mkMassRebuild {
type = types.bool;
default = false;
feature = "build packages with ROCm support by default";
};
showDerivationWarnings = mkOption {
type = types.listOf (types.enum [ "maintainerless" ]);
default = [];

View File

@ -14086,7 +14086,6 @@ self: super: with self; {
toposort = callPackage ../development/python-modules/toposort { };
torch = callPackage ../development/python-modules/torch {
inherit (pkgs.config) cudaSupport;
magma =
if pkgs.config.cudaSupport
then pkgs.magma-cuda-static