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.

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

[MPS] Fix torch.uint8 support #80049

Closed
wants to merge 1 commit into from
Closed

[MPS] Fix torch.uint8 support #80049

wants to merge 1 commit into from

Conversation

malfet
Copy link
Contributor

@malfet malfet commented Jun 22, 2022

ScalarType.Byte should be cast to MPSDataTypeUInt8
And support for torch.int8 as well as test those conversions in TestMPS.test_to

Fixes #80006

`ScalarType.Byte` should be cast to `MPSDataTypeUInt8`
And support for torch.int8 as well as unittests
@facebook-github-bot
Copy link
Contributor

facebook-github-bot commented Jun 22, 2022

🔗 Helpful links

❌ 2 New Failures

As of commit 9f74da8 (more details on the Dr. CI page):

Expand to see more
  • 2/2 failures introduced in this PR

🕵️ 2 new failures recognized by patterns

The following CI failures do not appear to be due to upstream breakages

See GitHub Actions build trunk / linux-bionic-py3.7-clang9-slow / test (slow, 1, 1, linux.2xlarge) (1/2)

Step: "Test" (full log | diagnosis details | 🔁 rerun)

2022-06-22T18:34:57.6744313Z FAIL [0.002s]: tes...orm_backward_cpu (__main__.TestTorchDeviceTypeCPU)
2022-06-22T18:34:57.6682564Z   test_uniform_kstest_cpu_bfloat16 (__main__.TestTorchDeviceTypeCPU) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T18:34:57.6691049Z   test_uniform_kstest_cpu_float16 (__main__.TestTorchDeviceTypeCPU) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T18:34:57.6699492Z   test_uniform_kstest_cpu_float32 (__main__.TestTorchDeviceTypeCPU) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T18:34:57.6708239Z   test_uniform_kstest_cpu_float64 (__main__.TestTorchDeviceTypeCPU) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T18:34:57.6714828Z   test_untyped_storage_meta_cpu (__main__.TestTorchDeviceTypeCPU) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T18:34:57.6721942Z   test_warn_always_caught_cpu (__main__.TestTorchDeviceTypeCPU) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T18:34:57.6737776Z   test_where_scalar_handcrafted_values_cpu (__main__.TestTorchDeviceTypeCPU) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.002s)
2022-06-22T18:34:57.6743377Z   test_cuda_vitals_gpu_only_cpu (__main__.TestVitalSignsCudaCPU) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.000s)
2022-06-22T18:34:57.6743661Z 
2022-06-22T18:34:57.6743808Z ======================================================================
2022-06-22T18:34:57.6744313Z FAIL [0.002s]: test_pdist_norm_backward_cpu (__main__.TestTorchDeviceTypeCPU)
2022-06-22T18:34:57.6744890Z ----------------------------------------------------------------------
2022-06-22T18:34:57.6745243Z Traceback (most recent call last):
2022-06-22T18:34:57.6745763Z   File "/opt/conda/lib/python3.7/site-packages/torch/testing/_internal/common_device_type.py", line 377, in instantiated_test
2022-06-22T18:34:57.6746065Z     result = test(self, **param_kwargs)
2022-06-22T18:34:57.6746456Z   File "/opt/conda/lib/python3.7/site-packages/torch/testing/_internal/common_utils.py", line 1127, in wrapper
2022-06-22T18:34:57.6746737Z     fn(*args, **kwargs)
2022-06-22T18:34:57.6746956Z   File "test_torch.py", line 3958, in test_pdist_norm_backward
2022-06-22T18:34:57.6747249Z     self._pdist_single(shape, device, p, torch.float64, trans, grad_check=True)
2022-06-22T18:34:57.6747528Z   File "test_torch.py", line 3936, in _pdist_single
2022-06-22T18:34:57.6747795Z     self.assertEqual(x.grad, y.grad)

See GitHub Actions build trunk / linux-bionic-cuda10.2-py3.9-gcc7 / test (slow, 1, 1, linux.4xlarge.nvidia.gpu) (2/2)

Step: "Test" (full log | diagnosis details | 🔁 rerun)

2022-06-22T20:59:57.6809383Z FAIL [0.039s]: tes...m_backward_cuda (__main__.TestTorchDeviceTypeCUDA)
2022-06-22T20:59:57.6709390Z   test_uniform_kstest_cuda_bfloat16 (__main__.TestTorchDeviceTypeCUDA) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T20:59:57.6722205Z   test_uniform_kstest_cuda_float16 (__main__.TestTorchDeviceTypeCUDA) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T20:59:57.6735045Z   test_uniform_kstest_cuda_float32 (__main__.TestTorchDeviceTypeCUDA) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T20:59:57.6748008Z   test_uniform_kstest_cuda_float64 (__main__.TestTorchDeviceTypeCUDA) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T20:59:57.6758052Z   test_untyped_storage_meta_cuda (__main__.TestTorchDeviceTypeCUDA) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T20:59:57.6768691Z   test_warn_always_caught_cuda (__main__.TestTorchDeviceTypeCUDA) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T20:59:57.6792939Z   test_where_scalar_handcrafted_values_cuda (__main__.TestTorchDeviceTypeCUDA) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.002s)
2022-06-22T20:59:57.6806123Z   test_cuda_vitals_gpu_only_cuda (__main__.TestVitalSignsCudaCUDA) ... skip: test is fast; we disabled it with PYTORCH_TEST_SKIP_FAST (0.001s)
2022-06-22T20:59:57.6806818Z 
2022-06-22T20:59:57.6807062Z ======================================================================
2022-06-22T20:59:57.6809383Z FAIL [0.039s]: test_pdist_norm_backward_cuda (__main__.TestTorchDeviceTypeCUDA)
2022-06-22T20:59:57.6810024Z ----------------------------------------------------------------------
2022-06-22T20:59:57.6810653Z Traceback (most recent call last):
2022-06-22T20:59:57.6811220Z   File "/opt/conda/lib/python3.9/site-packages/torch/testing/_internal/common_utils.py", line 1806, in wrapper
2022-06-22T20:59:57.6811588Z     method(*args, **kwargs)
2022-06-22T20:59:57.6812090Z   File "/opt/conda/lib/python3.9/site-packages/torch/testing/_internal/common_utils.py", line 1806, in wrapper
2022-06-22T20:59:57.6812466Z     method(*args, **kwargs)
2022-06-22T20:59:57.6813183Z   File "/opt/conda/lib/python3.9/site-packages/torch/testing/_internal/common_device_type.py", line 377, in instantiated_test
2022-06-22T20:59:57.6813580Z     result = test(self, **param_kwargs)
2022-06-22T20:59:57.6814169Z   File "/opt/conda/lib/python3.9/site-packages/torch/testing/_internal/common_utils.py", line 1127, in wrapper
2022-06-22T20:59:57.6814798Z     fn(*args, **kwargs)

This comment was automatically generated by Dr. CI (expand for details).

Please report bugs/suggestions to the (internal) Dr. CI Users group.

Click here to manually regenerate this comment.

@malfet malfet requested a review from albanD June 22, 2022 17:20
Copy link
Collaborator

@albanD albanD left a comment

Choose a reason for hiding this comment

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

Good catch!

@albanD albanD added the ciflow/trunk Trigger trunk jobs on your pull request label Jun 22, 2022
@malfet
Copy link
Contributor Author

malfet commented Jun 22, 2022

@pytorchbot merge -f

@pytorchmergebot
Copy link
Collaborator

@pytorchbot successfully started a merge job. Check the current status here

@pytorchmergebot
Copy link
Collaborator

@malfet your PR has been successfully merged.

@malfet malfet added topic: bug fixes topic category release notes: mps Release notes category labels Jun 22, 2022
facebook-github-bot pushed a commit that referenced this pull request Jun 23, 2022
Summary:
`ScalarType.Byte` should be cast to `MPSDataTypeUInt8`
And support for `torch.int8` as well as test those conversions in `TestMPS.test_to`

Fixes #80006

Pull Request resolved: #80049
Approved by: https://github.com/albanD

Test Plan: contbuild & OSS CI, see https://hud.pytorch.org/commit/pytorch/pytorch/4390546f8629b8f2f2ca50fd89a14bf5470e06f8

Reviewed By: atalman

Differential Revision: D37357413

Pulled By: malfet

fbshipit-source-id: 0e372147320fdb19fcf1ad3d65cf96cf26086064
Copy link
Collaborator

@kulinseth kulinseth left a comment

Choose a reason for hiding this comment

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

This looks good.

kulinseth pushed a commit to kulinseth/pytorch that referenced this pull request Jul 9, 2022
`ScalarType.Byte` should be cast to `MPSDataTypeUInt8`
And support for `torch.int8` as well as test those conversions in `TestMPS.test_to`

Fixes pytorch#80006

Pull Request resolved: pytorch#80049
Approved by: https://github.com/albanD
@malfet malfet deleted the malfet/fix-mps-uint8 branch July 17, 2022 18:10
atalman pushed a commit to atalman/pytorch that referenced this pull request Jul 22, 2022
`ScalarType.Byte` should be cast to `MPSDataTypeUInt8`
And support for `torch.int8` as well as test those conversions in `TestMPS.test_to`

Fixes pytorch#80006

Pull Request resolved: pytorch#80049
Approved by: https://github.com/albanD
atalman added a commit that referenced this pull request Jul 25, 2022
* MPS: Fixes (#78930)

Cast integer to float in UnaryOps
Add tensor dtype in key generation
Enable FP16 scalars and use placeholder for alpha tensor in add/sum ops

Fixes #ISSUE_NUMBER

Pull Request resolved: #78930
Approved by: https://github.com/albanD

* MPS: Binary cast fix by proper type promotion and remove spurious copy warning (#79185)

Fixes #78019, #78020
Fixes #79185
Pull Request resolved: #79185
Approved by: https://github.com/albanD, https://github.com/razarmehr

* MPS: add exponential op (#79188)

Add exponential distribution

Fixes #ISSUE_NUMBER

Pull Request resolved: #79188
Approved by: https://github.com/razarmehr, https://github.com/albanD

* [MPS] Delete unused vars from OperationUtils.mm

Pull Request resolved: #79514

Approved by: https://github.com/kulinseth, https://github.com/albanD

* [MPS] Fix getDefaultGenerator and copy_kernel_mps

Returning reference to stack memory is really bad

Pull Request resolved: #79515

Approved by: https://github.com/albanD

* [MPS][BE]Do not use `new/delete[]` in `chainViewOperation`

`std::array` will do just fine

Pull Request resolved: #79516

Approved by: https://github.com/albanD

* [MPS] Support stride of stride

Fixes #79181

Pull Request resolved: #79521

Approved by: https://github.com/kulinseth

* MPS: TopK raise an error if K>16 (#79677)

* Error out in TopK when k>16.
* Add a test case too.

Fixes #78915

Pull Request resolved: #79677
Approved by: https://github.com/albanD

* [MPS]: Add fix for squeezed input axes handling in BCE loss (#79676)

Fixes #79527

Pull Request resolved: #79676
Approved by: https://github.com/razarmehr, https://github.com/albanD

* MPS: Add amax and amin Ops with tests  (#79682)

* Add amax and amin with tests

Fixes #ISSUE_NUMBER

Pull Request resolved: #79682
Approved by: https://github.com/albanD

* [MPS] Fix torch.uint8 support (#80049)

`ScalarType.Byte` should be cast to `MPSDataTypeUInt8`
And support for `torch.int8` as well as test those conversions in `TestMPS.test_to`

Fixes #80006

Pull Request resolved: #80049
Approved by: https://github.com/albanD

* [MPS] Fix binary ops between int32 tensor with int64 scalar (#80220)

For some reason, tensor *op* scalar does not follow the normal binary promotion rules
So cast output tensor to expected type if needed
It seems that one should have casted input tensors to expected output tensor type, but it does not really work for boolean binary ops, so...
Add output tensor type/shape to cached graph key
Extend `TestMPS. test_add_scalars` to test for this regression

Fixes #79835

Pull Request resolved: #80220
Approved by: https://github.com/albanD

* [MPS] Add equal operator (#80195)

Which is, in essence is composite of `eq`->`all`->`item`
`native/mps/operators/Equal.cpp` is an almost verbatim copy of `native/cuda/Equal.cpp`

Fix codegen by generating MPSFunctions headers

Pull Request resolved: #80195
Approved by: https://github.com/albanD

* [MPS] add `aten::normal.Tensor_float` `aten::normal.float_Tensor` `aten::normal.Tensor_Tensor` (#80297)

Fixes #ISSUE_NUMBER

Pull Request resolved: #80297
Approved by: https://github.com/albanD, https://github.com/kulinseth

* [MPS] Add flip (#80214)

Fixes #ISSUE_NUMBER

Pull Request resolved: #80214
Approved by: https://github.com/DenisVieriu97, https://github.com/albanD

* [MPS] Add logical ops (#80216)

This PR adds `logical_not`, `logical_and`, `logical_or`, `logical_xor`.
Pull Request resolved: #80216
Approved by: https://github.com/albanD, https://github.com/kulinseth

* [MPS] Add glu (#79866)

Adds mps op for `aten::glu.out`.

Pull Request resolved: #79866
Approved by: https://github.com/kulinseth, https://github.com/albanD

* [MPS] Fix std/var cache issue (#80502)

Use `getTensorsStringKey` which has tensor shape info added as part of the key to prevent cache lookup issue when the shape of input tensor is changed.

Fixes #80499

Pull Request resolved: #80502
Approved by: https://github.com/malfet, https://github.com/kulinseth

* Add scatter support for view operations (#79939)

* Add scatter support for view operations; #78074, #78886, #79672
* Update test_slicing_replace_column to properly test different sizes
* Handle in-place changes for binary ops; add new testcase
* Add new view ops testing scatter; add MPSDebugConfig.h config file for debugging purposes
* Merge gatherViewTensor and scatterViewTensor into a generic function
* Add scatter on demand in scatterViewOperation instead of caching it into a generic graph
* Create separate graphs for scatter and gather;
* Create scatter graph at scatter time

Fixes #ISSUE_NUMBER

Pull Request resolved: #79939
Approved by: https://github.com/razarmehr

* MPS: Fix handling of 1D tensors in linear backward (#80759)

Fixes ##79784

Pull Request resolved: #80759
Approved by: https://github.com/ezyang

* [MPS] Move the View ops to a separate file and reduce the number of graphs created (#80491)

This is dependent on the PR to go in first: #79939

Remove the data_ptr from the View Graph key which reduces the number of
graphs created significantly.

Don't wait when copying from MPS to MPS tensors

Pull Request resolved: #80491
Approved by: https://github.com/malfet

* [MPS] Add softplus backward (#79873)

Fixes #ISSUE_NUMBER

Pull Request resolved: #79873
Approved by: https://github.com/malfet

* [MPS] Add argmin (#80828)

This PR

1. adds argmin
2. refactors `reduction_type` in `ReduceOps.mm` with enum.

Co-authored by Kulin Seth <kulinseth@gmail.com>
Pull Request resolved: #80828
Approved by: https://github.com/malfet

* [MPS] Fix LSTM batch_first output transposed (#80597)

The output of LSTM with `batch_first` should be transposed back to batch first format.

Fixes #80306

Pull Request resolved: #80597
Approved by: https://github.com/kulinseth

* [MPS][BE] Introduce MPSUnaryCachedGraph (#81033)

I.e. CachedGraph that has input and output tensors
Also, add `MPSGraphCache::LookUpAs` template, which combines LookUp with
static_cast to target type

Pull Request resolved: #81033
Approved by: https://github.com/kulinseth

* [MPS] Add test consistency from OpInfo based tests from PR 78504 (#79532)

Pull Request resolved: #79532
Approved by: https://github.com/albanD, https://github.com/malfet

* [MPS] Add huber loss (#80163)

Fixes #ISSUE_NUMBER

Pull Request resolved: #80163
Approved by: https://github.com/kulinseth, https://github.com/malfet

* Remove two tests dependent on the MPS serialization checkin.

* Fix lint error (FLAKE8) F401

* Remove the serialization test from test_mps as its support is not there in 1.12.1.

Co-authored-by: Kulin Seth <kulinseth@gmail.com>
Co-authored-by: Nikita Shulga <nikita.shulga@gmail.com>
Co-authored-by: Kulin Seth <kulin_seth@apple.com>
Co-authored-by: Abhishek Pathak <abhipathak97@gmail.com>
Co-authored-by: Nikita Shulga <nshulga@fb.com>
Co-authored-by: qqaatw <qqaatw@gmail.com>
Co-authored-by: Ramin Azarmehr <razarmehr@apple.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ciflow/trunk Trigger trunk jobs on your pull request cla signed Merged release notes: mps Release notes category topic: bug fixes topic category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

mps bug in Sclising
5 participants