Skip to content

Fix torchVersions argument of genKernelFlakeOutputs #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danieldk merged 3 commits into from
Jan 29, 2026
Merged

Fix torchVersions argument of genKernelFlakeOutputs #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c62ee8
Fix `torchVersions` argument of `genKernelFlakeOutputs`
danieldk Jan 28, 2026
0ffe190
Do not add build for every by system to `lib` in kernel flake output
danieldk Jan 28, 2026
29859e2
Fix
danieldk Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions builder/lib/build-sets.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
nixpkgs,
rust-overlay,
torchVersions,
}:

let
Expand All @@ -16,7 +15,7 @@ let

# All build configurations supported by Torch.
buildConfigs =
system:
torchVersions: system:
let
filterMap = f: xs: builtins.filter (x: x != null) (builtins.map f xs);
systemBuildConfigs = filterMap (version: if version.system == system then version else null) (
Expand All @@ -30,7 +29,8 @@ let
in
rec {
mkBuildSets =
systems: lib.concatMap (system: builtins.map mkBuildSet (buildConfigs system)) systems;
torchVersions: systems:
lib.concatMap (system: builtins.map mkBuildSet (buildConfigs torchVersions system)) systems;

# Partition into an attrset { <system> = [ <buildset> ...]; ... }.
partitionBuildSetsBySystem = lib.foldl (
Expand Down
9 changes: 4 additions & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
inherit
(import ./builder/lib/build-sets.nix {
inherit nixpkgs rust-overlay;
torchVersions = torchVersions';
})
mkBuildSets
partitionBuildSetsBySystem
Expand All @@ -39,7 +38,7 @@

torchVersions' = import ./builder/versions.nix;

defaultBuildSets = mkBuildSets systems;
defaultBuildSets = mkBuildSets torchVersions' systems;
defaultBuildSetsPerSystem = partitionBuildSetsBySystem defaultBuildSets;

mkBuildPerSystem =
Expand Down Expand Up @@ -90,7 +89,7 @@
(builtins.isFunction torchVersions)
|| abort "`torchVersions` must be a function taking one argument (the default version set)";
let
buildSets = mkBuildSets systems;
buildSets = mkBuildSets (torchVersions torchVersions') systems;
buildSetPerSystem = partitionBuildSetsBySystem buildSets;
buildPerSystem = mkBuildPerSystem buildSetPerSystem;
in
Expand All @@ -110,8 +109,8 @@
buildSets = buildSetPerSystem.${system};
}
);
}
// defaultBuildPerSystem;
};
#// defaultBuildPerSystem;
in
flake-utils.lib.eachSystem systems (
system:
Expand Down
Loading