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

MPS: add exponential op #79188

Closed
wants to merge 3 commits into from
Closed

MPS: add exponential op #79188

wants to merge 3 commits into from

Conversation

kulinseth
Copy link
Collaborator

Add exponential distribution

Fixes #ISSUE_NUMBER

@kulinseth kulinseth added the ciflow/trunk Trigger trunk jobs on your pull request label Jun 9, 2022
@kulinseth kulinseth requested a review from albanD June 9, 2022 06:04
@kulinseth kulinseth requested a review from bdhirsh as a code owner June 9, 2022 06:04
@facebook-github-bot
Copy link
Contributor

facebook-github-bot commented Jun 9, 2022 •
edited
Loading

🔗 Helpful links

✅ No Failures (0 Pending)

As of commit 8bfa816 (more details on the Dr. CI page):

Expand to see more

💚 💚 Looks good so far! There are no failures yet. 💚 💚

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.

@kulinseth
Copy link
Collaborator Author

kulinseth commented Jun 9, 2022 •
edited
Loading

This is failing with :

======================================================================
[225](https://github.com/pytorch/pytorch/runs/6807769871?check_suite_focus=true#step:6:226)
ERROR: test_exponential_kstest (__main__.TestNLLLoss)
[226](https://github.com/pytorch/pytorch/runs/6807769871?check_suite_focus=true#step:6:227)
----------------------------------------------------------------------
[227](https://github.com/pytorch/pytorch/runs/6807769871?check_suite_focus=true#step:6:228)
Traceback (most recent call last):
[228](https://github.com/pytorch/pytorch/runs/6807769871?check_suite_focus=true#step:6:229)
  File "test_mps.py", line 3961, in test_exponential_kstest
[229](https://github.com/pytorch/pytorch/runs/6807769871?check_suite_focus=true#step:6:230)
    from scipy import stats
[230](https://github.com/pytorch/pytorch/runs/6807769871?check_suite_focus=true#step:6:231)
ModuleNotFoundError: No module named 'scipy'

Trying to find an alternative way to test it.

@kulinseth kulinseth requested a review from razarmehr June 9, 2022 22:10
razarmehr
razarmehr approved these changes Jun 10, 2022
View reviewed changes
Copy link
Collaborator

@razarmehr razarmehr left a comment

Choose a reason for hiding this comment

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

Looks good.

@kulinseth
Copy link
Collaborator Author

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

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

@pytorchmergebot
Copy link
Collaborator

Merge failed due to Matched rule superuser, but PR #79188 was not reviewed yet by any of: fduwjj, fbbradheintz, yf225, mehdimashayekhi, bilgeacun, ...
Raised by https://github.com/pytorch/pytorch/actions/runs/2471986818

@kulinseth
Copy link
Collaborator Author

@pytorchbot merge -f

@pytorchmergebot
Copy link
Collaborator

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

@pytorchmergebot
Copy link
Collaborator

Merge failed due to Matched rule superuser, but PR #79188 was not reviewed yet by any of: sstsai-adl, IvanKobzarev, superzgc, SherlockNoMad, pvtuan10, ...
Raised by https://github.com/pytorch/pytorch/actions/runs/2472174207

albanD
albanD approved these changes Jun 10, 2022
View reviewed changes
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.

SGTM

test/test_mps.py
mps_out = torch.zeros(shape, device='mps', dtype=dtype)
mps_out.exponential_(lamda)

print(mps_out.to('cpu').float().mean(), 1 / lamda)
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is not really a valid test...

@albanD
Copy link
Collaborator

albanD commented Jun 10, 2022

@pytorchbot merge

@albanD
Copy link
Collaborator

albanD commented Jun 10, 2022

@kulinseth you weren't able to merge as this PR touches native_functions on top of mps files

@pytorchmergebot
Copy link
Collaborator

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

@github-actions
Copy link

Hey @kulinseth.
You've committed this PR, but it does not have both a 'release notes: ...' and 'topics: ...' label. Please add one of each to the PR. The 'release notes: ...' label should represent the part of PyTorch that this PR changes (fx, autograd, distributed, etc) and the 'topics: ...' label should represent the kind of PR it is (not user facing, new feature, bug fix, perf improvement, etc). The list of valid labels can be found here for the 'release notes: ...' and here for the 'topics: ...'.
For changes that are 'topic: not user facing' there is no need for a release notes label.

facebook-github-bot pushed a commit that referenced this pull request Jun 11, 2022
@kulinseth @facebook-github-bot
MPS: add exponential op (#79188) (#79188)
af8c7de 
Summary:
Add exponential distribution

Fixes #ISSUE_NUMBER

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

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

Reviewed By: osalpekar

Differential Revision: D37085577

Pulled By: osalpekar

fbshipit-source-id: fc59910c59cf136cd55c88b625470fe8abb40c38
kulinseth added a commit to kulinseth/pytorch that referenced this pull request Jul 9, 2022
@kulinseth
MPS: add exponential op (pytorch#79188)
135ebf9 
Add exponential distribution

Fixes #ISSUE_NUMBER

Pull Request resolved: pytorch#79188
Approved by: https://github.com/razarmehr, https://github.com/albanD
atalman pushed a commit to atalman/pytorch that referenced this pull request Jul 22, 2022
@kulinseth @atalman
MPS: add exponential op (pytorch#79188)
f3b4a02 
Add exponential distribution

Fixes #ISSUE_NUMBER

Pull Request resolved: pytorch#79188
Approved by: https://github.com/razarmehr, https://github.com/albanD
atalman added a commit that referenced this pull request Jul 25, 2022
@atalman @kulinseth
@malfet @abhudev @qqaatw @razarmehr
MPS cherry picks for 1.12.1 (#81976)
e8534b9 
* 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
Reviewers

@albanD albanD albanD approved these changes

@razarmehr razarmehr razarmehr approved these changes

@bdhirsh bdhirsh Awaiting requested review from bdhirsh

Assignees
No one assigned
Labels
ciflow/trunk Trigger trunk jobs on your pull request cla signed Merged open source
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@kulinseth @facebook-github-bot @pytorchmergebot @albanD @razarmehr @pytorchbot