diff --git a/pkgs/by-name/op/openai-triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix similarity index 100% rename from pkgs/by-name/op/openai-triton-llvm/package.nix rename to pkgs/by-name/tr/triton-llvm/package.nix diff --git a/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch b/pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch similarity index 100% rename from pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch rename to pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch diff --git a/pkgs/development/python-modules/openai-triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch b/pkgs/development/python-modules/triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch similarity index 100% rename from pkgs/development/python-modules/openai-triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch rename to pkgs/development/python-modules/triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch diff --git a/pkgs/development/python-modules/openai-triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix similarity index 100% rename from pkgs/development/python-modules/openai-triton/bin.nix rename to pkgs/development/python-modules/triton/bin.nix diff --git a/pkgs/development/python-modules/openai-triton/binary-hashes.nix b/pkgs/development/python-modules/triton/binary-hashes.nix similarity index 100% rename from pkgs/development/python-modules/openai-triton/binary-hashes.nix rename to pkgs/development/python-modules/triton/binary-hashes.nix diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/triton/default.nix similarity index 98% rename from pkgs/development/python-modules/openai-triton/default.nix rename to pkgs/development/python-modules/triton/default.nix index c51fc9bb590f..b3b94211a776 100644 --- a/pkgs/development/python-modules/openai-triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -197,7 +197,7 @@ buildPythonPackage rec { # and pythonImportsCheck is commented back. import-triton = runCommand "import-triton" - { nativeBuildInputs = [ (python.withPackages (ps: [ ps.openai-triton ])) ]; } + { nativeBuildInputs = [ (python.withPackages (ps: [ ps.triton ])) ]; } '' python << \EOF import triton diff --git a/pkgs/development/python-modules/openai-triton/prefetch.sh b/pkgs/development/python-modules/triton/prefetch.sh similarity index 100% rename from pkgs/development/python-modules/openai-triton/prefetch.sh rename to pkgs/development/python-modules/triton/prefetch.sh diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0213cda22988..1999720651b3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1026,6 +1026,7 @@ mapAliases ({ onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21 opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08 + openai-triton-llvm = triton-llvm; openafs_1_8 = openafs; # Added 2022-08-22 openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02 openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9c34f6c19fef..b83138a6df9f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -339,6 +339,10 @@ mapAliases ({ notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02 Nuitka = nuitka; # added 2023-02-19 ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead."; + openai-triton = triton; + openai-triton-cuda = triton-cuda; + openai-triton-no-cuda = triton-no-cuda; + openai-triton-bin = triton-bin; openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30 opencv3 = throw "opencv3 has been removed as it is obsolete"; # added 2023-10-12 opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f0a5a8072c2..169796fa0f83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9367,20 +9367,6 @@ self: super: with self; { open-meteo = callPackage ../development/python-modules/open-meteo { }; - openai-triton = callPackage ../development/python-modules/openai-triton { - llvm = pkgs.openai-triton-llvm; - }; - - openai-triton-cuda = self.openai-triton.override { - cudaSupport = true; - }; - - openai-triton-no-cuda = self.openai-triton.override { - cudaSupport = false; - }; - - openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { }; - openai-whisper = callPackage ../development/python-modules/openai-whisper { }; openant = callPackage ../development/python-modules/openant { }; @@ -15755,6 +15741,20 @@ self: super: with self; { trio-websocket = callPackage ../development/python-modules/trio-websocket { }; + triton = callPackage ../development/python-modules/triton { + llvm = pkgs.triton-llvm; + }; + + triton-cuda = self.triton.override { + cudaSupport = true; + }; + + triton-no-cuda = self.triton.override { + cudaSupport = false; + }; + + triton-bin = callPackage ../development/python-modules/triton/bin.nix { }; + tritonclient = callPackage ../development/python-modules/tritonclient { }; troposphere = callPackage ../development/python-modules/troposphere { };