Skip to content

Fix error message for cat-ing zero-dim tensors #5819

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
Merged
ezyang merged 2 commits into from
Mar 19, 2018
Merged

Fix error message for cat-ing zero-dim tensors #5819

ezyang merged 2 commits into from
Mar 19, 2018

Conversation

@zou3519
Copy link
Contributor

@zou3519 zou3519 commented Mar 15, 2018

Fixes #5552

cc @gchanan

@onnxbot-worker-3 onnxbot-worker-3 mentioned this pull request Mar 15, 2018
Closed
@zou3519 zou3519 changed the title Fix error message for cat-ing zero-dim tensors [wip] Fix error message for cat-ing zero-dim tensors Mar 15, 2018
@zou3519 zou3519 force-pushed the fix-cat-save-size branch 3 times, most recently from 1f61020 to e2d871d Compare March 16, 2018 14:53
@zou3519 zou3519 changed the title [wip] Fix error message for cat-ing zero-dim tensors Fix error message for cat-ing zero-dim tensors Mar 16, 2018
@zou3519
Copy link
Contributor Author

zou3519 commented Mar 16, 2018

Okay this should be good for reviewing now. Today I learned that IntList is not the same thing as std::vector<int64_t>.

@apaszke
Copy link
Contributor

apaszke commented Mar 16, 2018

@zou3519 I think in our code *List is usually at::ArrayRef<*>, while *_list is really std::vector<*>. I agree it's not great 😄

@zou3519 zou3519 force-pushed the fix-cat-save-size branch from e2d871d to 9ed3eba Compare March 16, 2018 15:26
gchanan
gchanan reviewed Mar 16, 2018
View reviewed changes
tools/autograd/templates/Functions.cpp Outdated
if (size == 0) {
auto& shape = sizes[i];
// If input was empty tensor, gradInput should be empty tensor.
if (shape[0] == 0) {

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

tools/autograd/load_derivatives.py
# replace to_args_sizes(self) with self_args_sizes
(r'to_args_sizes\({}\)', {
'suffix': '_args_sizes',
'type': 'std::vector<std::vector<int64_t>>',

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

tools/autograd/templates/Functions.cpp Outdated
std::vector<Tensor> cat_tensors_backward(const Tensor & grad, const std::vector<std::vector<int64_t>> &sizes, int64_t dim) {
if (sizes.size() > 0) {
// cat wraps dim to the first tensor's shape
dim = at::maybe_wrap_dim(dim, sizes[0].size());

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

ezyang
ezyang reviewed Mar 19, 2018
View reviewed changes
tools/autograd/templates/Functions.cpp
}

std::vector<Tensor> cat_tensors_backward(const Tensor & grad, const std::vector<int64_t> &sizes, int64_t dim) {
std::vector<Tensor> cat_tensors_backward(const Tensor & grad, const std::vector<std::vector<int64_t>> &sizes, int64_t dim) {

This comment was marked as off-topic.

Sign in to view

@ezyang ezyang merged commit cf2e176 into pytorch:master Mar 19, 2018
ezyang added a commit that referenced this pull request Mar 19, 2018
@ezyang
Revert "Fix error message for cat-ing zero-dim tensors (#5819)"
a00b267 
This reverts commit cf2e176.
soumith added a commit that referenced this pull request Mar 19, 2018
@soumith
Revert "Fix error message for cat-ing zero-dim tensors (#5819)"
364b5dd 
This reverts commit cf2e176.
soumith added a commit that referenced this pull request Mar 19, 2018
@soumith
Revert "Enable resetting of batchnorm running stats and cumulative ("…
7e13138 
…simple") moving average" (#5892)

* Revert "Port ATen and JIT C++ tests to Catch2 (#5788)"

This reverts commit 6f80023.

* Revert "Fix error message for cat-ing zero-dim tensors (#5819)"

This reverts commit cf2e176.

* Revert "Softmax symbolic should account for negative dim (#5846)"

This reverts commit ba64724.

* Revert "[fft][1 of 3] build system and helpers to support cuFFT and MKL (#5855)"

This reverts commit 22ef8e5.

* Revert "Don't modify requires_grad when running DataParallel in no_grad mode (#5880)"

This reverts commit d11b7fb.

* Revert "fix some methods not showing up in doc (#5882)"

This reverts commit 24fca0e.

* Revert "ReduceOps cleanup and set_num_threads (#5723)"

This reverts commit 84400d5.

* Revert "introduce shape_as_tensor and reshape_from_variable_shape (#5824)"

This reverts commit f446b82.

* Revert "Enable resetting of batchnorm running moments and cumulative ("simple") moving average (#5766)"

This reverts commit 99b1f6c.
jekbradbury pushed a commit to jekbradbury/pytorch that referenced this pull request Mar 21, 2018
@zou3519 @jekbradbury
Fix error message for cat-ing zero-dim tensors (pytorch#5819)
5c0102c 
Fixes pytorch#5552

* Fix error message for cat-ing zero-dim tensors

* Address comments
jekbradbury pushed a commit to jekbradbury/pytorch that referenced this pull request Mar 21, 2018
@soumith @jekbradbury
Revert "Enable resetting of batchnorm running stats and cumulative ("…
52c8d76 
…simple") moving average" (pytorch#5892)

* Revert "Port ATen and JIT C++ tests to Catch2 (pytorch#5788)"

This reverts commit 6f80023.

* Revert "Fix error message for cat-ing zero-dim tensors (pytorch#5819)"

This reverts commit cf2e176.

* Revert "Softmax symbolic should account for negative dim (pytorch#5846)"

This reverts commit ba64724.

* Revert "[fft][1 of 3] build system and helpers to support cuFFT and MKL (pytorch#5855)"

This reverts commit 22ef8e5.

* Revert "Don't modify requires_grad when running DataParallel in no_grad mode (pytorch#5880)"

This reverts commit d11b7fb.

* Revert "fix some methods not showing up in doc (pytorch#5882)"

This reverts commit 24fca0e.

* Revert "ReduceOps cleanup and set_num_threads (pytorch#5723)"

This reverts commit 84400d5.

* Revert "introduce shape_as_tensor and reshape_from_variable_shape (pytorch#5824)"

This reverts commit f446b82.

* Revert "Enable resetting of batchnorm running moments and cumulative ("simple") moving average (pytorch#5766)"

This reverts commit 99b1f6c.
wuhuikx pushed a commit to wuhuikx/pytorch that referenced this pull request Jan 30, 2020
@ezyang
Revert "Fix error message for cat-ing zero-dim tensors (pytorch#5819)"
c7d8d08 
This reverts commit cf2e176.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ezyang ezyang ezyang left review comments

@gchanan gchanan gchanan left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@zou3519 @apaszke @ezyang @gchanan