From b003e311055e4c8927ce941054a75a8d55dc1713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 16 Sep 2026 15:00:51 +0000 Subject: [PATCH 1/2] nix-builder: update nixpkgs, bumps Python from 3.13 to 3.14 --- flake.lock | 14 +- flake.nix | 5 +- kernels/tests/test_entry_points.py | 4 +- nix-builder/overlay.nix | 6 +- .../python-modules/cuda-bindings/default.nix | 8 +- .../pkgs/python-modules/libtpu/default.nix | 6 +- .../nvidia-cuda-nvdisasm/default.nix | 4 +- .../nvidia-cutlass-dsl-libs-cu/default.nix | 8 +- .../nvidia-cutlass-dsl-libs/default.nix | 8 +- .../python-modules/torch/binary/generic.nix | 4 +- .../torch/binary/torch-versions-hash.json | 126 +++++++++--------- .../torch/binary/torch_versions.py | 2 +- .../python-modules/triton-rocm/default.nix | 4 +- .../python-modules/triton-xpu/default.nix | 12 +- .../pkgs/python-modules/triton/default.nix | 24 ++-- .../pkgs/python-modules/tvm-ffi/default.nix | 5 + nix-builder/pkgs/rocm-packages/overrides.nix | 3 + .../scripts/helpers/prefetch-tpu-wheel.sh | 8 +- 18 files changed, 127 insertions(+), 124 deletions(-) diff --git a/flake.lock b/flake.lock index b90b72d81..47af4d8d5 100644 --- a/flake.lock +++ b/flake.lock @@ -35,17 +35,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783284758, - "narHash": "sha256-tiQ8/qi8I45OOaBBYlVbXoAVkeQzvvTQOv5I45rMw5o=", + "lastModified": 1789524109, + "narHash": "sha256-GZDvT/tbSVQB2KjI86l7VCM5D/vCrJo2sE3PCaaD0oQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec1a11210589d294f0ac99d3290a27e6c73dfa1d", + "rev": "be3dab5b1a3c41ed2db86093b9f4e048305630b7", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable-small", "repo": "nixpkgs", - "rev": "ec1a11210589d294f0ac99d3290a27e6c73dfa1d", "type": "github" } }, @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1783320166, - "narHash": "sha256-l7C/OsjcnWDOk2K3ssj+SBduwL67LashjBqis9+t468=", + "lastModified": 1789543870, + "narHash": "sha256-45ikFmtfgBZgMePIm4GevJ9VjDSWO3PGQgOuuwHDpes=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "20ee15370c9256669d66968b89ee20a4b0a4e673", + "rev": "35ca0490d13a3d38c4602d0eb9600a30fa63a367", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 37ea433d7..dea88f3d4 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,7 @@ inputs = { flake-utils.url = "github:numtide/flake-utils"; - # Temporarily pin this commit to fix ucx issues: - # https://github.com/NixOS/nixpkgs/pull/538738 - nixpkgs.url = "github:NixOS/nixpkgs/ec1a11210589d294f0ac99d3290a27e6c73dfa1d"; - #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; flake-compat.url = "github:edolstra/flake-compat"; rust-overlay = { url = "github:oxalica/rust-overlay"; diff --git a/kernels/tests/test_entry_points.py b/kernels/tests/test_entry_points.py index 67608b6a8..553d4c37a 100644 --- a/kernels/tests/test_entry_points.py +++ b/kernels/tests/test_entry_points.py @@ -8,9 +8,7 @@ def test_egg_info_writer_entry_point_is_importable(): `egg_info` run in an environment where `kernels` is installed, including builds of unrelated packages. If it points at a module that is not shipped, every such build fails with `ModuleNotFoundError`.""" - entry_points = [ - ep for ep in distribution("kernels").entry_points if ep.group == "egg_info.writers" - ] + entry_points = [ep for ep in distribution("kernels").entry_points if ep.group == "egg_info.writers"] assert entry_points, "no egg_info.writers entry point registered" for ep in entry_points: diff --git a/nix-builder/overlay.nix b/nix-builder/overlay.nix index e7e2f7c2d..53419ca9f 100644 --- a/nix-builder/overlay.nix +++ b/nix-builder/overlay.nix @@ -131,12 +131,12 @@ final: prev: ); hf-xet = python-super.hf-xet.overridePythonAttrs (prevAttrs: rec { - version = "1.4.3"; + version = "1.6.0"; src = final.fetchFromGitHub { owner = "huggingface"; repo = "xet-core"; tag = "v${version}"; - hash = "sha256-zAliMR2d2j6ynHQmAljQ8XgDyjuPxNawI1bZks5aRgs="; + hash = "sha256-SP6Z8iIkrt3FVXxXYdvjeiIAfcrVlfCPQq6C36DfhEM="; }; cargoDeps = final.rustPlatform.fetchCargoVendor { inherit (prevAttrs) @@ -147,7 +147,7 @@ final: prev: version src ; - hash = "sha256-TOgBT0l7TvJamVdIAdAUFRWs8AMRRY+Ydoh6e+3dEp0="; + hash = "sha256-pvtq9mKlmwaqAq281Lin/UgVGcRe2SEvyzCa+xWSwVQ="; }; }); diff --git a/nix-builder/pkgs/python-modules/cuda-bindings/default.nix b/nix-builder/pkgs/python-modules/cuda-bindings/default.nix index 64d7bb2d2..4a5d2257d 100644 --- a/nix-builder/pkgs/python-modules/cuda-bindings/default.nix +++ b/nix-builder/pkgs/python-modules/cuda-bindings/default.nix @@ -19,15 +19,15 @@ let cuda_12 = { version = "12.9.5"; hash = { - x86_64-linux = "sha256-2jdFj4xQdNWQQN7dvQBUYMDPcNHvkN19LIFuRoYDjoc="; - aarch64-linux = "sha256-4G0nKyUUnhqDtEb/Pb789vgvZoZcSejZ23VoO7z/C18="; + x86_64-linux = "sha256-QNx5yMv2Y+JNJgeyqXl4fg1oQLYkpNpIzVMDrLhIKtI="; + aarch64-linux = "sha256-OzqJ/M1swexTWpQLQyQ3YVN65XPZd8PNGOOPhB4fioY="; }; }; cuda_13 = { version = "13.2.0"; hash = { - x86_64-linux = "sha256-fcoNoFPTtMxIae/0nGHAPzxduqC81xIxejWNW48/OF0="; - aarch64-linux = "sha256-ZinKLfb3lbeEdSQJvK7b0ip6ZRt0tWoWXrwMncvVBNA="; + x86_64-linux = "sha256-9K+fPhvmA/oS1a1s/KeETJ0jC++peStavffdeZecNiY="; + aarch64-linux = "sha256-pkZLMPRmktbH9l1KDgRQ2B3SneOvwbtRVlOXPQHCzW4="; }; }; in diff --git a/nix-builder/pkgs/python-modules/libtpu/default.nix b/nix-builder/pkgs/python-modules/libtpu/default.nix index e3cf3c198..fac7af372 100644 --- a/nix-builder/pkgs/python-modules/libtpu/default.nix +++ b/nix-builder/pkgs/python-modules/libtpu/default.nix @@ -31,18 +31,18 @@ let # The wheel ships per-CPython-ABI builds (cp311..cp314); pick the tag # matching the python this package set is built for. The hash below is - # for cp313 (the nixpkgs default python); if either moves, recompute + # for cp314 (the nixpkgs default python); if either moves, recompute # via the prefetch script above. abi = "cp${lib.versions.major python.version}${lib.versions.minor python.version}"; in buildPythonPackage rec { pname = "libtpu"; - version = "0.0.44.1"; + version = "0.0.48"; format = "wheel"; src = requireFile { name = "libtpu-${version}-${abi}-${abi}-manylinux_2_31_x86_64.whl"; - hash = "sha256-qd34JzD0TpphtqLj67/HqYgVg/bXT3gF6E+pYQyaCsA="; # cp313 + hash = "sha256-QD0G/ssztiQYMmd/gwI/IXlYnwyZ4lwRocEf/7V7NBY="; message = '' libtpu is served from a gated Google Artifact Registry and cannot be fetched by a pure Nix build. Fetch and register it with: diff --git a/nix-builder/pkgs/python-modules/nvidia-cuda-nvdisasm/default.nix b/nix-builder/pkgs/python-modules/nvidia-cuda-nvdisasm/default.nix index 5162e3ce5..d1e5a95e5 100644 --- a/nix-builder/pkgs/python-modules/nvidia-cuda-nvdisasm/default.nix +++ b/nix-builder/pkgs/python-modules/nvidia-cuda-nvdisasm/default.nix @@ -21,8 +21,8 @@ let format = "wheel"; pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; hashes = { - cp313-aarch64-linux = "sha256-3UdRiE+QFrm22/AHq961aB0KLtxzHdPS/anW2Hjoj3M="; - cp313-x86_64-linux = "sha256-+hcISwfA3KaKQokvdxtLG0D76bkWYCCWI+Yc6mEcrow="; + cp314-aarch64-linux = "sha256-3UdRiE+QFrm22/AHq961aB0KLtxzHdPS/anW2Hjoj3M="; + cp314-x86_64-linux = "sha256-+hcISwfA3KaKQokvdxtLG0D76bkWYCCWI+Yc6mEcrow="; }; hash = hashes."${pyShortVersion}-${stdenv.system}" diff --git a/nix-builder/pkgs/python-modules/nvidia-cutlass-dsl-libs-cu/default.nix b/nix-builder/pkgs/python-modules/nvidia-cutlass-dsl-libs-cu/default.nix index 371dfd399..c6333e87e 100644 --- a/nix-builder/pkgs/python-modules/nvidia-cutlass-dsl-libs-cu/default.nix +++ b/nix-builder/pkgs/python-modules/nvidia-cutlass-dsl-libs-cu/default.nix @@ -24,10 +24,10 @@ let format = "wheel"; pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; hashes = { - cp313-x86_64-linux-cu12 = "sha256-JQS1vbLwIQpqG8kjrO/peQBjZmlLc/FFijyFca7zt2U="; - cp313-aarch64-linux-cu12 = "sha256-F9nVvbj1MCZtyEJCNqgFI+4qmAfoUqJMIglkOKEt870="; - cp313-x86_64-linux-cu13 = "sha256-famVhPTw1JjKcKZHAiqylcpUoglJRBGBzQwyiVhNqKM="; - cp313-aarch64-linux-cu13 = "sha256-gTcFEd/Z4cCNojAs8UD0reyJ31BOw0iiOwiqAXRyDsM="; + cp314-x86_64-linux-cu12 = "sha256-Avifeb/8ofZw3D4Z5SOPEggFFjDrTr2DVxzKqjTn6kU="; + cp314-aarch64-linux-cu12 = "sha256-yE7F1PRbY0q+FrLxEcU1L9IexmXruSnkAxiD3PE10xE="; + cp314-x86_64-linux-cu13 = "sha256-iPWAJ6JUrD5rlZLq82Ely27Pd61OQCaEeAQSVUbsSxA="; + cp314-aarch64-linux-cu13 = "sha256-q7bO5j0gI4v4/349rBJTS16LxF1CVic9l5OYrrF6Rr0="; }; hash = hashes."${pyShortVersion}-${stdenv.system}-cu${cudaMajor}" diff --git a/nix-builder/pkgs/python-modules/nvidia-cutlass-dsl-libs/default.nix b/nix-builder/pkgs/python-modules/nvidia-cutlass-dsl-libs/default.nix index 703fd8b75..df5dc3dc0 100644 --- a/nix-builder/pkgs/python-modules/nvidia-cutlass-dsl-libs/default.nix +++ b/nix-builder/pkgs/python-modules/nvidia-cutlass-dsl-libs/default.nix @@ -24,10 +24,10 @@ let format = "wheel"; pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; hashes = { - cp313-x86_64-linux-cu12 = "sha256-CaaqzoQVlOo5z3X3zuaNwxuM88263/y9SU8I/HPGRm0="; - cp313-aarch64-linux-cu12 = "sha256-fKTlypvQyqLseX67HkBLs+sPdtI1gjYReVyxTY00Hkw="; - cp313-x86_64-linux-cu13 = "sha256-CaaqzoQVlOo5z3X3zuaNwxuM88263/y9SU8I/HPGRm0="; - cp313-aarch64-linux-cu13 = "sha256-fKTlypvQyqLseX67HkBLs+sPdtI1gjYReVyxTY00Hkw="; + cp314-x86_64-linux-cu12 = "sha256-J0Yf9SM4KAtsAkdfh4USc7WhHDh9nao4M3YiWj92fMI="; + cp314-aarch64-linux-cu12 = "sha256-loFa+YsZuARYAv2LClPV4Zfg07zkLHA44oYa98hIP10="; + cp314-x86_64-linux-cu13 = "sha256-J0Yf9SM4KAtsAkdfh4USc7WhHDh9nao4M3YiWj92fMI="; + cp314-aarch64-linux-cu13 = "sha256-loFa+YsZuARYAv2LClPV4Zfg07zkLHA44oYa98hIP10="; }; hash = hashes."${pyShortVersion}-${stdenv.system}-cu${cudaPackages.cudaMajorVersion}" diff --git a/nix-builder/pkgs/python-modules/torch/binary/generic.nix b/nix-builder/pkgs/python-modules/torch/binary/generic.nix index 135f7fdf5..81ffea33f 100644 --- a/nix-builder/pkgs/python-modules/torch/binary/generic.nix +++ b/nix-builder/pkgs/python-modules/torch/binary/generic.nix @@ -151,11 +151,11 @@ let torch-tpu = let abi = "cp${lib.versions.major python.version}${lib.versions.minor python.version}"; - version = "0.1.1.dev20260707090224"; + version = "0.1.1.dev20260916100444"; in requireFile { name = "torch_tpu-${version}-${abi}-${abi}-manylinux_2_31_x86_64.whl"; - hash = "sha256-eCjwoX0UKd/L/IccxXn88p0GdyQjFdPl2Er1luZz4H0="; # cp313 + hash = "sha256-A8Rw9/QkMCjj9jfb4s+/d04/m/xH5L9rJDa0+giessM="; message = '' torch_tpu is served from a gated Google Artifact Registry and cannot be fetched by a pure Nix build. Fetch and register it with: 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 25f6a3279..0f4c69128 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 @@ -2,76 +2,76 @@ "2.11": { "x86_64-linux": { "cpu": { - "url": "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-RQJdd1LbxrTHhMA6+u6cXxlzDOCEsuQ/yaL+FnfZ/4Y=", + "url": "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-+EgeqQiOTluBF4p1qr27ZYvehjm8GhX9XY+TCryWZzU=", "version": "2.11.0" } } }, "2.13": { "x86_64-linux": { - "cu126": { - "url": "https://download.pytorch.org/whl/cu126/torch-2.13.0%2Bcu126-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-QZjI10eKtHrSVpMJOH2Ish+1U6HPirBiYPvVpqublxI=", + "cu130": { + "url": "https://download.pytorch.org/whl/cu130/torch-2.13.0%2Bcu130-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-4jEwKkVymNAjb3veMQglaPbNBhO2a060aEnorVPC440=", "version": "2.13.0" }, - "cu130": { - "url": "https://download.pytorch.org/whl/cu130/torch-2.13.0%2Bcu130-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-lb260vB4a9RIky5LcqZASqIikNtuyVTiTt+m0zyDPI8=", + "cpu": { + "url": "https://download.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-0g+lPudEUC+kxpgYpyCwXKDTer0FXU9uZsrhVRFLxpE=", + "version": "2.13.0" + }, + "cu126": { + "url": "https://download.pytorch.org/whl/cu126/torch-2.13.0%2Bcu126-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-r/07SaTkiu+JX/2eGWGBvVBUItfDe0pvmvp2iZ0qzT0=", "version": "2.13.0" }, "cu132": { - "url": "https://download.pytorch.org/whl/cu132/torch-2.13.0%2Bcu132-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-GMmhYaD7ZJ167wriy/kQ+H/7pRSa6BJ9D/QSOWmLbIo=", + "url": "https://download.pytorch.org/whl/cu132/torch-2.13.0%2Bcu132-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-JP+fQfRyQJ0pjShJdOI+PlkjML/VNClVfqWb/6SZq6g=", "version": "2.13.0" }, - "cpu": { - "url": "https://download.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-P7+cnR88EMLVnQSspCbe6czGzrMtJVxh6TrMO091+uY=", + "xpu": { + "url": "https://download.pytorch.org/whl/xpu/torch-2.13.0%2Bxpu-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-ArcpOjS+L13T466NApEZdwetRjTeK9p6FpdfKruQidU=", "version": "2.13.0" }, "rocm71": { - "url": "https://download.pytorch.org/whl/rocm7.1/torch-2.13.0%2Brocm7.1-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-NHcAYyaBihRFcXkm2b5o+KD2DCX/zjtGFHGAsfpeRVw=", + "url": "https://download.pytorch.org/whl/rocm7.1/torch-2.13.0%2Brocm7.1-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-FinA4sY15Z1K+iDGb/My2V4inVDK0EplKBJaUD+0HMY=", "version": "2.13.0" }, "rocm72": { - "url": "https://download.pytorch.org/whl/rocm7.2/torch-2.13.0%2Brocm7.2-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-kSHk6QZMVP3d7CukzG/B1NNx4lJiflyjngb2+gflHxo=", - "version": "2.13.0" - }, - "xpu": { - "url": "https://download.pytorch.org/whl/xpu/torch-2.13.0%2Bxpu-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-DDY+EveM5ng5orILI4eyuq5JGuZHDGfZnJkYA9xZJ70=", + "url": "https://download.pytorch.org/whl/rocm7.2/torch-2.13.0%2Brocm7.2-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-gm3oRE9Me56sC/3oZcTNe4UrohezX7cadmuFrB4zEOI=", "version": "2.13.0" } }, "aarch64-linux": { + "cpu": { + "url": "https://download.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl", + "hash": "sha256-ygIfnrL4NFyD+gPjoEWHMIr7jfcb1HJnCz7OAN9YYhw=", + "version": "2.13.0" + }, "cu126": { - "url": "https://download.pytorch.org/whl/cu126/torch-2.13.0%2Bcu126-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-smGCNbrLKe6jc1fOZgqrUpbZcp6s/UYp1QMnOC2hH38=", + "url": "https://download.pytorch.org/whl/cu126/torch-2.13.0%2Bcu126-cp314-cp314-manylinux_2_28_aarch64.whl", + "hash": "sha256-obilv+JA2N/fLU8LcFMFUuGTUFDM1X1FA/kYKeN3M3A=", "version": "2.13.0" }, "cu130": { - "url": "https://download.pytorch.org/whl/cu130/torch-2.13.0%2Bcu130-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-zsET+2Dw/p0sBNgGHVYN2uP4v3gphMHnuZMINgjXC5E=", + "url": "https://download.pytorch.org/whl/cu130/torch-2.13.0%2Bcu130-cp314-cp314-manylinux_2_28_aarch64.whl", + "hash": "sha256-CtGIzfp6XMxnNmyOgCadMrRev/x1nCgtEhUWkiQFZio=", "version": "2.13.0" }, "cu132": { - "url": "https://download.pytorch.org/whl/cu132/torch-2.13.0%2Bcu132-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-kTV7e3bs14i9diAFqjdOnfzcJcTFz1AZRzQmVOtw6KI=", - "version": "2.13.0" - }, - "cpu": { - "url": "https://download.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-C499BCMCeui5DHl3xifzN58yU2OggiTf+tm0staEqD0=", + "url": "https://download.pytorch.org/whl/cu132/torch-2.13.0%2Bcu132-cp314-cp314-manylinux_2_28_aarch64.whl", + "hash": "sha256-mrdBLoddWwRYLr1RSbxGnV0dUYapMEGwLU6783u6U7Q=", "version": "2.13.0" } }, "aarch64-darwin": { "cpu": { - "url": "https://download.pytorch.org/whl/cpu/torch-2.13.0-cp313-cp313-macosx_14_0_arm64.whl", - "hash": "sha256-M0SYmc5UlsG4S0hTF52U/RAgKK4UBzFNn7lWu3nnDQk=", + "url": "https://download.pytorch.org/whl/cpu/torch-2.13.0-cp314-cp314-macosx_14_0_arm64.whl", + "hash": "sha256-2EmzkOB9jTM86OyvkbJzxlbFmDeaGcms8TGKiD9rORw=", "version": "2.13.0" } } @@ -79,67 +79,67 @@ "2.14": { "x86_64-linux": { "cu126": { - "url": "https://download.pytorch.org/whl/cu126/torch-2.14.0%2Bcu126-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-rJ0c4Qk2BvXLHetPYS0vyyc+0Q/0ozcDq7oJzBbF3Mg=", + "url": "https://download.pytorch.org/whl/cu126/torch-2.14.0%2Bcu126-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-sV4eYquELQma6bGTEjdPYleWaBce/ti2dhCLYPp15bA=", "version": "2.14.0" }, "cu130": { - "url": "https://download.pytorch.org/whl/cu130/torch-2.14.0%2Bcu130-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-dFAQaV4EWNbyisy2l7U3G2/SRaqGllMBZflyzRJrvY0=", + "url": "https://download.pytorch.org/whl/cu130/torch-2.14.0%2Bcu130-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-ErCfnp+RNHWWOTpt25XpvAqgAyJ+tsfNfyDBROrGJEI=", "version": "2.14.0" }, "cu132": { - "url": "https://download.pytorch.org/whl/cu132/torch-2.14.0%2Bcu132-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-wIPAjPcsIH/vvYv8pJNfiDCvOMsca5VIvViZObc/VsQ=", + "url": "https://download.pytorch.org/whl/cu132/torch-2.14.0%2Bcu132-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-qM2Uhb0E0Uz98jW8pxKWQ5bPOPZzYGjZByValShyAr4=", "version": "2.14.0" }, "cpu": { - "url": "https://download.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-Fg4bxGrt7TER0oAfiuENyaG5RoQ6fhJrTb9eGcVwbpU=", + "url": "https://download.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-8VL0HcXcRir+DeeA5FHrtH6otEUfj5GflTeqjiy+HX4=", "version": "2.14.0" }, - "rocm72": { - "url": "https://download.pytorch.org/whl/rocm7.2/torch-2.14.0%2Brocm7.2-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-+iKhqF9PksT7SdybEXs+syuMaEloUI9YXfBC5wFuuX8=", + "xpu": { + "url": "https://download.pytorch.org/whl/xpu/torch-2.14.0%2Bxpu-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-wxFmDc0QLevXVxG09ffM5epLqLMKe+XHg57jtHGvPC0=", "version": "2.14.0" }, "rocm714": { - "url": "https://download.pytorch.org/whl/rocm7.14/torch-2.14.0%2Brocm7.14-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-RziHZNqLXI/U9hzAZrkJBciAsSsVUXQL219x9r42g2I=", + "url": "https://download.pytorch.org/whl/rocm7.14/torch-2.14.0%2Brocm7.14-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-YUNOyreck4O2klfMf9TR6TKjHFKHgc1Ew1QjmPJ9cf0=", "version": "2.14.0" }, - "xpu": { - "url": "https://download.pytorch.org/whl/xpu/torch-2.14.0%2Bxpu-cp313-cp313-manylinux_2_28_x86_64.whl", - "hash": "sha256-WvZeKJZY9wmnqvJqwTw/qRQ3NHvzkfTZu9W6jELSJ64=", + "rocm72": { + "url": "https://download.pytorch.org/whl/rocm7.2/torch-2.14.0%2Brocm7.2-cp314-cp314-manylinux_2_28_x86_64.whl", + "hash": "sha256-96rbFtnkgPuvhKVctTqk9Vd4Eww93z5bxHTbR4vNV9c=", "version": "2.14.0" } }, "aarch64-linux": { "cu126": { - "url": "https://download.pytorch.org/whl/cu126/torch-2.14.0%2Bcu126-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-JCJN6evMb4XPpIYUyxgQzv+sVCj32t7ZM7CAi1vQ8wM=", + "url": "https://download.pytorch.org/whl/cu126/torch-2.14.0%2Bcu126-cp314-cp314-manylinux_2_28_aarch64.whl", + "hash": "sha256-8X/SRkWdAVBdNNpglod1ek2xOdfV5WRa6GBHBvm1s2Q=", "version": "2.14.0" }, "cu130": { - "url": "https://download.pytorch.org/whl/cu130/torch-2.14.0%2Bcu130-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-IOxLuJRKhH3uYObVU2tBVnDdVAM0Lzbb4Ipr5b9YLgg=", + "url": "https://download.pytorch.org/whl/cu130/torch-2.14.0%2Bcu130-cp314-cp314-manylinux_2_28_aarch64.whl", + "hash": "sha256-mvTo85M8PVFdGUm++tVRJizbPxlcu9tGdDaVhcVew0I=", "version": "2.14.0" }, - "cu132": { - "url": "https://download.pytorch.org/whl/cu132/torch-2.14.0%2Bcu132-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-eoHHxugfwqaiZPHYpwv9hDXACQWHPx1kYK73tXFzB/A=", + "cpu": { + "url": "https://download.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl", + "hash": "sha256-J7NGQP6nJohilhtzTHI4c+FbHCZXseuEvPrAU+WEFSc=", "version": "2.14.0" }, - "cpu": { - "url": "https://download.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl", - "hash": "sha256-CS1cEpOIUN+9kKZUs8jaw0wz4wD4jrGe5vTvk5ksY0c=", + "cu132": { + "url": "https://download.pytorch.org/whl/cu132/torch-2.14.0%2Bcu132-cp314-cp314-manylinux_2_28_aarch64.whl", + "hash": "sha256-lNS9GB45tsaNkWvDZhCPuBNK/LpBDDM868JNoHixEBc=", "version": "2.14.0" } }, "aarch64-darwin": { "cpu": { - "url": "https://download.pytorch.org/whl/cpu/torch-2.14.0-cp313-cp313-macosx_14_0_arm64.whl", - "hash": "sha256-yvY1nWTAB0vLn4ZBoWkjkRjIFloKD+95EQxyv9ZHS+w=", + "url": "https://download.pytorch.org/whl/cpu/torch-2.14.0-cp314-cp314-macosx_14_0_arm64.whl", + "hash": "sha256-0PeHRAAKeGPMPx6vr1EdS5lE8Hnwgnfeb+/ksB9NQbk=", "version": "2.14.0" } } 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 6f6a00557..f851a060e 100644 --- a/nix-builder/pkgs/python-modules/torch/binary/torch_versions.py +++ b/nix-builder/pkgs/python-modules/torch/binary/torch_versions.py @@ -4,7 +4,7 @@ from packaging.version import Version -PYTHON_VERSION = "cp313" +PYTHON_VERSION = "cp314" def cuda_version_to_framework(cuda_version: str) -> str: diff --git a/nix-builder/pkgs/python-modules/triton-rocm/default.nix b/nix-builder/pkgs/python-modules/triton-rocm/default.nix index 9953393b1..5c736f006 100644 --- a/nix-builder/pkgs/python-modules/triton-rocm/default.nix +++ b/nix-builder/pkgs/python-modules/triton-rocm/default.nix @@ -8,8 +8,8 @@ let versions = { "3.7.0" = { x86_64-linux = { - url = "https://download-r2.pytorch.org/whl/triton_rocm-3.7.0-cp313-cp313-linux_x86_64.whl"; - hash = "sha256-js2p7DwGVwRKAjLcx8V0AcJb/+5Dpm4lHuI3tMcqSGk="; + url = "https://download-r2.pytorch.org/whl/triton_rocm-3.7.0-cp314-cp314-linux_x86_64.whl"; + hash = "sha256-DyWfmBMQyEEfPHzX0LvtBagFUMO+dX5tnadDdGsBbmc="; }; }; }; diff --git a/nix-builder/pkgs/python-modules/triton-xpu/default.nix b/nix-builder/pkgs/python-modules/triton-xpu/default.nix index 2ab719f39..d01993a53 100644 --- a/nix-builder/pkgs/python-modules/triton-xpu/default.nix +++ b/nix-builder/pkgs/python-modules/triton-xpu/default.nix @@ -8,19 +8,19 @@ in { triton-xpu_3_7_1 = generic { version = "3.7.1"; - url = "https://download-r2.pytorch.org/whl/triton_xpu-3.7.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-5wGjHvoDNHdfNXyYcW84IXdaqUQhn3iI4Twt/i2qvio="; + url = "https://download-r2.pytorch.org/whl/triton_xpu-3.7.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-69d2XCnsKJ3OQSWumuABCUUyTRbDLOCGbBfGmyc7V/8="; }; triton-xpu_3_7_2 = generic { version = "3.7.2"; - url = "https://download.pytorch.org/whl/triton_xpu-3.7.2-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-jMwVkt3aI6sunRQ9orS2nrQIIRcsW9S8TiYjI9x/UXI="; + url = "https://download.pytorch.org/whl/triton_xpu-3.7.2-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-Vgtk8KGUCN7jmx49CN9hT8m7KUqTCkP/E2HRvhLwyYA="; }; triton-xpu_3_8_0 = generic { version = "3.8.0"; - url = "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/2.14.0/rc6/triton_xpu-3.8.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-Yg7PawctmULzjsvM2APnFpZc6dDWo3Jx2GvtK4U0T04="; + url = "https://download.pytorch.org/whl/triton_xpu-3.8.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-r8W70Ter/+iBD4uLfcZU/zdJe7KLspPT/qag5PH7qwk="; }; } diff --git a/nix-builder/pkgs/python-modules/triton/default.nix b/nix-builder/pkgs/python-modules/triton/default.nix index 58a37ded2..91a0f0aa3 100644 --- a/nix-builder/pkgs/python-modules/triton/default.nix +++ b/nix-builder/pkgs/python-modules/triton/default.nix @@ -8,32 +8,32 @@ let versions = { "3.7.0" = { x86_64-linux = { - url = "https://download.pytorch.org/whl/triton-3.7.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-0BA4KB83Yz8GFC8dTazEh+pNRRsC6zPt/edY0TZii6I="; + url = "https://download.pytorch.org/whl/triton-3.7.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-lrEJlBySIGSt4Nc4Ni4DqTB57H5IMjL2/bqAO3YCFMw="; }; aarch64-linux = { - url = "https://download-r2.pytorch.org/whl/triton-3.7.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; - hash = "sha256-m4KV9sctz4QNP0ysJcGy/0gu8enq0jQVtI/C2Dc6Fw0="; + url = "https://download-r2.pytorch.org/whl/triton-3.7.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl"; + hash = "sha256-Zo7ZiY+ZmzY79dep1ZUWzkH41di/D0p3cNLufdD57HE="; }; }; "3.7.1" = { x86_64-linux = { - url = "https://download.pytorch.org/whl/triton-3.7.1-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-WWiLm5JPiHMW3ND66ejL5pfuHR9qs4ZyOYLMns3r7gE="; + url = "https://download.pytorch.org/whl/triton-3.7.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-xWy4EDSdNpkCC1t2lUKbm5l1dNqxufRrK2P6I9eVSJQ="; }; aarch64-linux = { - url = "https://download.pytorch.org/whl/triton-3.7.1-cp313-cp313-linux_aarch64.whl"; - hash = "sha256-NIlNUa/xq/ewF/vQxen+chEwXDWZFX/KJR4/QryPAM8="; + url = "https://download.pytorch.org/whl/triton-3.7.1-cp314-cp314-linux_aarch64.whl"; + hash = "sha256-8JH+hQZXlxxxkfeqW8kDdmmtBF2p036rx1GSatu0Vt4="; }; }; "3.8.0" = { x86_64-linux = { - url = "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/2.14.0/rc6/triton-3.8.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; - hash = "sha256-N5GzFsE7IramrxGuYTCvFteG/LORzv0vS38JSqfnQH8="; + url = "https://download.pytorch.org/whl/triton-3.8.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl"; + hash = "sha256-SJ7+VmQeG8XT3zyfO6m8x7uN7kBpGuiMz1STiHN5UaI="; }; aarch64-linux = { - url = "https://huggingface.co/buckets/danieldk/pytorch-rc/resolve/2.14.0/rc6/triton-3.8.0-cp313-cp313-linux_aarch64.whl"; - hash = "sha256-wSLjP1kxqfERDKia4OpaeXkkGw3RVXDsSfKv9qyLcd0="; + url = "https://download.pytorch.org/whl/triton-3.8.0-cp314-cp314-linux_aarch64.whl"; + hash = "sha256-9NoIqNpk/evM/u16gz5HPPt8Zw9YWi/h+vjUm+qz4b0="; }; }; }; diff --git a/nix-builder/pkgs/python-modules/tvm-ffi/default.nix b/nix-builder/pkgs/python-modules/tvm-ffi/default.nix index 64448c2c9..fa951be6d 100644 --- a/nix-builder/pkgs/python-modules/tvm-ffi/default.nix +++ b/nix-builder/pkgs/python-modules/tvm-ffi/default.nix @@ -9,6 +9,7 @@ python, scikit-build-core, setuptools-scm, + typing-extensions, }: buildPythonPackage rec { @@ -32,6 +33,10 @@ buildPythonPackage rec { setuptools-scm ]; + dependencies = [ + typing-extensions + ]; + dontUseCmakeConfigure = true; postInstall = '' diff --git a/nix-builder/pkgs/rocm-packages/overrides.nix b/nix-builder/pkgs/rocm-packages/overrides.nix index e76e591e6..c2cfda6a6 100644 --- a/nix-builder/pkgs/rocm-packages/overrides.nix +++ b/nix-builder/pkgs/rocm-packages/overrides.nix @@ -64,6 +64,9 @@ applyOverrides { buildFlags = null; cmakeFlags = [ "-DSUITESPARSE_ENABLE_PROJECTS=cholmod" ]; outputs = [ "out" ]; + # `postInstall` relies on other outputs than `out`. Since we do not + # need the `postInstall` changes, just skip it. + postInstall = null; })) ]; }; diff --git a/nix-builder/scripts/helpers/prefetch-tpu-wheel.sh b/nix-builder/scripts/helpers/prefetch-tpu-wheel.sh index 31c9f9edb..5eaeb5407 100755 --- a/nix-builder/scripts/helpers/prefetch-tpu-wheel.sh +++ b/nix-builder/scripts/helpers/prefetch-tpu-wheel.sh @@ -8,13 +8,13 @@ # # Usage: # GCLOUD_ACCESS_TOKEN=$(gcloud auth print-access-token) \ -# scripts/helpers/prefetch-tpu-wheel.sh libtpu 0.0.43 [cp313] +# scripts/helpers/prefetch-tpu-wheel.sh libtpu 0.0.43 [cp314] # GCLOUD_ACCESS_TOKEN=$(gcloud auth print-access-token) \ -# scripts/helpers/prefetch-tpu-wheel.sh torch_tpu 0.1.1.dev20260707090224 [cp313] +# scripts/helpers/prefetch-tpu-wheel.sh torch_tpu 0.1.1.dev20260707090224 [cp314] # # Prints a `hash = "sha256-...";` line to paste into the matching # default.nix when bumping a version. The third argument is the -# CPython ABI tag (default cp313, matching the nixpkgs default python +# CPython ABI tag (default cp314, matching the nixpkgs default python # used by the builder). # # Requires `gcloud auth login` once, plus nix (with the `nix-command` @@ -23,7 +23,7 @@ set -euo pipefail pkg="${1:?usage: $0 [abi]}" version="${2:?usage: $0 [abi]}" -abi="${3:-cp313}" +abi="${3:-cp314}" : "${GCLOUD_ACCESS_TOKEN:?set GCLOUD_ACCESS_TOKEN to \$(gcloud auth print-access-token)}" registry_pkg="${pkg//_/-}" From 36142b8b409ed2f4c0c4c9b6708440601f77f0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 17 Sep 2026 07:59:27 +0000 Subject: [PATCH 2/2] nix-builder: fix cc-wrappers unconditionally injecting `-mtls-dialect=gnu2` --- nix-builder/pkgs/rocm-packages-old/clang.nix | 6 ++++++ nix-builder/pkgs/rocm-packages/clang.nix | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/nix-builder/pkgs/rocm-packages-old/clang.nix b/nix-builder/pkgs/rocm-packages-old/clang.nix index db510d3b3..c57235d8a 100644 --- a/nix-builder/pkgs/rocm-packages-old/clang.nix +++ b/nix-builder/pkgs/rocm-packages-old/clang.nix @@ -77,6 +77,12 @@ echo "" > $out/nix-support/add-hardening.sh + # nixpkgs cc-wrappers unconditionally inject "-mtls-dialect=gnu2" for + # clang >= 19.1 on x86_64. This flag is only valid for host-side compile, + # so remove it. + substituteInPlace $out/nix-support/add-local-cc-cflags-before.sh \ + --replace-fail "'-mtls-dialect=gnu2'" "" + # The cc wrapper puts absolute paths to the libstdc++ headers here. # However, absolute paths put them before the ROCm wrappers. This # cause compilation errors in downstream dependencies because e.g. diff --git a/nix-builder/pkgs/rocm-packages/clang.nix b/nix-builder/pkgs/rocm-packages/clang.nix index 0aadb695d..1cebb30c5 100644 --- a/nix-builder/pkgs/rocm-packages/clang.nix +++ b/nix-builder/pkgs/rocm-packages/clang.nix @@ -87,6 +87,12 @@ echo "" > $out/nix-support/add-hardening.sh + # nixpkgs cc-wrappers unconditionally inject "-mtls-dialect=gnu2" for + # clang >= 19.1 on x86_64. This flag is only valid for host-side compile, + # so remove it. + substituteInPlace $out/nix-support/add-local-cc-cflags-before.sh \ + --replace-fail "'-mtls-dialect=gnu2'" "" + # The cc wrapper puts absolute paths to the libstdc++ headers here. # However, absolute paths put them before the ROCm wrappers. This # cause compilation errors in downstream dependencies because e.g.