diff --git a/.github/workflows/build_kernel_macos.yaml b/.github/workflows/build_kernel_macos.yaml index 3d098c06..905a05bd 100644 --- a/.github/workflows/build_kernel_macos.yaml +++ b/.github/workflows/build_kernel_macos.yaml @@ -28,7 +28,7 @@ jobs: # For now we only test that there are no regressions in building macOS # kernels. Also run tests once we have a macOS runner. - name: Build relu kernel - run: ( cd examples/kernels/relu && nix build .\#redistributable.torch210-metal-aarch64-darwin -L ) + run: ( cd examples/kernels/relu && nix build .\#redistributable.torch211-metal-aarch64-darwin -L ) - name: Build relu metal cpp kernel - run: ( cd examples/kernels/relu-metal-cpp && nix build .\#redistributable.torch210-metal-aarch64-darwin -L ) + run: ( cd examples/kernels/relu-metal-cpp && nix build .\#redistributable.torch211-metal-aarch64-darwin -L ) diff --git a/.github/workflows/build_kernel_rocm.yaml b/.github/workflows/build_kernel_rocm.yaml index 5d3c4969..eaea43e5 100644 --- a/.github/workflows/build_kernel_rocm.yaml +++ b/.github/workflows/build_kernel_rocm.yaml @@ -34,7 +34,7 @@ jobs: # For now we only test that there are no regressions in building ROCm # kernels. Also run tests once we have a ROCm runner. - name: Build relu kernel - run: ( cd examples/kernels/relu && nix build .\#redistributable.torch210-cxx11-rocm70-x86_64-linux -L ) + run: ( cd examples/kernels/relu && nix build .\#redistributable.torch211-cxx11-rocm71-x86_64-linux -L ) - name: Build relu kernel (compiler flags) - run: ( cd examples/kernels/relu-compiler-flags && nix build .\#redistributable.torch210-cxx11-rocm70-x86_64-linux ) + run: ( cd examples/kernels/relu-compiler-flags && nix build .\#redistributable.torch211-cxx11-rocm71-x86_64-linux ) diff --git a/.github/workflows/build_kernel_xpu.yaml b/.github/workflows/build_kernel_xpu.yaml index 4abe7cfa..507fa7bc 100644 --- a/.github/workflows/build_kernel_xpu.yaml +++ b/.github/workflows/build_kernel_xpu.yaml @@ -34,13 +34,13 @@ jobs: # For now we only test that there are no regressions in building XPU # kernels. Also run tests once we have a XPU runner. - name: Build relu kernel - run: ( cd examples/kernels/relu && nix build .\#redistributable.torch210-cxx11-xpu20253-x86_64-linux -L ) + run: ( cd examples/kernels/relu && nix build .\#redistributable.torch211-cxx11-xpu20253-x86_64-linux -L ) - name: Build relu tvm-ffi kernel run: ( cd examples/kernels/relu-tvm-ffi && nix build .\#redistributable.tvm-ffi01-xpu20253-x86_64-linux -L ) - name: Build relu kernel (compiler flags) - run: ( cd examples/kernels/relu-compiler-flags && nix build .\#redistributable.torch210-cxx11-xpu20253-x86_64-linux ) + run: ( cd examples/kernels/relu-compiler-flags && nix build .\#redistributable.torch211-cxx11-xpu20253-x86_64-linux ) - name: Build cutlass-gemm kernel - run: ( cd examples/kernels/cutlass-gemm && nix build .\#redistributable.torch210-cxx11-xpu20253-x86_64-linux -L ) + run: ( cd examples/kernels/cutlass-gemm && nix build .\#redistributable.torch211-cxx11-xpu20253-x86_64-linux -L ) diff --git a/.github/workflows/test_kernels.yaml b/.github/workflows/test_kernels.yaml index 7c2875c5..44dfaada 100644 --- a/.github/workflows/test_kernels.yaml +++ b/.github/workflows/test_kernels.yaml @@ -26,8 +26,8 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ["3.10", "3.12"] - torch-version: ["2.10.0", "2.11.0"] + python-version: ["3.10", "3.14"] + torch-version: ["2.11.0", "2.12.0"] env: UV_PYTHON_PREFERENCE: only-managed diff --git a/docs/source/builder/build-variants.md b/docs/source/builder/build-variants.md index ffebba64..7d042cc2 100644 --- a/docs/source/builder/build-variants.md +++ b/docs/source/builder/build-variants.md @@ -7,27 +7,21 @@ available. This list will be updated as new PyTorch versions are released. ## CPU aarch64-darwin -- `torch210-cpu-aarch64-darwin` - `torch211-cpu-aarch64-darwin` - `torch212-cpu-aarch64-darwin` ## Metal aarch64-darwin -- `torch210-metal-aarch64-darwin` - `torch211-metal-aarch64-darwin` - `torch212-metal-aarch64-darwin` ## CPU aarch64-linux -- `torch210-cxx11-cpu-aarch64-linux` - `torch211-cxx11-cpu-aarch64-linux` - `torch212-cxx11-cpu-aarch64-linux` ## CUDA aarch64-linux -- `torch210-cxx11-cu126-aarch64-linux` -- `torch210-cxx11-cu128-aarch64-linux` -- `torch210-cxx11-cu130-aarch64-linux` - `torch211-cxx11-cu126-aarch64-linux` - `torch211-cxx11-cu128-aarch64-linux` - `torch211-cxx11-cu130-aarch64-linux` @@ -37,15 +31,11 @@ available. This list will be updated as new PyTorch versions are released. ## CPU x86_64-linux -- `torch210-cxx11-cpu-x86_64-linux` - `torch211-cxx11-cpu-x86_64-linux` - `torch212-cxx11-cpu-x86_64-linux` ## CUDA x86_64-linux -- `torch210-cxx11-cu126-x86_64-linux` -- `torch210-cxx11-cu128-x86_64-linux` -- `torch210-cxx11-cu130-x86_64-linux` - `torch211-cxx11-cu126-x86_64-linux` - `torch211-cxx11-cu128-x86_64-linux` - `torch211-cxx11-cu130-x86_64-linux` @@ -55,8 +45,6 @@ available. This list will be updated as new PyTorch versions are released. ## ROCm x86_64-linux -- `torch210-cxx11-rocm70-x86_64-linux` -- `torch210-cxx11-rocm71-x86_64-linux` - `torch211-cxx11-rocm71-x86_64-linux` - `torch211-cxx11-rocm72-x86_64-linux` - `torch212-cxx11-rocm71-x86_64-linux` @@ -64,7 +52,6 @@ available. This list will be updated as new PyTorch versions are released. ## XPU x86_64-linux -- `torch210-cxx11-xpu20253-x86_64-linux` - `torch211-cxx11-xpu20253-x86_64-linux` - `torch212-cxx11-xpu20253-x86_64-linux` diff --git a/examples/kernels/flake.nix b/examples/kernels/flake.nix index d84913d2..1cbdf618 100644 --- a/examples/kernels/flake.nix +++ b/examples/kernels/flake.nix @@ -84,7 +84,7 @@ drv = sys: out: out.packages.${sys}.default; torchVersions = _defaultVersions: [ { - torchVersion = "2.10"; + torchVersion = "2.11"; cudaVersion = "12.8"; systems = [ "x86_64-linux" diff --git a/examples/kernels/relu-specific-torch/flake.nix b/examples/kernels/relu-specific-torch/flake.nix index 2cc2aa3b..7ba122af 100644 --- a/examples/kernels/relu-specific-torch/flake.nix +++ b/examples/kernels/relu-specific-torch/flake.nix @@ -15,7 +15,7 @@ path = ./.; torchVersions = defaultVersions: [ { - torchVersion = "2.10"; + torchVersion = "2.11"; cudaVersion = "12.8"; systems = [ "x86_64-linux" diff --git a/examples/kernels/relu-torch-bounds/build.toml b/examples/kernels/relu-torch-bounds/build.toml index c054d276..43883b40 100644 --- a/examples/kernels/relu-torch-bounds/build.toml +++ b/examples/kernels/relu-torch-bounds/build.toml @@ -11,8 +11,8 @@ backends = [ repo-id = "kernels-test/relu-torch-bounds" [torch] -minver = "2.10" -maxver = "2.10" +minver = "2.11" +maxver = "2.11" src = [ "torch-ext/torch_binding.cpp", "torch-ext/torch_binding.h", diff --git a/kernels/tests/kernel_locking/kernels.lock b/kernels/tests/kernel_locking/kernels.lock index a56eec14..0cfd65d8 100644 --- a/kernels/tests/kernel_locking/kernels.lock +++ b/kernels/tests/kernel_locking/kernels.lock @@ -1,14 +1,14 @@ [ { "repo_id": "kernels-community/relu", - "sha": "468c458e7cfb386377d1f521bc2b8c77d1eb2562", + "sha": "b0626dd282b2be0eaca55e216d3e39b519912f75", "variants": { "torch-ext": { "hash": "sha256-fa95388531c6280130219f0e73e5daf521116da6c841fa5ab6a190c7994767d8", "hash_type": "git_lfs_concat" }, "torch210-cpu-aarch64-darwin": { - "hash": "sha256-e0492802726713ff5ec3362350d95ddde207c39c16a2ebad4bfc42a51b15b593", + "hash": "sha256-28a2cea5757a8d310d0ea09f77e543791191ef4632bec5806460c3c85ddbfbab", "hash_type": "git_lfs_concat" }, "torch210-cu128-x86_64-windows": { @@ -16,51 +16,51 @@ "hash_type": "git_lfs_concat" }, "torch210-cxx11-cpu-aarch64-linux": { - "hash": "sha256-e2c191aa0bd6b761867f17c1264547b73f63bffda0f0e8131d3f253935e1c4a1", + "hash": "sha256-13aaf95a93ca90956f4111271d30b9f4a6329a69e6fa008d8353d776c555e0c6", "hash_type": "git_lfs_concat" }, "torch210-cxx11-cpu-x86_64-linux": { - "hash": "sha256-12818400aa094e343ed02d94d61243fa5a81e222b1c3ef81d5a1b46026914e4c", + "hash": "sha256-fbc59521ce8c0be4fd24cd011e24d6d999e8eca1871284af73500c9345ed3d13", "hash_type": "git_lfs_concat" }, "torch210-cxx11-cu126-aarch64-linux": { - "hash": "sha256-6b20165a41b9cd4fc72722d66dd9f12d9bdfee1eb5c3059cd115b11af906759f", + "hash": "sha256-ad1f87c8d39bce651ecc949b5bf52107fbfceec5560a504e7cdb640dd167dd1a", "hash_type": "git_lfs_concat" }, "torch210-cxx11-cu126-x86_64-linux": { - "hash": "sha256-bc8ec6e982d9fdff7366090a6623ae1ad38f6f35eaacd792e23f10aa9e9ab7b6", + "hash": "sha256-eeb332c30e4a65d2b7a43efe9c905480182b9f1332ce1154604a511220b7fde8", "hash_type": "git_lfs_concat" }, "torch210-cxx11-cu128-aarch64-linux": { - "hash": "sha256-8cd1a1e36477a224b4de6441440fa3265672a7cfbb9289f57b11800ef3e809bd", + "hash": "sha256-ba31e1501ba03c6f9457cc22de7e1a33b4b0f7563a31bdefe78d59e9f1f1a3c3", "hash_type": "git_lfs_concat" }, "torch210-cxx11-cu128-x86_64-linux": { - "hash": "sha256-c0be23298e650e705b5b7cb6db00fb65b8beeee39dcbc0718221f16802eccc07", + "hash": "sha256-a1917971ab09d73c28089a8fa9f3c6a6634a6817fecd6fbc6167bb6983451642", "hash_type": "git_lfs_concat" }, "torch210-cxx11-cu130-aarch64-linux": { - "hash": "sha256-a1bc582a87834c6728c50f69f8a954d03e3dc73cce2f775d0bc6f1c42a1d40dd", + "hash": "sha256-6f5dd29d726471608e4e3b7f56926545582ad875ed143fa1789dd0a76f26787a", "hash_type": "git_lfs_concat" }, "torch210-cxx11-cu130-x86_64-linux": { - "hash": "sha256-cfbcb3fe7c3417c64502f84b97ddeb4d4f6c2e9bd1bc7d155accbf19682e5467", + "hash": "sha256-f22fdd300b80ba08a65546e7a12847d22faafcb92839e09fb67612e3018f24ec", "hash_type": "git_lfs_concat" }, "torch210-cxx11-rocm70-x86_64-linux": { - "hash": "sha256-ef3061f180a935be046caaedbe8eb3c9611e5a4228d88d1100f6357a3b5aa46c", + "hash": "sha256-89e26a1d8215bfc11228905c26d20d3519e0d09ba5306496f4069596e66fb7a6", "hash_type": "git_lfs_concat" }, "torch210-cxx11-rocm71-x86_64-linux": { - "hash": "sha256-4ec58bc0dd36b98f1153ad2c870906995a5f13278273a5ce9eda861047380ec7", + "hash": "sha256-a07fc6bb7632a79f5eab1734d45070b7e0cc93deae928a1c410c2ed4a0a2c62c", "hash_type": "git_lfs_concat" }, "torch210-cxx11-xpu20253-x86_64-linux": { - "hash": "sha256-aa4eaa81b2f260f6e35d8e7ab4f1aca5cdb91bcb49ed8c8f641820919c8209ab", + "hash": "sha256-67cdfa652f832b5d630824036ebc584cda438ad12030241e83cf46bad64143d9", "hash_type": "git_lfs_concat" }, "torch210-metal-aarch64-darwin": { - "hash": "sha256-424c70191e4808aec776987b3b5ce9ce184348513ce703e200593a71b40cbea3", + "hash": "sha256-e89ea77566a2744e83e545dc120b3e580295eaf34bf053354924296cb49bdb07", "hash_type": "git_lfs_concat" }, "torch210-xpu20253-x86_64-windows": { @@ -68,7 +68,7 @@ "hash_type": "git_lfs_concat" }, "torch211-cpu-aarch64-darwin": { - "hash": "sha256-c6cda4b2f0f83f4a86939575e9dffcd74d6cdaa6b89da540e86e8d536156245b", + "hash": "sha256-27b2935b5378830f8fb4b03a8d808aad584182f240f09907f08f8c54389b0feb", "hash_type": "git_lfs_concat" }, "torch211-cu128-x86_64-windows": { @@ -76,51 +76,103 @@ "hash_type": "git_lfs_concat" }, "torch211-cxx11-cpu-aarch64-linux": { - "hash": "sha256-2ec67a9846bba2ac8a053b4f11d00e086315d4e028b94e5e8168ed00444ee5da", + "hash": "sha256-d9ea423b06708d8c318b68daa9e570c75309904bdf88f2c6921a8a3351ea239e", "hash_type": "git_lfs_concat" }, "torch211-cxx11-cpu-x86_64-linux": { - "hash": "sha256-4f9c7dcb0e97ccb0507dd80881c7fc5446fb3626856a42f172c40c65557b064f", + "hash": "sha256-0e45e43d0fd4d81e09d190857e05934e0d24895f3110ee8d78ebf8f9eb37031a", "hash_type": "git_lfs_concat" }, "torch211-cxx11-cu126-aarch64-linux": { - "hash": "sha256-7b9ec9ae8d9ceb5af1c9be1517cd0de989b1f1516bb6ff956e435224302f3cf6", + "hash": "sha256-a226ff64d76eed9b7fded263f2386b11d4ea7daffc4853b47d64ff8acd67e49e", "hash_type": "git_lfs_concat" }, "torch211-cxx11-cu126-x86_64-linux": { - "hash": "sha256-de3d3cbdb9817773637da80fab88870e7ad9ce7d7e40899b3a4e5cd7182dc645", + "hash": "sha256-1d4c1d36926c3bb7ee549421d8fff4bd2ad23ec6d7f7c8a4717523e2f50b4655", "hash_type": "git_lfs_concat" }, "torch211-cxx11-cu128-aarch64-linux": { - "hash": "sha256-559aeba2d57dd3125984c8dd1b1e5358b6807d9b8f1fdc165519e6f1c5e33984", + "hash": "sha256-0b8314b90266b6bee67d4b8bdfb1c2c54bc7b1c8186372ae9e4cd7f8bcc09f04", "hash_type": "git_lfs_concat" }, "torch211-cxx11-cu128-x86_64-linux": { - "hash": "sha256-f078aa837db738094599b395372dfb50982dfbeb2538b36f2f2d2b3eec127a51", + "hash": "sha256-dc699374e204035efe1e3e53b6440c2ce0a0e799a5486cc1d680611e9a761cc7", "hash_type": "git_lfs_concat" }, "torch211-cxx11-cu130-aarch64-linux": { - "hash": "sha256-7ed13391cef18c36cc446d210d2fd8592993d45228a674182ee2cff375fa05ae", + "hash": "sha256-6d242c9431049d913a3a5a12ad642cf1e681230cba05d777d5ff606f0414c5d0", "hash_type": "git_lfs_concat" }, "torch211-cxx11-cu130-x86_64-linux": { - "hash": "sha256-42019ed67eff74f5168a2e9d6bf276d047b29c11d5e3395a342893a3f50daae1", + "hash": "sha256-b65cf05ea577f1806a1da98bb1103f42e88a85b309984fc8cce8bdb7c663d9ed", "hash_type": "git_lfs_concat" }, "torch211-cxx11-rocm71-x86_64-linux": { - "hash": "sha256-d82aff83823ac9ee81c78db67b860b40d9cbbd6b7efe8640693afdbe16f3e52c", + "hash": "sha256-5e56897157f3be71df46a8f1f4e1797e2dde1a8c0b28d04fb074fba87ef03eae", "hash_type": "git_lfs_concat" }, "torch211-cxx11-rocm72-x86_64-linux": { - "hash": "sha256-772ec7f9b0917421f562d162b7db8535cac09b92cc2ce670ba467a08f1dfb9b0", + "hash": "sha256-35f1ba226d649250752973dccb4ab0c159be3ee7f64476849c4f8f8bdd598414", "hash_type": "git_lfs_concat" }, "torch211-cxx11-xpu20253-x86_64-linux": { - "hash": "sha256-4466ae2451d960a6c57a456d0c6a5f7397ccabcc6fb43fc3c0dcf26aecda5cfa", + "hash": "sha256-15852983def8d8da3ee691233bef26168e3832063623923b3991ef3a3a2dad68", "hash_type": "git_lfs_concat" }, "torch211-metal-aarch64-darwin": { - "hash": "sha256-b9bb76b444aae35782626327647f77f651f67ec666b58f1d3a8f2f251af88a50", + "hash": "sha256-7978552e3c54d5ec41dfe1f27a990b40cb6ce4672055266b588029a3227f5a13", + "hash_type": "git_lfs_concat" + }, + "torch212-cpu-aarch64-darwin": { + "hash": "sha256-f8c35fc430e68525fb204a632c633b206993fe5140d805afb25599567c900c06", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-cpu-aarch64-linux": { + "hash": "sha256-417fb435907db70523f82e84872fd0fdf736157de7e26919734effd32702637d", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-cpu-x86_64-linux": { + "hash": "sha256-68bb6d95f644b64f8d725dca14c60d4633edbce181e157195f343d8a8df97148", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-cu126-aarch64-linux": { + "hash": "sha256-12344fd63b625f4a4279c95f1c312c9f72bc04843022c094fc748861ca63a006", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-cu126-x86_64-linux": { + "hash": "sha256-c521aed8ce128b985cdb476d4ad55d0583ccb5acaa3a01d31a8396d7c2fc78f2", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-cu130-aarch64-linux": { + "hash": "sha256-1676a87551048c4488328f128bbe4b9e1fe29b07cc2fed9e94319445cecb85ad", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-cu130-x86_64-linux": { + "hash": "sha256-2d1354a462ebbfb9eeebfa350f03c3668572b5cf18b9864e458316108c9c5d1e", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-cu132-aarch64-linux": { + "hash": "sha256-c9f2953832d56a7ec4afdf1551187e4aeaf7f8acbd6c1fbaa0c5b766e6b5fa82", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-cu132-x86_64-linux": { + "hash": "sha256-669e6894ae35c3e004b841fd2e35cd579979178a4fb547eec97a190062a68488", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-rocm71-x86_64-linux": { + "hash": "sha256-70db275da9110da0d2cba7579006fdf4a919ae08f4254c22326757d5db928e21", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-rocm72-x86_64-linux": { + "hash": "sha256-dfe26a58f8560f11c4e82acb56094b43fbb72ef032a3b61922fa3188a27d9627", + "hash_type": "git_lfs_concat" + }, + "torch212-cxx11-xpu20253-x86_64-linux": { + "hash": "sha256-3237e8218022e8aad1cf995965af7a678e62374e47b1dadff935eb54e53ea0ca", + "hash_type": "git_lfs_concat" + }, + "torch212-metal-aarch64-darwin": { + "hash": "sha256-44a87b3557317554fc06b377174d7c37165a7feadf07417ec9bd2cb2ed29f96b", "hash_type": "git_lfs_concat" }, "torch27-cxx11-cu118-x86_64-linux": { diff --git a/nix-builder/build-variants.json b/nix-builder/build-variants.json index cbc0e644..32baedcf 100644 --- a/nix-builder/build-variants.json +++ b/nix-builder/build-variants.json @@ -1,26 +1,20 @@ { "aarch64-darwin": { "cpu": [ - "torch210-cpu-aarch64-darwin", "torch211-cpu-aarch64-darwin", "torch212-cpu-aarch64-darwin" ], "metal": [ - "torch210-metal-aarch64-darwin", "torch211-metal-aarch64-darwin", "torch212-metal-aarch64-darwin" ] }, "aarch64-linux": { "cpu": [ - "torch210-cxx11-cpu-aarch64-linux", "torch211-cxx11-cpu-aarch64-linux", "torch212-cxx11-cpu-aarch64-linux" ], "cuda": [ - "torch210-cxx11-cu126-aarch64-linux", - "torch210-cxx11-cu128-aarch64-linux", - "torch210-cxx11-cu130-aarch64-linux", "torch211-cxx11-cu126-aarch64-linux", "torch211-cxx11-cu128-aarch64-linux", "torch211-cxx11-cu130-aarch64-linux", @@ -31,14 +25,10 @@ }, "x86_64-linux": { "cpu": [ - "torch210-cxx11-cpu-x86_64-linux", "torch211-cxx11-cpu-x86_64-linux", "torch212-cxx11-cpu-x86_64-linux" ], "cuda": [ - "torch210-cxx11-cu126-x86_64-linux", - "torch210-cxx11-cu128-x86_64-linux", - "torch210-cxx11-cu130-x86_64-linux", "torch211-cxx11-cu126-x86_64-linux", "torch211-cxx11-cu128-x86_64-linux", "torch211-cxx11-cu130-x86_64-linux", @@ -47,15 +37,12 @@ "torch212-cxx11-cu132-x86_64-linux" ], "rocm": [ - "torch210-cxx11-rocm70-x86_64-linux", - "torch210-cxx11-rocm71-x86_64-linux", "torch211-cxx11-rocm71-x86_64-linux", "torch211-cxx11-rocm72-x86_64-linux", "torch212-cxx11-rocm71-x86_64-linux", "torch212-cxx11-rocm72-x86_64-linux" ], "xpu": [ - "torch210-cxx11-xpu20253-x86_64-linux", "torch211-cxx11-xpu20253-x86_64-linux", "torch212-cxx11-xpu20253-x86_64-linux" ] diff --git a/nix-builder/lib/checks.nix b/nix-builder/lib/checks.nix index 71cbce27..418b78b7 100644 --- a/nix-builder/lib/checks.nix +++ b/nix-builder/lib/checks.nix @@ -12,7 +12,7 @@ let path = ../../examples/kernels/relu-torch-bounds; }; in -assert lib.assertMsg (builtins.all (buildSet: buildSet.torch.version == "2.10.0") kernelBuildSets) +assert lib.assertMsg (builtins.all (buildSet: buildSet.torch.version == "2.11.0") kernelBuildSets) '' Torch minver/maxver filtering does not work. ''; diff --git a/nix-builder/overlay.nix b/nix-builder/overlay.nix index 389b1c7a..a66b7523 100644 --- a/nix-builder/overlay.nix +++ b/nix-builder/overlay.nix @@ -168,13 +168,6 @@ in xpuPackages = null; }; - torch-bin_2_10 = mkTorch { - version = "2.10"; - triton-cuda = triton_3_6_0; - triton-xpu = triton-xpu_3_6_0; - xpuPackages = final.xpuPackages_2025_3_1; - }; - torch-bin_2_11 = mkTorch { version = "2.11"; triton-cuda = triton_3_6_0; diff --git a/nix-builder/pkgs/python-modules/torch/archs.nix b/nix-builder/pkgs/python-modules/torch/archs.nix index 297265f5..b4c92458 100644 --- a/nix-builder/pkgs/python-modules/torch/archs.nix +++ b/nix-builder/pkgs/python-modules/torch/archs.nix @@ -115,67 +115,6 @@ ]; }; - "2.10" = { - # https://github.com/pytorch/pytorch/blob/release/2.9/.ci/manywheel/build_cuda.sh - capsPerCudaVersion = { - "13.0" = [ - "7.5" - "8.0" - "8.6" - "9.0" - "10.0" - "12.0" - ]; - # NOTE: 12.9 does not seem to be in RC builds, check if needed for final release. - # https://download.pytorch.org/whl/test/torch/ - "12.9" = [ - "7.0" - "7.5" - "8.0" - "8.6" - "9.0" - "10.0" - "12.0" - ]; - "12.8" = [ - "7.0" - "7.5" - "8.0" - "8.6" - "9.0" - "10.0" - "12.0" - ]; - "12.6" = [ - "5.0" - "6.0" - "7.0" - "7.5" - "8.0" - "8.6" - "9.0" - ]; - }; - - supportedTorchRocmArchs = [ - # https://github.com/pytorch/pytorch/blob/release/2.10/.ci/docker/almalinux/build.sh - "gfx900" - "gfx906" - "gfx908" - "gfx90a" - "gfx942" - "gfx950" - "gfx1030" - "gfx1100" - "gfx1101" - "gfx1102" - "gfx1150" - "gfx1151" - "gfx1200" - "gfx1201" - ]; - }; - "2.11" = { # https://github.com/pytorch/pytorch/blob/release/2.11/.ci/manywheel/build_cuda.sh capsPerCudaVersion = { diff --git a/nix-builder/pkgs/python-modules/torch/binary/generic.nix b/nix-builder/pkgs/python-modules/torch/binary/generic.nix index 63368b81..4f7e6c15 100644 --- a/nix-builder/pkgs/python-modules/torch/binary/generic.nix +++ b/nix-builder/pkgs/python-modules/torch/binary/generic.nix @@ -71,7 +71,6 @@ let inherit (archs) supportedTorchRocmArchs; aotritonVersions = with rocmPackages; { - "2.10" = aotriton_0_11_1; "2.11" = aotriton_0_11_2; "2.12" = aotriton_0_11_2; }; diff --git a/nix-builder/pkgs/python-modules/torch/binary/torch-versions-hash.json b/nix-builder/pkgs/python-modules/torch/binary/torch-versions-hash.json index 1ee13af0..7bf5ff65 100644 --- a/nix-builder/pkgs/python-modules/torch/binary/torch-versions-hash.json +++ b/nix-builder/pkgs/python-modules/torch/binary/torch-versions-hash.json @@ -15,74 +15,6 @@ } } }, - "2.10": { - "x86_64-linux": { - "cu126": { - "url": "https://download.pytorch.org/whl/cu126/torch-2.10.0%2Bcu126-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-hWgFIlNTSr4ns6xW0wH2nTXvXOFkeeaj14CPsFIxCRk=", - "version": "2.10.0" - }, - "cu128": { - "url": "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-e0vSPtY96XRW/MgcJv6p8C7gLOERIRHE2sDYz+V0sj4=", - "version": "2.10.0" - }, - "cu130": { - "url": "https://download.pytorch.org/whl/cu130/torch-2.10.0%2Bcu130-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-fg2ZIunpH3gLJ2GgxeusPBXJdAurBC4bWRSa+m1kdOs=", - "version": "2.10.0" - }, - "rocm70": { - "url": "https://download.pytorch.org/whl/rocm7.0/torch-2.10.0%2Brocm7.0-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-s1YZho9ffiVeKpwQCR+fSGPzkvVO00cjX2UTe9rfl9k=", - "version": "2.10.0" - }, - "rocm71": { - "url": "https://download.pytorch.org/whl/rocm7.1/torch-2.10.0%2Brocm7.1-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-PxiwbyM9SHG6qv24umYq5p/5HsEaob92ynbd4xtD6c0=", - "version": "2.10.0" - }, - "cpu": { - "url": "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-jTFuW/Eh8eqxFH5JrQURqdkuTEXMNX0asL7kQNpxoJU=", - "version": "2.10.0" - }, - "xpu": { - "url": "https://download.pytorch.org/whl/xpu/torch-2.10.0%2Bxpu-cp313-cp313-linux_x86_64.whl", - "hash": "sha256-O8ZKdG/yWpPeFAkCxgyegZ10E/XOoeiNgJmcJ6WQHpw=", - "version": "2.10.0" - } - }, - "aarch64-linux": { - "cu126": { - "url": "https://download.pytorch.org/whl/cu126/torch-2.10.0%2Bcu126-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-n/vyQLwZOEG6CnmXZRCqnsFMlaV2mSV7WBvHgjFrWS8=", - "version": "2.10.0" - }, - "cu128": { - "url": "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-vbzHAzgvlI6VHAY0SMlAa/OM5mxB3WmNnicz/PlsA3o=", - "version": "2.10.0" - }, - "cu130": { - "url": "https://download.pytorch.org/whl/cu130/torch-2.10.0%2Bcu130-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-dXgCgzCN+f7eNx7toB6WB8iGKhgDovLzGgiiwN6u00I=", - "version": "2.10.0" - }, - "cpu": { - "url": "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-5RmUSSzbdu3OKdqI3jZyowIvnvD/2QNFQ2lI1Jkr4sc=", - "version": "2.10.0" - } - }, - "aarch64-darwin": { - "cpu": { - "url": "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp313-none-macosx_11_0_arm64.whl", - "hash": "sha256-hANR2lnO23vLxRmBiABQgTwZ72uJin/s9zo6/HGv8/4=", - "version": "2.10.0" - } - } - }, "2.11": { "x86_64-linux": { "cu126": { @@ -153,16 +85,6 @@ }, "2.12": { "x86_64-linux": { - "cpu": { - "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcpu-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-raeAGL36MNHHZlls0y2RDb9bA0JM2FkjG20qAFM96SI=", - "version": "2.12.0" - }, - "cu132": { - "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcu132-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-GBcVE1xToXCmFp/MCCOzBUgn/YLkCGr1eI1/QzKjAV0=", - "version": "2.12.0" - }, "cu126": { "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcu126-cp313-cp313-manylinux_2_28_x86_64.whl", "hash": "sha256-hyejkBw0v5glBpqvgvCYTdKP9iLhpyfSU0VVzXePxdw=", @@ -173,41 +95,51 @@ "hash": "sha256-/l/vt4SjcNG6SVneboe807NUQQQKmb/+MvXNA7vINMA=", "version": "2.12.0" }, - "xpu": { - "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bxpu-cp313-cp313-linux_x86_64.whl", - "hash": "sha256-VvdOfGwJbhp6whXree5ZC3ZL4/u6j0/rwUW8pHGUoIM=", + "cu132": { + "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcu132-cp313-cp313-manylinux_2_28_x86_64.whl", + "hash": "sha256-GBcVE1xToXCmFp/MCCOzBUgn/YLkCGr1eI1/QzKjAV0=", "version": "2.12.0" }, - "rocm72": { - "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Brocm7.2-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-WMB+TMYMHEfZa7/7kiL0fBCQ/F3qjZQYFG0lCKh7eF4=", + "cpu": { + "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcpu-cp313-cp313-manylinux_2_28_x86_64.whl", + "hash": "sha256-raeAGL36MNHHZlls0y2RDb9bA0JM2FkjG20qAFM96SI=", "version": "2.12.0" }, "rocm71": { "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Brocm7.1-cp313-cp313-manylinux_2_28_x86_64.whl", "hash": "sha256-N1sCgonX1LXrhWKDjz4oPAU9/p4DgtdL8Q3ja619sMQ=", "version": "2.12.0" + }, + "rocm72": { + "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Brocm7.2-cp313-cp313-manylinux_2_28_x86_64.whl", + "hash": "sha256-WMB+TMYMHEfZa7/7kiL0fBCQ/F3qjZQYFG0lCKh7eF4=", + "version": "2.12.0" + }, + "xpu": { + "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bxpu-cp313-cp313-linux_x86_64.whl", + "hash": "sha256-VvdOfGwJbhp6whXree5ZC3ZL4/u6j0/rwUW8pHGUoIM=", + "version": "2.12.0" } }, "aarch64-linux": { - "cpu": { - "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-aLfd1NtGA6A+EG50xwmMjYyJQ9M8HlraAJykzYhXWcM=", - "version": "2.12.0" - }, "cu126": { "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcu126-cp313-cp313-manylinux_2_28_aarch64.whl", "hash": "sha256-PPZnbUHY1XNQ1F1zizXL7XZx42JCqDaZPNabDBiBkXc=", "version": "2.12.0" }, + "cu130": { + "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcu130-cp313-cp313-manylinux_2_28_aarch64.whl", + "hash": "sha256-v18GfTpNcTt1zNagFB+BM8dJWgFrkXzm3OwUkuPamLA=", + "version": "2.12.0" + }, "cu132": { "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcu132-cp313-cp313-manylinux_2_28_aarch64.whl", "hash": "sha256-uWo2HRjhEXtq67nN8+yOtGkO7RX7lD01wC3K5pL2Fuk=", "version": "2.12.0" }, - "cu130": { - "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcu130-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-v18GfTpNcTt1zNagFB+BM8dJWgFrkXzm3OwUkuPamLA=", + "cpu": { + "url": "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/rc9/torch-2.12.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl", + "hash": "sha256-aLfd1NtGA6A+EG50xwmMjYyJQ9M8HlraAJykzYhXWcM=", "version": "2.12.0" } }, diff --git a/nix-builder/pkgs/python-modules/torch/binary/torch-versions.json b/nix-builder/pkgs/python-modules/torch/binary/torch-versions.json index e693912d..aaef3522 100644 --- a/nix-builder/pkgs/python-modules/torch/binary/torch-versions.json +++ b/nix-builder/pkgs/python-modules/torch/binary/torch-versions.json @@ -5,47 +5,6 @@ "systems": ["x86_64-linux", "aarch64-linux"] }, - { - "torchVersion": "2.10.0", - "cudaVersion": "12.6", - "systems": ["x86_64-linux", "aarch64-linux"] - }, - { - "torchVersion": "2.10.0", - "cudaVersion": "12.8", - "systems": ["x86_64-linux", "aarch64-linux"] - }, - { - "torchVersion": "2.10.0", - "cudaVersion": "13.0", - "systems": ["x86_64-linux", "aarch64-linux"] - }, - { - "torchVersion": "2.10.0", - "rocmVersion": "7.0", - "systems": ["x86_64-linux"] - }, - { - "torchVersion": "2.10.0", - "rocmVersion": "7.1", - "systems": ["x86_64-linux"] - }, - { - "torchVersion": "2.10.0", - "metal": true, - "systems": ["aarch64-darwin"] - }, - { - "torchVersion": "2.10.0", - "cpu": true, - "systems": ["aarch64-linux", "x86_64-linux"] - }, - { - "torchVersion": "2.10.0", - "xpuVersion": "2025.3.1", - "systems": ["x86_64-linux"] - }, - { "torchVersion": "2.11.0", "cudaVersion": "12.6", diff --git a/nix-builder/pkgs/python-modules/torch/binary/torch_versions.py b/nix-builder/pkgs/python-modules/torch/binary/torch_versions.py index 2739cc0a..88da3c24 100644 --- a/nix-builder/pkgs/python-modules/torch/binary/torch_versions.py +++ b/nix-builder/pkgs/python-modules/torch/binary/torch_versions.py @@ -53,7 +53,7 @@ def generate_pytorch_url( if "darwin" in system: framework_dir = "cpu" version_part = torch_version - abi_tag = "none" if "2.10" in version_part else python_version + abi_tag = python_version wheel_name = f"torch-{version_part}-{python_version}-{abi_tag}-{platform}.whl" elif framework_type == "cpu": framework_dir = "cpu" diff --git a/nix-builder/versions.nix b/nix-builder/versions.nix index ccf3b7da..72bbd724 100644 --- a/nix-builder/versions.nix +++ b/nix-builder/versions.nix @@ -1,66 +1,4 @@ [ - { - torchVersion = "2.10"; - cudaVersion = "12.6"; - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; - bundleBuild = true; - } - { - torchVersion = "2.10"; - cudaVersion = "12.8"; - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; - bundleBuild = true; - } - { - torchVersion = "2.10"; - cudaVersion = "13.0"; - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; - bundleBuild = true; - } - { - torchVersion = "2.10"; - rocmVersion = "7.0"; - systems = [ "x86_64-linux" ]; - bundleBuild = true; - } - { - torchVersion = "2.10"; - rocmVersion = "7.1"; - systems = [ "x86_64-linux" ]; - bundleBuild = true; - } - { - torchVersion = "2.10"; - cpu = true; - systems = [ - "aarch64-darwin" - "x86_64-linux" - "aarch64-linux" - ]; - bundleBuild = true; - } - { - torchVersion = "2.10"; - metal = true; - systems = [ "aarch64-darwin" ]; - bundleBuild = true; - } - { - torchVersion = "2.10"; - xpuVersion = "2025.3.1"; - systems = [ "x86_64-linux" ]; - bundleBuild = true; - } - { torchVersion = "2.11"; cpu = true; @@ -190,5 +128,4 @@ systems = [ "x86_64-linux" ]; bundleBuild = true; } - ]