From 124f6d26006ef86d50b81b3b531337b37b0b0070 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 2 Aug 2022 09:21:30 -0700 Subject: [PATCH 1/3] Adding pytorch-cuda metapackage --- conda/pytorch-cuda/conda_build_config.yaml | 3 ++ conda/pytorch-cuda/meta.yaml | 53 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 conda/pytorch-cuda/conda_build_config.yaml create mode 100644 conda/pytorch-cuda/meta.yaml diff --git a/conda/pytorch-cuda/conda_build_config.yaml b/conda/pytorch-cuda/conda_build_config.yaml new file mode 100644 index 000000000..29285c340 --- /dev/null +++ b/conda/pytorch-cuda/conda_build_config.yaml @@ -0,0 +1,3 @@ +cuda_version: + - 11.6 + - 11.7 diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml new file mode 100644 index 000000000..d3522dd9a --- /dev/null +++ b/conda/pytorch-cuda/meta.yaml @@ -0,0 +1,53 @@ +{% set build = 0 %} +{% set version="1.0" %} + +{% set cuda_constraints=">=11.6,<11.7" %} +{% if cuda_version == '11.7' %} +{% set cuda_constraints=">=11.7,<11.8" %} +{% endif %} + +package: + name: pytorch-cuda + version: {{ version }} +build: + number: {{ build }} + string: cuda{{ cuda_version }} + noarch: generic +requirements: + run_constrained: + - cuda {{ cuda_constraints }} + - cuda-cccl {{ cuda_constraints }} + - cuda-command-line-tools {{ cuda_constraints }} + - cuda-compiler {{ cuda_constraints }} + - cuda-cudart {{ cuda_constraints }} + - cuda-cudart-dev {{ cuda_constraints }} + - cuda-cuobjdump {{ cuda_constraints }} + - cuda-cupti {{ cuda_constraints }} + - cuda-cuxxfilt {{ cuda_constraints }} + - cuda-driver-dev {{ cuda_constraints }} + - cuda-gdb {{ cuda_constraints }} + - cuda-libraries {{ cuda_constraints }} + - cuda-libraries-dev {{ cuda_constraints }} + - cuda-cudaart-dev {{ cuda_constraints }} + - cuda-memcheck {{ cuda_constraints }} + - cuda-nvcc {{ cuda_constraints }} + - cuda-nvdisasm {{ cuda_constraints }} + - cuda-nvml-dev {{ cuda_constraints }} + - cuda-nvprof {{ cuda_constraints }} + - cuda-nvprune {{ cuda_constraints }} + - cuda-nvrtc {{ cuda_constraints }} + - cuda-nvrtc-dev {{ cuda_constraints }} + - cuda-nvtx {{ cuda_constraints }} + - cuda-nvvp {{ cuda_constraints }} + - cuda-runtime {{ cuda_constraints }} + - cuda-samples {{ cuda_constraints }} + - cuda-sanitizer-api {{ cuda_constraints }} + - cuda-toolkit {{ cuda_constraints }} + - cuda-tools {{ cuda_constraints }} + - cuda-visual-tools {{ cuda_constraints }} + # None, pytorch should depend on pytorch-cuda +test: + commands: + - echo "pytorch-cuda metapackage is created." +about: + summary: Metapackage to select the PyTorch variant. Use conda's pinning mechanism in your environment to control which variant you want. From b2d56b0100e51592961f383fb3cdcabe12e05c85 Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 4 Aug 2022 10:19:57 -0700 Subject: [PATCH 2/3] Simplify packages --- conda/pytorch-cuda/meta.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml index d3522dd9a..e9cb7b8a3 100644 --- a/conda/pytorch-cuda/meta.yaml +++ b/conda/pytorch-cuda/meta.yaml @@ -25,26 +25,19 @@ requirements: - cuda-cupti {{ cuda_constraints }} - cuda-cuxxfilt {{ cuda_constraints }} - cuda-driver-dev {{ cuda_constraints }} - - cuda-gdb {{ cuda_constraints }} - cuda-libraries {{ cuda_constraints }} - cuda-libraries-dev {{ cuda_constraints }} - cuda-cudaart-dev {{ cuda_constraints }} - - cuda-memcheck {{ cuda_constraints }} - cuda-nvcc {{ cuda_constraints }} - - cuda-nvdisasm {{ cuda_constraints }} - cuda-nvml-dev {{ cuda_constraints }} - - cuda-nvprof {{ cuda_constraints }} - cuda-nvprune {{ cuda_constraints }} - cuda-nvrtc {{ cuda_constraints }} - cuda-nvrtc-dev {{ cuda_constraints }} - cuda-nvtx {{ cuda_constraints }} - - cuda-nvvp {{ cuda_constraints }} - cuda-runtime {{ cuda_constraints }} - - cuda-samples {{ cuda_constraints }} - cuda-sanitizer-api {{ cuda_constraints }} - cuda-toolkit {{ cuda_constraints }} - cuda-tools {{ cuda_constraints }} - - cuda-visual-tools {{ cuda_constraints }} # None, pytorch should depend on pytorch-cuda test: commands: From 53997b01c454459dac025c6dbad400b1d63736c1 Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 8 Aug 2022 17:15:31 -0700 Subject: [PATCH 3/3] Modify pytorch-cuda package --- conda/pytorch-cuda/conda_build_config.yaml | 2 +- conda/pytorch-cuda/meta.yaml | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/conda/pytorch-cuda/conda_build_config.yaml b/conda/pytorch-cuda/conda_build_config.yaml index 29285c340..802638b8e 100644 --- a/conda/pytorch-cuda/conda_build_config.yaml +++ b/conda/pytorch-cuda/conda_build_config.yaml @@ -1,3 +1,3 @@ -cuda_version: +version: - 11.6 - 11.7 diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml index e9cb7b8a3..92c970654 100644 --- a/conda/pytorch-cuda/meta.yaml +++ b/conda/pytorch-cuda/meta.yaml @@ -1,8 +1,6 @@ {% set build = 0 %} -{% set version="1.0" %} - {% set cuda_constraints=">=11.6,<11.7" %} -{% if cuda_version == '11.7' %} +{% if version == '11.7' %} {% set cuda_constraints=">=11.7,<11.8" %} {% endif %} @@ -11,11 +9,11 @@ package: version: {{ version }} build: number: {{ build }} - string: cuda{{ cuda_version }} noarch: generic requirements: + run: + - cuda={{ version }} run_constrained: - - cuda {{ cuda_constraints }} - cuda-cccl {{ cuda_constraints }} - cuda-command-line-tools {{ cuda_constraints }} - cuda-compiler {{ cuda_constraints }} @@ -35,7 +33,6 @@ requirements: - cuda-nvrtc-dev {{ cuda_constraints }} - cuda-nvtx {{ cuda_constraints }} - cuda-runtime {{ cuda_constraints }} - - cuda-sanitizer-api {{ cuda_constraints }} - cuda-toolkit {{ cuda_constraints }} - cuda-tools {{ cuda_constraints }} # None, pytorch should depend on pytorch-cuda