Rename upstreamVariant to bundleBuild

Author: danieldk

examples/relu-specific-torch/flake.nix

@@ -22,7 +22,7 @@
             "x86_64-linux"
             "aarch64-linux"
           ];
-          upstreamVariant = true;
+          bundleBuild = true;
         }
       ];
     };

lib/build-sets.nix

@@ -59,7 +59,7 @@ let
       torchVersion,
       cxx11Abi,
       system,
-      upstreamVariant ? false,
+      bundleBuild ? false,
     }:
     let
       pkgs =
@@ -80,7 +80,7 @@ let
         buildConfig
         pkgs
         torch
-        upstreamVariant
+        bundleBuild
         ;
     };
 

lib/build-variants.nix

@@ -19,7 +19,7 @@ rec {
     else
       throw "Could not find compute framework: no CUDA or ROCm version specified and Metal is not enabled";
 
-  # Upstream build variants.
+  # Build variants included in bundle builds.
   buildVariants =
     let
       inherit (import ./version-utils.nix { inherit lib; }) abiString flattenVersion;
@@ -39,7 +39,7 @@ rec {
           "torch${flattenVersion version.torchVersion}-${computeString version}-${version.system}"
         else
           "torch${flattenVersion version.torchVersion}-${abiString version.cxx11Abi}-${computeString version}-${version.system}";
-      upstreamVersions = lib.filter (version: version.upstreamVariant or false);
+      bundleBuildVersions = lib.filter (version: version.bundleBuild or false);
     in
     lib.foldl' (
       acc: version:
@@ -51,5 +51,5 @@ rec {
         pathVersions = lib.attrByPath path [ ] acc ++ [ (buildName version) ];
       in
       lib.recursiveUpdate acc (lib.setAttrByPath path pathVersions)
-    ) { } (flattenSystems (upstreamVersions torchVersions));
+    ) { } (flattenSystems (bundleBuildVersions torchVersions));
 }

lib/build-version.nix

@@ -2,7 +2,7 @@
   buildConfig,
   pkgs,
   torch,
-  upstreamVariant,
+  bundleBuild,
 }:
 let
   inherit (pkgs) lib;

lib/build.nix

@@ -90,7 +90,7 @@ rec {
       buildConfig,
       pkgs,
       torch,
-      upstreamVariant,
+      bundleBuild,
     }:
     {
       path,
@@ -199,10 +199,10 @@ rec {
     let
       # We just need to get any nixpkgs for use by the path join.
       pkgs = (builtins.head buildSets).pkgs;
-      upstreamBuildSets = builtins.filter (buildSet: buildSet.upstreamVariant) buildSets;
+      bundleBuildSets = builtins.filter (buildSet: buildSet.bundleBuild) buildSets;
       extensions = buildDistTorchExtensions {
         inherit path rev doGetKernelCheck;
-        buildSets = upstreamBuildSets;
+        buildSets = bundleBuildSets;
       };
       buildConfig = readBuildConfig path;
       namePaths =

versions.nix

@@ -4,7 +4,7 @@
     cudaVersion = "11.8";
     cxx11Abi = true;
     systems = [ "x86_64-linux" ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
   {
     torchVersion = "2.7";
@@ -13,7 +13,7 @@
     systems = [
       "x86_64-linux"
     ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
   {
     torchVersion = "2.7";
@@ -23,29 +23,29 @@
       "x86_64-linux"
       "aarch64-linux"
     ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
   {
     torchVersion = "2.7";
     rocmVersion = "6.3.4";
     cxx11Abi = true;
     systems = [ "x86_64-linux" ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
   {
     torchVersion = "2.7";
     rocmVersion = "6.4.2";
     cxx11Abi = true;
     systems = [ "x86_64-linux" ];
-    upstreamVariant = false;
+    bundleBuild = false;
   }
 
   {
     torchVersion = "2.7";
     cxx11Abi = true;
     metal = true;
     systems = [ "aarch64-darwin" ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
 
   {
@@ -55,7 +55,7 @@
     systems = [
       "x86_64-linux"
     ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
   {
     torchVersion = "2.8";
@@ -64,7 +64,7 @@
     systems = [
       "x86_64-linux"
     ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
   {
     torchVersion = "2.8";
@@ -74,28 +74,28 @@
       "x86_64-linux"
       "aarch64-linux"
     ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
   {
     torchVersion = "2.8";
     rocmVersion = "6.3.4";
     cxx11Abi = true;
     systems = [ "x86_64-linux" ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
   {
     torchVersion = "2.8";
     rocmVersion = "6.4.2";
     cxx11Abi = true;
     systems = [ "x86_64-linux" ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
   {
     torchVersion = "2.8";
     cxx11Abi = true;
     metal = true;
     systems = [ "aarch64-darwin" ];
-    upstreamVariant = true;
+    bundleBuild = true;
   }
 
   # Non-standard versions; not included in bundle builds.