From 0027083cc29f1a03b15070b13055ac31c229a3be Mon Sep 17 00:00:00 2001
From: Dennis Wuitz <dennish@wuitz.de>
Date: Thu, 18 Jul 2024 22:24:12 +0200
Subject: [PATCH] python312Packages.triton*: rename from openai-triton*

The repository moved out of the openai org, so it doesn't make sense to
prefix the package with it.
---
 .../triton-llvm}/package.nix                   |  6 +++---
 .../python-modules/openai-whisper/default.nix  |  4 ++--
 .../python-modules/openllm/default.nix         |  4 ++--
 pkgs/development/python-modules/torch/bin.nix  |  4 ++--
 .../python-modules/torch/default.nix           |  8 ++++----
 .../0000-dont-download-ptxas.patch             |  0
 ...able-version-key-for-non-cuda-targets.patch |  0
 .../{openai-triton => triton}/bin.nix          |  6 +++---
 .../binary-hashes.nix                          |  0
 .../{openai-triton => triton}/default.nix      |  6 +++---
 .../{openai-triton => triton}/prefetch.sh      |  0
 .../python-modules/xformers/default.nix        |  4 ++--
 .../rocm-modules/5/miopengemm/default.nix      |  2 +-
 pkgs/top-level/python-aliases.nix              |  5 +++++
 pkgs/top-level/python-packages.nix             | 18 +++++++++---------
 pkgs/top-level/release-cuda.nix                |  2 +-
 16 files changed, 37 insertions(+), 32 deletions(-)
 rename pkgs/by-name/{op/openai-triton-llvm => tr/triton-llvm}/package.nix (97%)
 rename pkgs/development/python-modules/{openai-triton => triton}/0000-dont-download-ptxas.patch (100%)
 rename pkgs/development/python-modules/{openai-triton => triton}/0001-ptxas-disable-version-key-for-non-cuda-targets.patch (100%)
 rename pkgs/development/python-modules/{openai-triton => triton}/bin.nix (91%)
 rename pkgs/development/python-modules/{openai-triton => triton}/binary-hashes.nix (100%)
 rename pkgs/development/python-modules/{openai-triton => triton}/default.nix (96%)
 rename pkgs/development/python-modules/{openai-triton => triton}/prefetch.sh (100%)

diff --git a/pkgs/by-name/op/openai-triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
similarity index 97%
rename from pkgs/by-name/op/openai-triton-llvm/package.nix
rename to pkgs/by-name/tr/triton-llvm/package.nix
index 7b6f40662a75e..90a45c133c732 100644
--- a/pkgs/by-name/op/openai-triton-llvm/package.nix
+++ b/pkgs/by-name/tr/triton-llvm/package.nix
@@ -36,7 +36,7 @@ let
   llvmTargetsToBuild' = [ "AMDGPU" "NVPTX" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild;
 
   # This LLVM version can't seem to find pygments/pyyaml,
-  # but a later update will likely fix this (openai-triton-2.1.0)
+  # but a later update will likely fix this (triton-2.1.0)
   python =
     if buildTests
     then python3Packages.python.withPackages (p: with p; [ psutil pygments pyyaml ])
@@ -44,7 +44,7 @@ let
 
   isNative = stdenv.hostPlatform == stdenv.buildPlatform;
 in stdenv.mkDerivation (finalAttrs: {
-  pname = "openai-triton-llvm";
+  pname = "triton-llvm";
   version = "17.0.0-c5dede880d17";
 
   outputs = [
@@ -55,7 +55,7 @@ in stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  # See https://github.com/openai/triton/blob/main/python/setup.py
+  # See https://github.com/triton-lang/triton/blob/main/python/setup.py
   # and https://github.com/ptillet/triton-llvm-releases/releases
   src = fetchFromGitHub {
     owner = "llvm";
diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix
index d6933e1aeea1b..06d4a1f55d9ac 100644
--- a/pkgs/development/python-modules/openai-whisper/default.nix
+++ b/pkgs/development/python-modules/openai-whisper/default.nix
@@ -15,7 +15,7 @@
   more-itertools,
   numba,
   numpy,
-  openai-triton,
+  triton,
   tiktoken,
   torch,
   tqdm,
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     tiktoken
     torch
     tqdm
-  ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform openai-triton) [ openai-triton ];
+  ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform triton) [ triton ];
 
   preCheck = ''
     export HOME=$TMPDIR
diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/development/python-modules/openllm/default.nix
index 5d5af060d8465..ccb32de341ea0 100644
--- a/pkgs/development/python-modules/openllm/default.nix
+++ b/pkgs/development/python-modules/openllm/default.nix
@@ -40,7 +40,7 @@
   tabulate,
   tiktoken,
   transformers,
-  openai-triton,
+  triton,
   xformers,
 }:
 
@@ -117,7 +117,7 @@ buildPythonPackage rec {
       # auto-gptq
     ]; # ++ autogptq.optional-dependencies.triton;
     grpc = [ bentoml ] ++ bentoml.optional-dependencies.grpc;
-    mpt = [ openai-triton ];
+    mpt = [ triton ];
     openai = [
       openai
       tiktoken
diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index ec6843deac98c..d5b267277b556 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -22,7 +22,7 @@
   jinja2,
   networkx,
   filelock,
-  openai-triton,
+  triton,
 }:
 
 let
@@ -88,7 +88,7 @@ buildPythonPackage {
     jinja2
     networkx
     filelock
-  ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ openai-triton ];
+  ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ triton ];
 
   postInstall = ''
     # ONNX conversion
diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix
index 40f26d2821835..ee7015abd8e63 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/default.nix
@@ -53,9 +53,9 @@
   cffi,
   click,
   typing-extensions,
-  # ROCm build and `torch.compile` requires `openai-triton`
+  # ROCm build and `torch.compile` requires `triton`
   tritonSupport ? (!stdenv.isDarwin),
-  openai-triton,
+  triton,
 
   # Unit tests
   hypothesis,
@@ -486,7 +486,7 @@ buildPythonPackage rec {
       CoreServices
       libobjc
     ]
-    ++ lib.optionals tritonSupport [ openai-triton ]
+    ++ lib.optionals tritonSupport [ triton ]
     ++ lib.optionals MPISupport [ mpi ]
     ++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
 
@@ -514,7 +514,7 @@ buildPythonPackage rec {
 
     # torch/csrc requires `pybind11` at runtime
     pybind11
-  ] ++ lib.optionals tritonSupport [ openai-triton ];
+  ] ++ lib.optionals tritonSupport [ triton ];
 
   propagatedCxxBuildInputs =
     [ ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
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 91%
rename from pkgs/development/python-modules/openai-triton/bin.nix
rename to pkgs/development/python-modules/triton/bin.nix
index d9e4516b8e21f..226f494694031 100644
--- a/pkgs/development/python-modules/openai-triton/bin.nix
+++ b/pkgs/development/python-modules/triton/bin.nix
@@ -80,12 +80,12 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Language and compiler for custom Deep Learning operations";
-    homepage = "https://github.com/openai/triton/";
-    changelog = "https://github.com/openai/triton/releases/tag/v${version}";
+    homepage = "https://github.com/triton-lang/triton/";
+    changelog = "https://github.com/triton-lang/triton/releases/tag/v${version}";
     # Includes NVIDIA's ptxas, but redistributions of the binary are not limited.
     # https://docs.nvidia.com/cuda/eula/index.html
     # triton's license is MIT.
-    # openai-triton-bin includes ptxas binary, therefore unfreeRedistributable is set.
+    # triton-bin includes ptxas binary, therefore unfreeRedistributable is set.
     license = with licenses; [
       unfreeRedistributable
       mit
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 96%
rename from pkgs/development/python-modules/openai-triton/default.nix
rename to pkgs/development/python-modules/triton/default.nix
index 3a7f9741a3b82..f1e97ed86cc1d 100644
--- a/pkgs/development/python-modules/openai-triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
       ./0000-dont-download-ptxas.patch
     ]
     ++ lib.optionals (!cudaSupport) [
-      # openai-triton wants to get ptxas version even if ptxas is not
+      # triton wants to get ptxas version even if ptxas is not
       # used, resulting in ptxas not found error.
       ./0001-ptxas-disable-version-key-for-non-cuda-targets.patch
     ];
@@ -121,7 +121,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     filelock
-    # openai-triton uses setuptools at runtime:
+    # triton uses setuptools at runtime:
     # https://github.com/NixOS/nixpkgs/pull/286763/#discussion_r1480392652
     setuptools
   ];
@@ -191,7 +191,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/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix
index 9a7b7bbef2b15..530f002110867 100644
--- a/pkgs/development/python-modules/xformers/default.nix
+++ b/pkgs/development/python-modules/xformers/default.nix
@@ -18,7 +18,7 @@
   fairscale,
   scipy,
   cmake,
-  openai-triton,
+  triton,
   networkx,
   #, apex
   einops,
@@ -103,7 +103,7 @@ buildPythonPackage {
     scipy
     cmake
     networkx
-    openai-triton
+    triton
     # apex
     einops
     transformers
diff --git a/pkgs/development/rocm-modules/5/miopengemm/default.nix b/pkgs/development/rocm-modules/5/miopengemm/default.nix
index 342bd950b1fb1..c86a4f5b1edaf 100644
--- a/pkgs/development/rocm-modules/5/miopengemm/default.nix
+++ b/pkgs/development/rocm-modules/5/miopengemm/default.nix
@@ -67,7 +67,7 @@ in stdenv.mkDerivation (finalAttrs: {
     openblas
   ] ++ lib.optionals buildBenchmarks [
     clblast
-    python3Packages.openai-triton
+    python3Packages.triton
   ];
 
   cmakeFlags = [
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index dc4d8092cf328..af2dce8d8cbe6 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -331,6 +331,11 @@ 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; # added 2024-07-18
+  openai-triton-bin = triton-bin; # added 2024-07-18
+  openai-triton-cuda = triton-cuda; # added 2024-07-18
+  openai-triton-llvm = triton-llvm; # added 2024-07-18
+  openai-triton-no-cuda = triton-no-cuda; # added 2024-07-18
   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 4ead26c9e215b..2ddd6de62105f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4570,7 +4570,7 @@ self: super: with self; {
   oelint-parser = callPackage ../development/python-modules/oelint-parser { };
 
   openllm = callPackage ../development/python-modules/openllm {
-    openai-triton = self.openai-triton-cuda;
+    triton = self.triton-cuda;
   };
 
   openllm-client = callPackage ../development/python-modules/openllm-client { };
@@ -9337,19 +9337,19 @@ 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;
+  triton = callPackage ../development/python-modules/triton {
+    llvm = pkgs.triton-llvm;
   };
 
-  openai-triton-cuda = self.openai-triton.override {
+  triton-cuda = self.triton.override {
     cudaSupport = true;
   };
 
-  openai-triton-no-cuda = self.openai-triton.override {
+  triton-no-cuda = self.triton.override {
     cudaSupport = false;
   };
 
-  openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { };
+  triton-bin = callPackage ../development/python-modules/triton/bin.nix { };
 
   openai-whisper = callPackage ../development/python-modules/openai-whisper { };
 
@@ -15537,13 +15537,13 @@ self: super: with self; {
   torch-pitch-shift = callPackage ../development/python-modules/torch-pitch-shift { };
 
   torch-bin = callPackage ../development/python-modules/torch/bin.nix {
-    openai-triton = self.openai-triton-bin;
+    triton = self.triton-bin;
   };
 
   torchsnapshot = callPackage ../development/python-modules/torchsnapshot { };
 
   torchWithCuda = self.torch.override {
-    openai-triton = self.openai-triton-cuda;
+    triton = self.triton-cuda;
     cudaSupport = true;
     rocmSupport = false;
   };
@@ -15553,7 +15553,7 @@ self: super: with self; {
   };
 
   torchWithRocm = self.torch.override {
-    openai-triton = self.openai-triton-no-cuda;
+    triton = self.triton-no-cuda;
     rocmSupport = true;
     cudaSupport = false;
   };
diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index 365e306455ac1..e3590fcd3d466 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -132,7 +132,7 @@ let
         mxnet = linux;
         numpy = linux; # Only affected by MKL?
         onnx = linux;
-        openai-triton = linux;
+        triton = linux;
         openai-whisper = linux;
         opencv4 = linux;
         opensfm = linux;