Skip to content

Commit e5a5f0b

Browse files
authored
Update hardcoded WIN-CUDA from 11.1 with 11.3 (#5451)
Also, remove reference to conda-forge, all CUDA toolchain should be available from NVIDIA channel Install h5py from pip on Windows and skip failing gaussian_blur tests if Win+CUDA11.3 is used
1 parent 86a14cb commit e5a5f0b

File tree

5 files changed

+17
-4
lines changed

5 files changed

+17
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.circleci/config.yml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ jobs:
848848
executor:
849849
name: windows-gpu
850850
environment:
851-
CUDA_VERSION: "11.1"
851+
CUDA_VERSION: "11.3"
852852
PYTHON_VERSION: << parameters.python_version >>
853853
steps:
854854
- checkout

.circleci/unittest/windows/scripts/environment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ dependencies:
99
- libpng
1010
- jpeg
1111
- ca-certificates
12-
- h5py
12+
- hdf5
1313
- pip:
1414
- future
1515
- pillow >=5.3.0, !=8.3.*
1616
- scipy
1717
- av
1818
- dataclasses
19+
- h5py

.circleci/unittest/windows/scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ else
2828
fi
2929

3030
printf "Installing PyTorch with %s\n" "${cudatoolkit}"
31-
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD_CHANNEL}"::pytorch[build="*${version}*"] "${cudatoolkit}" pytest
31+
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c nvidia "pytorch-${UPLOAD_CHANNEL}"::pytorch[build="*${version}*"] "${cudatoolkit}" pytest
3232

3333
torch_cuda=$(python -c "import torch; print(torch.cuda.is_available())")
3434
echo torch.cuda.is_available is $torch_cuda

test/test_transforms_tensor.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import os
2+
import sys
23

34
import numpy as np
45
import pytest
@@ -958,6 +959,17 @@ def test_random_apply(device):
958959
)
959960
@pytest.mark.parametrize("channels", [1, 3])
960961
def test_gaussian_blur(device, channels, meth_kwargs):
962+
if all(
963+
[
964+
device == "cuda",
965+
channels == 1,
966+
meth_kwargs["kernel_size"] in [23, [23]],
967+
torch.version.cuda == "11.3",
968+
sys.platform in ("win32", "cygwin"),
969+
]
970+
):
971+
pytest.skip("Fails on Windows, see https://github.com/pytorch/vision/issues/5464")
972+
961973
tol = 1.0 + 1e-10
962974
torch.manual_seed(12)
963975
_test_class_op(

0 commit comments

Comments
 (0)