Merge branch 'cuda-single-lock' into 'main'

CUDA single lock

See merge request biosignal/software/mednet!36

doc/install.rst

@@ -58,15 +58,12 @@ Choose the relevant tab for details on each of those installation paths.
    .. code:: sh
 
       git clone git@gitlab.idiap.ch:biosignal/software/mednet
-      cd helpers/cuda
-      pixi install --frozen
-      pixi run mednet info
-
-   .. tip::
+      pixi install --frozen --environment cuda
+      pixi run -e cuda mednet info
 
-      The ``--frozen`` flag will ensure that the latest lock-file available
-      with sources is used.  If you'd like to update the lock-file to the
-      latest set of compatible dependencies, remove that option.
+   To enable CUDA support, always run applications using the ``cuda``
+   environment via ``pixi run -e cuda ...``.  Refer to further pixi
+   configuration tips on the *Development* tab above.
 
 
 .. _mednet.setup:

helpers/cuda/pixi.toml

-# SPDX-FileCopyrightText: Copyright © 2023 Idiap Research Institute <contact@idiap.ch>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# INTRODUCTION
-# ------------
-#
-# This pixi manifest file contains an example to create a CUDA-enabled version
-# of the mednet environment.  It loosely follows the recipe in the pixi
-# documentation: https://pixi.sh/latest/advanced/channel_priority/#use-case-pytorch-and-nvidia-with-conda-forge
-#
-# Why is this separated from the main manifest? Check
-# https://github.com/prefix-dev/pixi/issues/1051.
-
-[project]
-name = "mednet"
-channels = ["nvidia", "conda-forge", "pytorch"]
-platforms = ["linux-64"]
-
-# warning: if you add/remove/pin dependencies, also update
-# the equivalent settings at the root's pyproject.toml file.
-#
-# (c.f.: https://github.com/prefix-dev/pixi/issues/1051)
-[dependencies]
-python = "~=3.12.0"
-clapper = "*"
-click = "*"
-credible = "*"
-numpy = "*"
-scipy = "*"
-scikit-image = "*"
-scikit-learn = "*"
-tqdm = "*"
-psutil = "*"
-tabulate = "*"
-matplotlib = "*"
-pillow = "*"
-pytorch = { version = "~=2.2.2", channel = "pytorch" }
-torchvision = { version = "~=0.17.2", channel = "pytorch" }
-lightning = "~=2.2.1"
-tensorboard = "*"
-grad-cam = "~=1.5.0"
-versioningit = "*"
-# special stuff
-cuda = { version = "*", channel = "nvidia" }
-pytorch-cuda = { version = "12.1.*", channel = "pytorch" }
-
-[host-dependencies]
-hatch = "*"
-versioningit = "*"
-pdbpp = "*"
-
-[system-requirements]
-cuda = "12.1"
-
-[pypi-dependencies]
-mednet = { path = "../..", editable = true }

pyproject.toml

@@ -28,11 +28,6 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 
-# warning: if you add/remove/pin dependencies, also update
-# tool.pixi.dependencies in this file, and the equivalent settings at and
-# helpers/cuda/pixi.toml files
-#
-# (c.f.: https://github.com/prefix-dev/pixi/issues/1051)
 dependencies = [
   "clapper",
   "click",
@@ -83,10 +78,6 @@ platforms = ["linux-64", "osx-arm64"]
 [tool.pixi.system-requirements]
 linux = "4.19.0"
 
-# warning: if you add/remove/pin dependencies, also update project.dependencies
-# in this file, and the equivalent settings at and helpers/cuda/pixi.toml files
-#
-# (c.f.: https://github.com/prefix-dev/pixi/issues/1051)
 [tool.pixi.dependencies]
 clapper = "*"
 click = "*"
@@ -169,11 +160,23 @@ uv = "*"
 [tool.pixi.feature.dev.tasks]
 uv-update-lock = "uv pip compile -q pyproject.toml --python-platform=linux -o uv.lock"
 
+[tool.pixi.feature.cuda]
+channels = ["nvidia", {channel = "pytorch", priority = -1}]
+platforms = ["linux-64", "osx-arm64"]
+
+[tool.pixi.feature.cuda.system-requirements]
+cuda = "12.1"
+
+[tool.pixi.feature.cuda.target.linux-64.dependencies]
+cuda = { version = "*", channel = "nvidia" }
+pytorch-cuda = { version = "12.1.*", channel = "pytorch" }
+
 [tool.pixi.environments]
 default = { features = ["qa", "build", "doc", "test", "dev", "py312", "self"] }
 qa-ci = { features = ["qa", "py312"] }
 build-ci = { features = ["build", "py312"] }
 test-ci-311 = { features = ["test", "dev", "py311", "self"] }
+cuda = { features = ["qa", "build", "doc", "test", "dev", "py312", "cuda", "self"] }
 
 [tool.hatch.version]
 source = "versioningit"