diff --git a/envs/python312.nix b/envs/python312.nix index 7c6fefa..d821a35 100644 --- a/envs/python312.nix +++ b/envs/python312.nix @@ -12,6 +12,9 @@ python312Packages.virtualenv (if enableTensorflow then python312Packages.tensorflowWithCuda else null) + (if enableTensorflow then (python312Packages.keras.override { tensorflow = python312Packages.tensorflowWithCuda; }) else null) + + (if enablePyTorch then python312Packages.torchvision else null) (if enablePyTorch then python312Packages.torchaudio else null) diff --git a/flake.lock b/flake.lock index 1a93702..8ceb4f9 100644 --- a/flake.lock +++ b/flake.lock @@ -219,11 +219,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1728089391, - "narHash": "sha256-gnd2dUScLBsBlfxPBqYWKAN2xdtqXjlc+h40gMIw6cw=", + "lastModified": 1728604720, + "narHash": "sha256-VN8P8Ccxe4KLqvgwfb28WZ4h8hRFbdMcOzaaSGEvv3o=", "owner": "C4theBomb", "repo": "dotfiles", - "rev": "dc363f89c37705933cb38c91c4d4188cccef8749", + "rev": "b8fddd98a667fc9aec584695cb5b04258a975766", "type": "github" }, "original": { diff --git a/inputs/dotfiles b/inputs/dotfiles index dc363f8..b8fddd9 160000 --- a/inputs/dotfiles +++ b/inputs/dotfiles @@ -1 +1 @@ -Subproject commit dc363f89c37705933cb38c91c4d4188cccef8749 +Subproject commit b8fddd98a667fc9aec584695cb5b04258a975766 diff --git a/system/services/slurm.nix b/system/services/slurm.nix index 25350f2..5ff2b93 100644 --- a/system/services/slurm.nix +++ b/system/services/slurm.nix @@ -43,9 +43,12 @@ in AccountingStorageTRES=gres/gpu JobAcctGatherType=jobacct_gather/linux + + TaskProlog=${inputs.dotfiles + "/slurm/config/prolog.sh"} + TaskEpilog=${inputs.dotfiles + "/slurm/config/epilog.sh"} ''; - extraConfigPaths = [ (inputs.dotfiles + "/slurm") ]; + extraConfigPaths = [ (inputs.dotfiles + "/slurm/config") ]; dbdserver = { enable = (config.networking.hostName == primaryHost);