Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix several test_ops cuda dtypes tests #60922

Closed
wants to merge 6 commits into from
Closed

Fix several test_ops cuda dtypes tests #60922

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8561bcc
fix
xwang233 Jun 29, 2021
2a07f25
fix
xwang233 Jun 29, 2021
8251de7
Merge remote-tracking branch 'upstream/master' into cuda_dtypes_fix
xwang233 Jun 29, 2021
fc3426e
Merge remote-tracking branch 'upstream/master' into cuda_dtypes_fix
xwang233 Jul 1, 2021
93fd817
Merge remote-tracking branch 'upstream/master' into cuda_dtypes_fix
xwang233 Jul 6, 2021
05fca2e
SM60OrLater and CUDA11OrLater
xwang233 Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions torch/testing/_internal/common_cuda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
CUDA11OrLater = torch.version.cuda and distutils.version.LooseVersion(torch.version.cuda) >= "11.0"
CUDA9 = torch.version.cuda and torch.version.cuda.startswith('9.')
SM53OrLater = torch.cuda.is_available() and torch.cuda.get_device_capability() >= (5, 3)
SM60OrLater = torch.cuda.is_available() and torch.cuda.get_device_capability() >= (6, 0)

TEST_MAGMA = TEST_CUDA
if TEST_CUDA:
Expand Down
10 changes: 6 additions & 4 deletions torch/testing/_internal/common_methods_invocations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from torch.testing._internal.common_device_type import \
(skipIf, skipCUDAIfNoMagma, skipCUDAIfNoMagmaAndNoCusolver, skipCUDAIfNoCusolver,
skipCPUIfNoLapack, skipCPUIfNoFFT, skipCUDAIfRocm, precisionOverride, toleranceOverride, tol)
from torch.testing._internal.common_cuda import CUDA11OrLater, SM53OrLater
from torch.testing._internal.common_cuda import CUDA11OrLater, SM53OrLater, SM60OrLater
from torch.testing._internal.common_utils import \
(is_iterable_of_tensors,
random_symmetric_matrix, random_symmetric_psd_matrix,
Expand Down Expand Up @@ -6069,7 +6069,8 @@ def gradcheck_wrapper_triangular_input(op, input, *args, upper=False, **kwargs):
dtypesIfCPU=all_types_and_complex(),
dtypesIfCUDA=floating_and_complex_types_and(torch.float16, *[torch.bfloat16] if CUDA11OrLater else []),
dtypesIfROCM=floating_types_and(torch.half, torch.bfloat16),
backward_dtypesIfCUDA=floating_and_complex_types_and(torch.float16),
backward_dtypesIfCUDA=floating_and_complex_types_and(torch.float16,
*[torch.bfloat16] if SM60OrLater else []),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the sm_60 check would be sufficient, as bfloat16 should have been introduced in CUDA11 (https://docs.nvidia.com/cuda/archive/11.0/cuda-toolkit-release-notes/index.html#cuda-general-new-features), so this could fail on 10 and previous releases. Wouldn't if CUDA11OrLater as done for the forward pass also work here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It unfortunately failed in my previous commit which was using CUDA11OrLater, see https://app.circleci.com/pipelines/github/pytorch/pytorch/343601/workflows/695dad4b-86d7-49f4-b4c5-e2aa7b1d0bfa/jobs/14465553

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may use something like (CUDA11OrLater and SM60OrLater).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you want to try that change, @xwang233?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The skip on line 6079 should be removed once the dtypes are corrected

assert_autodiffed=True,
sample_inputs_func=sample_inputs_matmul,
skips=(
Expand Down Expand Up @@ -6545,7 +6546,8 @@ def gradcheck_wrapper_triangular_input(op, input, *args, upper=False, **kwargs):
dtypesIfCPU=all_types_and_complex(),
dtypesIfCUDA=floating_types_and(torch.float16, *[torch.bfloat16] if CUDA11OrLater else [],
torch.complex64, torch.complex128),
backward_dtypesIfCUDA=floating_types_and(torch.float16, torch.complex64, torch.complex128),
backward_dtypesIfCUDA=floating_types_and(torch.float16, *[torch.bfloat16] if SM60OrLater else [],
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The skip on line 6557 needs to be removed

torch.complex64, torch.complex128),
assert_autodiffed=True,
sample_inputs_func=sample_inputs_matmul,
supports_out=False,
Expand Down Expand Up @@ -6904,7 +6906,7 @@ def gradcheck_wrapper_triangular_input(op, input, *args, upper=False, **kwargs):
op=lambda tensors, equation: torch.einsum(equation, tensors),
dtypes=all_types_and_complex_and(torch.half, torch.bfloat16),
dtypesIfCUDA=floating_and_complex_types_and(torch.half, *[torch.bfloat16] if CUDA11OrLater else []),
backward_dtypesIfCUDA=floating_and_complex_types_and(torch.half),
backward_dtypesIfCUDA=floating_and_complex_types_and(torch.half, *[torch.bfloat16] if SM60OrLater else []),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The skip on line 6915 needs to be removed

supports_out=False,
sample_inputs_func=sample_inputs_einsum,
skips=(
Expand Down