Remove duplicate build variant name code (#285)

Author: danieldk

flake.nix

@@ -118,7 +118,7 @@
         };
         inherit (nixpkgs) lib;
 
-        buildVersion = import ./lib/build-version.nix;
+        buildName = (import ./lib/build-variants.nix { inherit lib; }).buildName;
 
         buildSets = defaultBuildSetsPerSystem.${system};
 
@@ -152,11 +152,12 @@
                     ++ allOutputs python3Packages.kernels
                     ++ lib.optionals stdenv.hostPlatform.isLinux (allOutputs stdenvGlibc_2_27)
                   );
-                buildSetLinkFarm = buildSet: pkgs.linkFarm (buildVersion buildSet) (buildSetOutputs buildSet);
+                buildSetLinkFarm =
+                  buildSet: pkgs.linkFarm (buildName buildSet.buildConfig) (buildSetOutputs buildSet);
               in
               pkgs.linkFarm "packages-for-cache" (
                 map (buildSet: {
-                  name = buildVersion buildSet;
+                  name = buildName (buildSet.buildConfig);
                   path = buildSetLinkFarm buildSet;
                 }) buildSets
               );
@@ -182,7 +183,7 @@
             # This package set is exposed so that we can prebuild the Torch versions.
             torch = builtins.listToAttrs (
               map (buildSet: {
-                name = buildVersion buildSet;
+                name = buildName (buildSet.buildConfig);
                 value = buildSet.torch;
               }) buildSets
             );

lib/build-version.nix

@@ -12,7 +12,7 @@
 
 let
   abi = torch: if torch.passthru.cxx11Abi then "cxx11" else "cxx98";
-  torchBuildVersion = import ./build-version.nix;
+  buildName = (import ./build-variants.nix { inherit lib; }).buildName;
   supportedCudaCapabilities = builtins.fromJSON (
     builtins.readFile ../build2cmake/src/cuda_supported_archs.json
   );
@@ -171,7 +171,7 @@ rec {
       extensionForTorch =
         { path, rev }:
         buildSet: {
-          name = torchBuildVersion buildSet;
+          name = buildName buildSet.buildConfig;
           value = mkTorchExtension buildSet {
             inherit path rev doGetKernelCheck;
             stripRPath = true;
@@ -235,7 +235,7 @@ rec {
           mkShell = pkgs.mkShell.override { inherit (buildSet.extension) stdenv; };
         in
         {
-          name = torchBuildVersion buildSet;
+          name = buildName buildSet.buildConfig;
           value = mkShell {
             nativeBuildInputs = with pkgs; pythonNativeCheckInputs python3.pkgs;
 
@@ -275,7 +275,7 @@ rec {
           mkShell = pkgs.mkShell.override { inherit (buildSet.extension) stdenv; };
         in
         {
-          name = torchBuildVersion buildSet;
+          name = buildName buildSet.buildConfig;
           value = mkShell {
             nativeBuildInputs =
               with pkgs;