From c826e3056e7aa83dfc1e2dc4cba4e770d77142d4 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 7 Feb 2023 16:11:54 -0800 Subject: [PATCH 1/5] Add dev packages for windows dependencies --- conda/pytorch-cuda/meta.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml index 25e9a5a55..9a3644a19 100644 --- a/conda/pytorch-cuda/meta.yaml +++ b/conda/pytorch-cuda/meta.yaml @@ -5,7 +5,7 @@ # deployment: # https://conda.anaconda.org/pytorch/noarch/ # https://conda.anaconda.org/pytorch/noarch/repodata.json -{% set build = 3 %} +{% set build = 2 %} {% set cuda_constraints=">=11.6,<11.7" %} {% set libcufft_constraints=">=10.7.0.55,<10.7.2.50" %} {% set libcublas_constraints=">=11.8.1.74,<11.10.1.25" %} @@ -42,9 +42,6 @@ requirements: - cuda-libraries {{ cuda_constraints }} - cuda-nvtx {{ cuda_constraints }} - libnvjpeg {{ libnvjpeg_constraints }} - # libnvjpeg-dev required see: https://github.com/pytorch/vision/issues/7185#issuecomment-1420002413 - - libnvjpeg-dev {{ libnvjpeg_constraints }} - run_constrained: - cuda-cudart {{ cuda_constraints }} - cuda-cupti {{ cuda_constraints }} - cuda-nvrtc {{ cuda_constraints }} @@ -54,6 +51,18 @@ requirements: - libcusolver {{ libcusolver_constraints }} - libcusparse {{ libcusparse_constraints }} - libnpp {{ libnpp_constraints }} + - cuda-libraries-dev {{ cuda_constraints }} # [win] + - cuda-nvtx-dev {{ cuda_constraints }} # [win] + - libnvjpeg-dev {{ libnvjpeg_constraints }} # [win] + - cuda-cudart-dev {{ cuda_constraints }} # [win] + - cuda-cupti-dev {{ cuda_constraints }} # [win] + - cuda-nvrtc-dev {{ cuda_constraints }} # [win] + - cuda-runtime-dev {{ cuda_constraints }} # [win] + - libcufft-dev {{ libcufft_constraints }} # [win] + - libcublas-dev {{ libcublas_constraints }} # [win] + - libcusolver-dev {{ libcusolver_constraints }} # [win] + - libcusparse-dev {{ libcusparse_constraints }} # [win] + - libnpp-dev {{ libnpp_constraints }} # [win] test: commands: - echo "pytorch-cuda metapackage is created." From 4d1959a50138138c9f07cc130cdf40e37ecf14bb Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 8 Feb 2023 10:04:38 -0800 Subject: [PATCH 2/5] Adding architecture dependent builds --- conda/pytorch-cuda/conda_build_config.yaml | 3 +++ conda/pytorch-cuda/meta.yaml | 22 +++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/conda/pytorch-cuda/conda_build_config.yaml b/conda/pytorch-cuda/conda_build_config.yaml index baddf875f..67d14f2b1 100644 --- a/conda/pytorch-cuda/conda_build_config.yaml +++ b/conda/pytorch-cuda/conda_build_config.yaml @@ -2,3 +2,6 @@ version: - 11.6 - 11.7 - 11.8 +target_platform: + - win-64 + - linux-64 diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml index 9a3644a19..1e7852a3b 100644 --- a/conda/pytorch-cuda/meta.yaml +++ b/conda/pytorch-cuda/meta.yaml @@ -36,7 +36,6 @@ package: version: {{ version }} build: number: {{ build }} - noarch: generic requirements: run: - cuda-libraries {{ cuda_constraints }} @@ -51,18 +50,15 @@ requirements: - libcusolver {{ libcusolver_constraints }} - libcusparse {{ libcusparse_constraints }} - libnpp {{ libnpp_constraints }} - - cuda-libraries-dev {{ cuda_constraints }} # [win] - - cuda-nvtx-dev {{ cuda_constraints }} # [win] - - libnvjpeg-dev {{ libnvjpeg_constraints }} # [win] - - cuda-cudart-dev {{ cuda_constraints }} # [win] - - cuda-cupti-dev {{ cuda_constraints }} # [win] - - cuda-nvrtc-dev {{ cuda_constraints }} # [win] - - cuda-runtime-dev {{ cuda_constraints }} # [win] - - libcufft-dev {{ libcufft_constraints }} # [win] - - libcublas-dev {{ libcublas_constraints }} # [win] - - libcusolver-dev {{ libcusolver_constraints }} # [win] - - libcusparse-dev {{ libcusparse_constraints }} # [win] - - libnpp-dev {{ libnpp_constraints }} # [win] + - cuda-libraries-dev {{ cuda_constraints }} # [win64] + - libnvjpeg-dev {{ libnvjpeg_constraints }} # [win64] + - cuda-cudart-dev {{ cuda_constraints }} # [win64] + - cuda-nvrtc-dev {{ cuda_constraints }} # [win64] + - libcufft-dev {{ libcufft_constraints }} # [win64] + - libcublas-dev {{ libcublas_constraints }} # [win64] + - libcusolver-dev {{ libcusolver_constraints }} # [win64] + - libcusparse-dev {{ libcusparse_constraints }} # [win64] + - libnpp-dev {{ libnpp_constraints }} # [win64] test: commands: - echo "pytorch-cuda metapackage is created." From 1893d88af3a41b6d8a5c60d9fa9c8ada47d05f02 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 8 Feb 2023 10:58:30 -0800 Subject: [PATCH 3/5] Add notes around windows --- conda/pytorch-cuda/meta.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml index 1e7852a3b..282fb9461 100644 --- a/conda/pytorch-cuda/meta.yaml +++ b/conda/pytorch-cuda/meta.yaml @@ -1,4 +1,10 @@ -# Package to manage cuda version in PyTorch +# Package to manage cuda version in. +# +# Windows anaconda packages are packaged differently, +# All dlls are kept within *-dev packages hence we need +# include the dev packages for Windows see: +# https://github.com/pytorch/vision/issues/7185#issuecomment-1420002413 +# # Please note: Build number should be advanced with # every deployment. After the deployment to production # use following links to validate the correctness of From ec62575be7759e98399fe95869beb3afc73b5d2c Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 8 Feb 2023 10:59:42 -0800 Subject: [PATCH 4/5] fix typo --- conda/pytorch-cuda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml index 282fb9461..15f6845c9 100644 --- a/conda/pytorch-cuda/meta.yaml +++ b/conda/pytorch-cuda/meta.yaml @@ -1,4 +1,4 @@ -# Package to manage cuda version in. +# Package to manage cuda version in PyTorch. # # Windows anaconda packages are packaged differently, # All dlls are kept within *-dev packages hence we need From c005ec75c8d54075a1d450e2c3e99bcc42f2a792 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 8 Feb 2023 11:52:37 -0800 Subject: [PATCH 5/5] Bumping version to v3 --- conda/pytorch-cuda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml index 15f6845c9..ecb438ca8 100644 --- a/conda/pytorch-cuda/meta.yaml +++ b/conda/pytorch-cuda/meta.yaml @@ -11,7 +11,7 @@ # deployment: # https://conda.anaconda.org/pytorch/noarch/ # https://conda.anaconda.org/pytorch/noarch/repodata.json -{% set build = 2 %} +{% set build = 3 %} {% set cuda_constraints=">=11.6,<11.7" %} {% set libcufft_constraints=">=10.7.0.55,<10.7.2.50" %} {% set libcublas_constraints=">=11.8.1.74,<11.10.1.25" %}