diff --git a/builder/dockerfiles/Dockerfile b/builder/dockerfiles/Dockerfile index b6eb9662..dcf3df66 100644 --- a/builder/dockerfiles/Dockerfile +++ b/builder/dockerfiles/Dockerfile @@ -58,7 +58,7 @@ function ensure_flake_exists { kernel-builder.url = "github:huggingface/kernel-builder"; }; outputs = { self, kernel-builder, }: - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; }; diff --git a/builder/dockerfiles/Dockerfile.user b/builder/dockerfiles/Dockerfile.user index 989553ba..055eec71 100644 --- a/builder/dockerfiles/Dockerfile.user +++ b/builder/dockerfiles/Dockerfile.user @@ -82,7 +82,7 @@ function ensure_flake_exists { }; outputs = { self, kernel-builder, }: - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; }; diff --git a/builder/examples/cutlass-gemm/flake.nix b/builder/examples/cutlass-gemm/flake.nix index 6b4a1287..494897bc 100644 --- a/builder/examples/cutlass-gemm/flake.nix +++ b/builder/examples/cutlass-gemm/flake.nix @@ -10,7 +10,7 @@ self, kernel-builder, }: - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; }; diff --git a/builder/examples/relu-backprop-compile/flake.nix b/builder/examples/relu-backprop-compile/flake.nix index 5b63b7d4..41e51eef 100644 --- a/builder/examples/relu-backprop-compile/flake.nix +++ b/builder/examples/relu-backprop-compile/flake.nix @@ -10,7 +10,7 @@ self, kernel-builder, }: - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; }; diff --git a/builder/examples/relu-compiler-flags/flake.nix b/builder/examples/relu-compiler-flags/flake.nix index 5b63b7d4..41e51eef 100644 --- a/builder/examples/relu-compiler-flags/flake.nix +++ b/builder/examples/relu-compiler-flags/flake.nix @@ -10,7 +10,7 @@ self, kernel-builder, }: - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; }; diff --git a/builder/examples/relu-metal-cpp/flake.nix b/builder/examples/relu-metal-cpp/flake.nix index 5236734d..b5214502 100644 --- a/builder/examples/relu-metal-cpp/flake.nix +++ b/builder/examples/relu-metal-cpp/flake.nix @@ -10,7 +10,7 @@ self, kernel-builder, }: - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; }; diff --git a/builder/examples/relu-specific-torch/flake.nix b/builder/examples/relu-specific-torch/flake.nix index 23e04113..edaf0d69 100644 --- a/builder/examples/relu-specific-torch/flake.nix +++ b/builder/examples/relu-specific-torch/flake.nix @@ -10,7 +10,7 @@ self, kernel-builder, }: - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; torchVersions = defaultVersions: [ diff --git a/builder/examples/relu-torch-bounds/flake.nix b/builder/examples/relu-torch-bounds/flake.nix index 5b63b7d4..41e51eef 100644 --- a/builder/examples/relu-torch-bounds/flake.nix +++ b/builder/examples/relu-torch-bounds/flake.nix @@ -10,7 +10,7 @@ self, kernel-builder, }: - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; }; diff --git a/builder/examples/relu/flake.nix b/builder/examples/relu/flake.nix index 5b63b7d4..41e51eef 100644 --- a/builder/examples/relu/flake.nix +++ b/builder/examples/relu/flake.nix @@ -10,7 +10,7 @@ self, kernel-builder, }: - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; }; diff --git a/builder/examples/silu-and-mul/flake.nix b/builder/examples/silu-and-mul/flake.nix index d6dbf285..29c0cc8f 100644 --- a/builder/examples/silu-and-mul/flake.nix +++ b/builder/examples/silu-and-mul/flake.nix @@ -10,7 +10,7 @@ self, kernel-builder, }: - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; }; diff --git a/builder/lib/gen-flake-outputs.nix b/builder/lib/gen-flake-outputs.nix index d50a5035..f3d1a64f 100644 --- a/builder/lib/gen-flake-outputs.nix +++ b/builder/lib/gen-flake-outputs.nix @@ -18,7 +18,7 @@ let supportedFormat = '' - kernel-builder.lib.genFlakeOutputs { + kernel-builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; }; @@ -30,9 +30,9 @@ let This will not be supported in the future. '' self.lastModifiedDate) else if rev != null then - builtins.warn "`rev` argument of `genFlakeOutputs` is deprecated, pass `self` as follows:\n\n${supportedFormat}" rev + builtins.warn "`rev` argument of `genKernelFlakeOutputs` is deprecated, pass `self` as follows:\n\n${supportedFormat}" rev else - throw "Flake's `self` must be passed to `genFlakeOutputs` as follows:\n\n${supportedFormat}"; + throw "Flake's `self` must be passed to `genKernelFlakeOutputs` as follows:\n\n${supportedFormat}"; revUnderscored = builtins.replaceStrings [ "-" ] [ "_" ] flakeRev; diff --git a/docs/source/builder/nix.md b/docs/source/builder/nix.md index 87c77ddc..c1c90849 100644 --- a/docs/source/builder/nix.md +++ b/docs/source/builder/nix.md @@ -117,7 +117,7 @@ the kernel's `flake.nix` to use the `pythonCheckInputs` option: self, builder, }: - builder.lib.genFlakeOutputs { + builder.lib.genKernelFlakeOutputs { inherit self; path = ./.; @@ -137,7 +137,7 @@ the Nix shells, not the final kernel uploaded to the Hub. `kernel-builder` verifies that a kernel can be imported with the [`kernels`](https://github.com/huggingface/kernels) package. This check can be disabled by passing `doGetKernelCheck = false` -to `genFlakeOutputs`. **Warning:** it is strongly recommended to keep +to `genKernelFlakeOutputs`. **Warning:** it is strongly recommended to keep this check enabled, as it is one of the checks that validates that a kernel is compliant. This option is primarily intended for kernels with `triton.autotune` decorators, which can fail because there is no GPU available diff --git a/flake.nix b/flake.nix index c255dd9a..220a023e 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ # - Per-system build functions. # - `genFlakeOutputs`, which can be used by downstream flakes to make # standardized outputs (for all supported systems). - lib = { + lib = rec { allBuildVariantsJSON = let buildVariants = @@ -65,7 +65,11 @@ torchVersions'; in builtins.toJSON buildVariants; - genFlakeOutputs = + genFlakeOutputs = builtins.warn '' + `genFlakeOutputs` was renamed to `genKernelFlakeOutputs` and will be removed + in kernel-builder 0.14. + '' genKernelFlakeOutputs; + genKernelFlakeOutputs = { path, rev ? null,