From 48491eae440f9a41d8d7d4276258bfd36dc91df9 Mon Sep 17 00:00:00 2001
From: Jeongseok Lee <jeongseok@meta.com>
Date: Tue, 14 Jan 2025 20:04:34 -0800
Subject: [PATCH] Add cuda-nvtx-dev

---
 pixi.lock | 27 +++++++++++++++++++++++++--
 pixi.toml |  7 ++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/pixi.lock b/pixi.lock
index 632dafd9..05ddb3ed 100644
--- a/pixi.lock
+++ b/pixi.lock
@@ -727,6 +727,8 @@ environments:
       - conda: https://conda.anaconda.org/conda-forge/win-64/cmake-3.31.4-hff78f93_0.conda
       - conda: https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_1.conda
       - conda: https://conda.anaconda.org/conda-forge/noarch/comm-0.2.2-pyhd8ed1ab_1.conda
+      - conda: https://conda.anaconda.org/conda-forge/win-64/cuda-nvtx-dev-12.6.77-h57928b3_0.conda
+      - conda: https://conda.anaconda.org/conda-forge/noarch/cuda-version-12.6-h7480c83_3.conda
       - conda: https://conda.anaconda.org/conda-forge/win-64/cxx-compiler-1.9.0-h91493d7_0.conda
       - conda: https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_1.conda
       - conda: https://conda.anaconda.org/conda-forge/win-64/dispenso-1.4.0-he0c23c2_5.conda
@@ -1618,6 +1620,8 @@ environments:
       - conda: https://conda.anaconda.org/conda-forge/win-64/cmake-3.31.4-hff78f93_0.conda
       - conda: https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_1.conda
       - conda: https://conda.anaconda.org/conda-forge/noarch/comm-0.2.2-pyhd8ed1ab_1.conda
+      - conda: https://conda.anaconda.org/conda-forge/win-64/cuda-nvtx-dev-12.6.77-h57928b3_0.conda
+      - conda: https://conda.anaconda.org/conda-forge/noarch/cuda-version-12.6-h7480c83_3.conda
       - conda: https://conda.anaconda.org/conda-forge/win-64/cxx-compiler-1.9.0-h91493d7_0.conda
       - conda: https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_1.conda
       - conda: https://conda.anaconda.org/conda-forge/win-64/dispenso-1.4.0-he0c23c2_5.conda
@@ -1859,6 +1863,7 @@ environments:
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvrtc-12.6.85-hbd13f7d_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvrtc-dev-12.6.85-h5888daf_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvtx-12.6.77-hbd13f7d_0.conda
+      - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvtx-dev-12.6.77-ha770c72_0.conda
       - conda: https://conda.anaconda.org/conda-forge/noarch/cuda-nvvm-dev_linux-64-12.6.85-ha770c72_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvvm-impl-12.6.85-he02047a_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvvm-tools-12.6.85-he02047a_0.conda
@@ -2220,6 +2225,7 @@ environments:
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvrtc-12.6.85-hbd13f7d_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvrtc-dev-12.6.85-h5888daf_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvtx-12.6.77-hbd13f7d_0.conda
+      - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvtx-dev-12.6.77-ha770c72_0.conda
       - conda: https://conda.anaconda.org/conda-forge/noarch/cuda-nvvm-dev_linux-64-12.6.85-ha770c72_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvvm-impl-12.6.85-he02047a_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvvm-tools-12.6.85-he02047a_0.conda
@@ -2581,6 +2587,7 @@ environments:
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvrtc-12.6.85-hbd13f7d_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvrtc-dev-12.6.85-h5888daf_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvtx-12.6.77-hbd13f7d_0.conda
+      - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvtx-dev-12.6.77-ha770c72_0.conda
       - conda: https://conda.anaconda.org/conda-forge/noarch/cuda-nvvm-dev_linux-64-12.6.85-ha770c72_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvvm-impl-12.6.85-he02047a_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvvm-tools-12.6.85-he02047a_0.conda
@@ -2942,6 +2949,7 @@ environments:
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvrtc-12.6.85-hbd13f7d_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvrtc-dev-12.6.85-h5888daf_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvtx-12.6.77-hbd13f7d_0.conda
+      - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvtx-dev-12.6.77-ha770c72_0.conda
       - conda: https://conda.anaconda.org/conda-forge/noarch/cuda-nvvm-dev_linux-64-12.6.85-ha770c72_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvvm-impl-12.6.85-he02047a_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvvm-tools-12.6.85-he02047a_0.conda
@@ -5757,6 +5765,23 @@ packages:
   license: LicenseRef-NVIDIA-End-User-License-Agreement
   size: 31364
   timestamp: 1727816542389
+- conda: https://conda.anaconda.org/conda-forge/linux-64/cuda-nvtx-dev-12.6.77-ha770c72_0.conda
+  sha256: 2fd6de6eb9130d87c48a0f88ef37a6b6a0552cea2e75fc4406deeda865e1a824
+  md5: 6bedc1e8b1b021b03d33de2282846802
+  depends:
+  - cuda-nvtx 12.6.77 hbd13f7d_0
+  - cuda-version >=12.6,<12.7.0a0
+  license: LicenseRef-NVIDIA-End-User-License-Agreement
+  size: 50324
+  timestamp: 1727816548468
+- conda: https://conda.anaconda.org/conda-forge/win-64/cuda-nvtx-dev-12.6.77-h57928b3_0.conda
+  sha256: d107c93b86c68bac6258ee7667f88e9d58010f20e72f8901e43ec22735d4db6e
+  md5: 6e00df7c8a82a6b08e05c3aebf7e455e
+  depends:
+  - cuda-version
+  license: LicenseRef-NVIDIA-End-User-License-Agreement
+  size: 48686
+  timestamp: 1727816667176
 - conda: https://conda.anaconda.org/conda-forge/noarch/cuda-nvvm-dev_linux-64-12.6.85-ha770c72_0.conda
   sha256: f1df1d3ba7a8292d06acca271c5c5793b4b1f25e7c8c005b841f866816edf2c7
   md5: 9c1f1ecfd9990b549312b3206d9c003b
@@ -13937,8 +13962,6 @@ packages:
   md5: b5d67f3426bdb2305314da4874d3e443
   depends:
   - pytorch 2.5.1 cuda*_mkl*309
-  arch: x86_64
-  platform: linux
   license: BSD-3-Clause
   license_family: BSD
   size: 36095
diff --git a/pixi.toml b/pixi.toml
index 19efb7ac..db0dee75 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -219,6 +219,7 @@ build_py = { cmd = "pip install . -vv", env = { CMAKE_ARGS = """
 #=========
 
 [target.win-64.dependencies]
+cuda-nvtx-dev = ">=12.6.77,<13"
 
 [target.win-64.tasks]
 config = { cmd = """
@@ -297,19 +298,19 @@ platforms = ["linux-64", "osx-64", "osx-arm64", "win-64"]
 channels = ["conda-forge"]
 platforms = ["linux-64"]
 system-requirements = { cuda = "12.0" }
-dependencies = { cuda-toolkit = "12.*", python = "3.12.*", pytorch-gpu = { version = ">=2.5.1,<3", build = "cuda126_*" } }
+dependencies = { cuda-toolkit = "12.*", python = "3.12.*", pytorch-gpu = { version = ">=2.5.1,<3", build = "cuda126_*" } , cuda-nvtx-dev = ">=12.6.77,<13" }
 
 [feature.py311-cuda126]
 channels = ["conda-forge"]
 platforms = ["linux-64"]
 system-requirements = { cuda = "12.0" }
-dependencies = { cuda-toolkit = "12.*", python = "3.11.*", pytorch-gpu = { version = ">=2.5.1,<3", build = "cuda126_*" } }
+dependencies = { cuda-toolkit = "12.*", python = "3.11.*", pytorch-gpu = { version = ">=2.5.1,<3", build = "cuda126_*" } , cuda-nvtx-dev = ">=12.6.77,<13" }
 
 [feature.py310-cuda126]
 channels = ["conda-forge"]
 platforms = ["linux-64"]
 system-requirements = { cuda = "12.0" }
-dependencies = { cuda-toolkit = "12.*", python = "3.10.*", pytorch-gpu = { version = ">=2.5.1,<3", build = "cuda126_*" } }
+dependencies = { cuda-toolkit = "12.*", python = "3.10.*", pytorch-gpu = { version = ">=2.5.1,<3", build = "cuda126_*" } , cuda-nvtx-dev = ">=12.6.77,<13" }
 
 #==============
 # Environments