This commit is contained in:
Denis Manherz 2023-12-17 21:03:43 +01:00
parent d12a51a9d5
commit f9fe0957dc
5 changed files with 20 additions and 7 deletions

View file

@ -53,7 +53,7 @@
outputs = { flake-parts, invokeai-src, hercules-ci-effects, ... }@inputs: outputs = { flake-parts, invokeai-src, hercules-ci-effects, ... }@inputs:
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {
perSystem = { system, ... }:{ perSystem = { system, ... }:{
_module.args.pkgs = import inputs.nixpkgs { config.allowUnfree = true; inherit system; }; _module.args.pkgs = import inputs.nixpkgs { config.allowUnfree = true; inherit system; cudaSupport = true; };
legacyPackages = { legacyPackages = {
koboldai = builtins.throw '' koboldai = builtins.throw ''

View file

@ -45,8 +45,8 @@ in
../../packages/realesrgan ../../packages/realesrgan
../../packages/taming-transformers-rom1504 ../../packages/taming-transformers-rom1504
../../packages/tomesd ../../packages/tomesd
../../packages/torch-fidelity #../../packages/torch-fidelity
../../packages/torch-grammar #../../packages/torch-grammar
../../packages/ultralytics ../../packages/ultralytics
../../packages/xformers ../../packages/xformers
../../packages/zipunicode ../../packages/zipunicode
@ -74,8 +74,16 @@ in
]); ]);
}; };
stable-pkgs = import inputs.nixpkgs-stable {
allowUnfree = true;
cudaSupport = true;
inherit system;
};
src = inputs.a1111-src; src = inputs.a1111-src;
mkAutomatic1111Variant = args: pkgs.callPackage ./package.nix ({ inherit src; sd-src = inputs.sd-src; sgm-src = inputs.sgm-src; } // args); mkAutomatic1111Variant = args: pkgs.callPackage ./package.nix ({
inherit src; sd-src = inputs.sd-src; sgm-src = inputs.sgm-src; inherit stable-pkgs pkgs;
} // args);
in in
{ {
packages = { packages = {

View file

@ -4,6 +4,8 @@
, # misc , # misc
lib lib
, src , src
, stable-pkgs
, pkgs
# extra deps # extra deps
}: }:
python3Packages.buildPythonPackage { python3Packages.buildPythonPackage {
@ -36,7 +38,8 @@ python3Packages.buildPythonPackage {
taming-transformers-rom1504 taming-transformers-rom1504
timm timm
tomesd tomesd
torchWithCuda #torchWithCuda
#torch-bin
transformers transformers
xformers xformers
@ -62,7 +65,7 @@ python3Packages.buildPythonPackage {
numexpr #deforum numexpr #deforum
deforum #deforum deforum #deforum
]; ];
patches = [ ./_outputpaths.patch ]; patches = [ ./_outputpaths.patch ];

View file

@ -76,7 +76,7 @@ python3Packages.buildPythonPackage {
huggingface-hub huggingface-hub
easing-functions easing-functions
dynamicprompts dynamicprompts
torchvision torchvision-bin
test-tube test-tube
]; ];
nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook pip ]; nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook pip ];

View file

@ -76,12 +76,14 @@ let
ln -s ${tmpDir}/presets/ $out/presets ln -s ${tmpDir}/presets/ $out/presets
''; '';
textgenPython = python3Packages.python.withPackages (_: with python3Packages; [ textgenPython = python3Packages.python.withPackages (_: with python3Packages; [
aiofiles
accelerate accelerate
bitsandbytes bitsandbytes
colorama colorama
datasets datasets
flexgen flexgen
gradio gradio
gradio-client
llama-cpp-python llama-cpp-python
markdown markdown
numpy numpy