Merge remote-tracking branch 'origin/main' into remove-backend

Author: danieldk

builder/lib/build.nix

@@ -217,7 +217,17 @@ rec {
         bundleOnly = true;
       };
       buildToml = readBuildConfig path;
-      contents = builtins.map (pkg: toString pkg) (builtins.attrValues extensions);
+      benchmarksPath = path + "/benchmarks";
+      hasBenchmarks = builtins.pathExists benchmarksPath;
+      benchmarks =
+        with lib.fileset;
+        toSource {
+          root = path;
+          fileset = maybeMissing benchmarksPath;
+        };
+      contents =
+        builtins.map (pkg: toString pkg) (builtins.attrValues extensions)
+        ++ lib.optionals hasBenchmarks [ (toString benchmarks) ];
     in
     import ./join-paths {
       inherit pkgs contents;

builder/lib/join-paths/default.nix

@@ -16,8 +16,6 @@ let
     "pkgs"
     "namePaths"
   ];
-  # Iterating over pairs in bash sucks, so let's generate
-  # the commands in Nix instead.
   copyPkg = pkg: ''
     cp -r ${pkg}/* ${placeholder "out"}/
   '';

kernels/pyproject.toml

@@ -3,10 +3,8 @@ name = "kernels"
 version = "0.12.2.dev0"
 description = "Download compute kernels"
 authors = [
-  { name = "OlivierDehaene", email = "olivier@huggingface.co" },
   { name = "Daniel de Kok", email = "daniel@huggingface.co" },
   { name = "David Holtz", email = "david@huggingface.co" },
-  { name = "Nicolas Patry", email = "nicolas@huggingface.co" },
 ]
 license = { text = "Apache-2.0" }
 readme = "README.md"