Merge remote-tracking branch 'origin/main' into move-cmake-to-common

Author: danieldk

build2cmake/src/torch/kernel.rs

@@ -51,7 +51,7 @@ fn render_kernel_component(
     Ok(())
 }
 
-pub fn render_kernel_component_cpu(
+fn render_kernel_component_cpu(
     env: &Environment,
     kernel_name: &str,
     kernel: &Kernel,
@@ -134,7 +134,7 @@ fn render_kernel_component_cuda(
     Ok(())
 }
 
-pub fn render_kernel_component_metal(
+fn render_kernel_component_metal(
     env: &Environment,
     kernel_name: &str,
     kernel: &Kernel,
@@ -159,7 +159,7 @@ pub fn render_kernel_component_metal(
     Ok(())
 }
 
-pub fn render_kernel_component_xpu(
+fn render_kernel_component_xpu(
     env: &Environment,
     kernel_name: &str,
     kernel: &Kernel,

builder/lib/build-sets.nix

@@ -1,7 +1,6 @@
 {
   nixpkgs,
   rust-overlay,
-  torchVersions,
 }:
 
 let
@@ -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) (
@@ -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 (

flake.nix

@@ -23,7 +23,6 @@
       inherit
         (import ./builder/lib/build-sets.nix {
           inherit nixpkgs rust-overlay;
-          torchVersions = torchVersions';
         })
         mkBuildSets
         partitionBuildSetsBySystem
@@ -39,7 +38,7 @@
 
       torchVersions' = import ./builder/versions.nix;
 
-      defaultBuildSets = mkBuildSets systems;
+      defaultBuildSets = mkBuildSets torchVersions' systems;
       defaultBuildSetsPerSystem = partitionBuildSetsBySystem defaultBuildSets;
 
       mkBuildPerSystem =
@@ -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
@@ -110,8 +109,8 @@
               buildSets = buildSetPerSystem.${system};
             }
           );
-      }
-      // defaultBuildPerSystem;
+      };
+      #// defaultBuildPerSystem;
     in
     flake-utils.lib.eachSystem systems (
       system: