Switch to the to-be hf-nix repo (#141)

Author: danieldk

.github/workflows/build_kernel.yaml

@@ -19,7 +19,7 @@ jobs:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v14
         with:
-          name: kernel-builder
+          name: huggingface
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
         env:
           USER: github_runner

.github/workflows/build_kernel_rocm.yaml

@@ -19,7 +19,7 @@ jobs:
           nix_path: nixpkgs=channel:nixos-unstable
       - uses: cachix/cachix-action@v14
         with:
-          name: kernel-builder
+          name: huggingface
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
         env:
           USER: github_runner

.github/workflows/nix_fmt.yaml

@@ -17,4 +17,4 @@ jobs:
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - name: Check formatting
-        run: nix fmt -- -c ./
+        run: nix fmt -- --ci

Dockerfile

@@ -19,7 +19,7 @@ RUN echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf \
     && chown -R 1000:1000 /home/nixuser /nix/var/nix/profiles/per-user/nixuser /nix/var/nix/gcroots/per-user/nixuser \
     # Install necessary packages
     && nix profile install nixpkgs#cachix nixpkgs#git-lfs nixpkgs#gawk \
-    && cachix use kernel-builder 
+    && cachix use huggingface
 
 # Set permissions for Nix directories
 RUN chown -R nixuser:nixuser /nix
@@ -231,4 +231,4 @@ RUN chmod +x /home/nixuser/bin/cli.sh && \
 USER nixuser
 
 # Use the cli.sh script directly
-ENTRYPOINT ["/home/nixuser/bin/cli.sh"]
+ENTRYPOINT ["/home/nixuser/bin/cli.sh"]

docs/nix.md

@@ -17,7 +17,7 @@ and `flake.lock` to your repository, this will ensure that kernel
 builds are reproducible.
 
 Since the kernel builder depends on many packages (e.g. every supported
-PyTorch version), it is recommended to [enable the kernel-builder cache](https://app.cachix.org/cache/kernel-builder)
+PyTorch version), it is recommended to [enable the huggingface cache](https://app.cachix.org/cache/huggingface)
 to avoid expensive rebuilds.
 
 The kernel builder also provides Nix development shells with all Torch

flake.lock

@@ -3,22 +3,18 @@
 
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    #nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
-    nixpkgs.url = "github:danieldk/nixpkgs/cudatoolkit-12.9-kernel-builder";
+    nixpkgs.follows = "hf-nix/nixpkgs";
     flake-compat.url = "github:edolstra/flake-compat";
-    rocm-nix = {
-      url = "github:huggingface/rocm-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    hf-nix.url = "github:huggingface/hf-nix";
   };
 
   outputs =
     {
       self,
       flake-compat,
       flake-utils,
+      hf-nix,
       nixpkgs,
-      rocm-nix,
     }:
     let
       systems = with flake-utils.lib.system; [
@@ -32,7 +28,7 @@
           name = system;
           value = import ./lib/buildsets.nix {
             inherit nixpkgs system;
-            rocm = rocm-nix.overlays.default;
+            hf-nix = hf-nix.overlays.default;
           };
         }) systems
       );
@@ -131,7 +127,7 @@
 
       in
       rec {
-        formatter = pkgs.nixfmt-rfc-style;
+        formatter = pkgs.nixfmt-tree;
 
         packages = rec {
           build2cmake = pkgs.callPackage ./pkgs/build2cmake { };

flake.nix

@@ -1,7 +1,7 @@
 {
   nixpkgs,
   system,
-  rocm,
+  hf-nix,
 }:
 
 let
@@ -56,8 +56,8 @@ let
       rocmSupport = true;
     };
     overlays = [
+      hf-nix
       overlay
-      rocm
     ];
   };
 
@@ -75,6 +75,7 @@ let
             cudaSupport = true;
           };
           overlays = [
+            hf-nix
             overlay
             (overlayForCudaVersion cudaVersion)
           ];
@@ -96,8 +97,8 @@ let
             rocmSupport = true;
           };
           overlays = [
+            hf-nix
             overlay
-            rocm
             (overlayForRocmVersion rocmVersion)
           ];
         };

lib/buildsets.nix

@@ -1,27 +1,6 @@
-final: prev:
-{
-  blas = if final.stdenv.isx86_64 then prev.blas.override { blasProvider = prev.mkl; } else prev.blas;
-  lapack =
-    if final.stdenv.isx86_64 then prev.lapack.override { lapackProvider = prev.mkl; } else prev.blas;
-
+final: prev: {
   cmakeNvccThreadsHook = prev.callPackage ./pkgs/cmake-nvcc-threads-hook { };
 
-  magma-hip =
-    (prev.callPackage ./pkgs/magma {
-      cudaSupport = false;
-      rocmSupport = true;
-    }).magma;
-
-  pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-    (
-      python-self: python-super: with python-self; {
-        torch_2_6 = callPackage ./pkgs/python-modules/torch_2_6 { rocmPackages = final.rocmPackages; };
-
-        torch_2_7 = callPackage ./pkgs/python-modules/torch_2_7 { rocmPackages = final.rocmPackages; };
-      }
-    )
-  ];
-
   # Local packages
 
   kernel-abi-check = prev.callPackage ./pkgs/kernel-abi-check { };
@@ -30,4 +9,3 @@ final: prev:
 
   stdenvGlibc_2_27 = prev.callPackage ./pkgs/stdenv-glibc-2_27 { };
 }
-// (import ./pkgs/cutlass { pkgs = final; })