Deprecate tensor.type() by ngoldbaum · Pull Request #30281 · pytorch/pytorch

ngoldbaum · 2019-11-22T00:10:40Z

I looked a bit at the code changes related to this and think I have all of the use cases of DeprecatedTypeProperties covered in the message, but suggestions from someone with more context on this would be very much appreciated :)

ezyang · 2019-11-22T14:14:13Z

You're gonna need to kill the deprecated sites too.

Nov 22 04:02:12 /opt/conda/lib/python3.6/site-packages/torch/include/torch/csrc/autograd/input_metadata.h: In constructor 'torch::autograd::InputMetadata::InputMetadata(const at::Tensor&)':
Nov 22 04:02:12 /opt/conda/lib/python3.6/site-packages/torch/include/torch/csrc/autograd/input_metadata.h:29:26: error: 'at::DeprecatedTypeProperties& at::Tensor::type() const' is deprecated [-Werror=deprecated-declarations]
Nov 22 04:02:12    : InputMetadata(t.type(), t.sizes(), t.device()) { }

ngoldbaum · 2019-11-26T20:21:00Z

I've killed all of the call sites extant in the codebase except for the one I described in my comment on the issue tracking this: #29161 (comment). Any suggestions for how to resolve the issues highlighted there with tensor_flatten.cpp would be very appreciated.

This ended up being a biggish PR. I tried to keep things atomic so it might be easier to review commit-by-commit rather than looking at the whole pull request diff. I'm also happy to upstream this as separate pull requests if that would be easier to review.

ngoldbaum · 2019-11-26T23:15:13Z

Hmm, looks like this still needs some work before it's ready for review, seeing test failures locally....

…the scalar_type is checked

…operties*

… failure on one of the test setups

…ptions_to_string

ezyang · 2019-12-03T16:13:58Z

As an operational matter, it's probably better if we merge this as is, even though you haven't handled the one case you mentioned in your issue. Do you still need to do anything else on this PR before it lands? I see the WIP is still on the PR.

ngoldbaum · 2019-12-03T16:16:11Z

I was still trying to get the tests to pass last night, but it looks like the last commit fixed the remaining test failures. This is probably fine to merge as-is. Should we leave in the deprecation message since there's still the sites in tensor_flatten.h and tensor_flatten.cpp that need to be replaced?

ezyang · 2019-12-04T15:35:11Z

Should we leave in the deprecation message since there's still the sites in tensor_flatten.h and tensor_flatten.cpp that need to be replaced?

We can leave it in if it doesn't break anything. One instance of deprecated spew is OK to me for getting the deprecation in earlier.

…e-tensor-type

ngoldbaum · 2019-12-04T16:46:46Z

Nope, shouldn't break anything :)

facebook-github-bot

@ezyang is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

facebook-github-bot · 2019-12-10T11:18:45Z

@ezyang merged this pull request in f531815.

Summary: Fixes pytorch#29161. I looked a bit at the code changes related to this and think I have all of the use cases of `DeprecatedTypeProperties` covered in the message, but suggestions from someone with more context on this would be very much appreciated :) Pull Request resolved: pytorch#30281 Differential Revision: D18830818 Pulled By: ezyang fbshipit-source-id: 1a7fcee15354ae09e6644577e7fa33bd26acfe20

ngoldbaum requested a review from ezyang November 22, 2019 00:10

ezyang approved these changes Nov 22, 2019

View reviewed changes

rgommers added the open source label Nov 26, 2019

ngoldbaum force-pushed the deprecate-tensor-type branch from b9f0da6 to a7edebc Compare November 26, 2019 20:18

ngoldbaum requested review from apaszke, mrshenli, pietern and zhaojuanmao as code owners November 26, 2019 20:18

ngoldbaum force-pushed the deprecate-tensor-type branch from 38ff838 to f092422 Compare November 26, 2019 21:44

ngoldbaum changed the title ~~Deprecate tensor.type()~~ [WIP] Deprecate tensor.type() Nov 26, 2019

ngoldbaum requested review from ebetica, goldsborough and yf225 as code owners November 27, 2019 16:41

ngoldbaum added 14 commits December 2, 2019 15:27

Deprecate tensor.type()

69ea03c

replace tensor.type().backend() with tensor.options().backend()

d36a4a4

replace tensor.type().device_type() with tensor.device().type()

905aba6

replace tensor.type() with tensor.scalar_type() in places where only …

b6d8a35

…the scalar_type is checked

replace tensor.type().scalar_type() with tensor.scalar_type()

c0dff05

replace tensor.type().toString() with tensor.toString()

0699dbc

replace tensor.type() comparisons with tensor.options().type_equal()

1efe61a

update usages of tensor.type() in autograd/engine.cpp

d448842

update usages of tensor.type() in jit/test_argument_spec.cpp

f6ebedc

make InputMetadata wrap a TensorOptions instead of a DeprecatedTypePr…

b2ef8e6

…operties*

Update asserts in c10d utils to not use tensor.type()

859e66d

add toString implementation for TensorOptions and use it to fix build…

fca10d9

… failure on one of the test setups

revert incorrect change to c10d::assertCPU

b2b5189

make type_equal behave more like operator== for DeprecatedTypeProperties

f040b4b

ngoldbaum added 7 commits December 2, 2019 15:28

check device type instead of device

aad9a0e

make InputMetadata wrap a TensorOptions instead of a TensorOptions*

424664a

fix mismatch between public API and implementation of torch::utils::o…

e3fd85f

…ptions_to_string

eliminate calls to type() in cpp API tests

75e3e87

replace type() call with tensor.toString()

e8aa3e4

fix type checking in c10d

9d3900f

replace more instances of type() in c10d

9296bda

ngoldbaum force-pushed the deprecate-tensor-type branch from ac8d28e to 9296bda Compare December 2, 2019 21:28

ngoldbaum added 3 commits December 2, 2019 18:06

fix jit printing expect tests

f3dd627

remove unused layout_str

9be618a

reorder checks for std_var_out for simpler diff

f5ef63a

ngoldbaum changed the title ~~[WIP] Deprecate tensor.type()~~ Deprecate tensor.type() Dec 3, 2019

Merge commit 'c0299d2707b0d2100d76edfc050f805c90c959eb' into deprecat…

9bf4557

…e-tensor-type

facebook-github-bot reviewed Dec 5, 2019

View reviewed changes

facebook-github-bot closed this in f531815 Dec 5, 2019

rgommers mentioned this pull request Dec 7, 2019

Improved speed of frobenous norm for non-complex dtype #30871

Closed

facebook-github-bot added the merged label Dec 10, 2019

gchanan added the module: deprecation label Jan 13, 2020

mruberry added the Merged label Oct 28, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Deprecate tensor.type()#30281

Deprecate tensor.type()#30281
ngoldbaum wants to merge 25 commits intopytorch:masterfrom
ngoldbaum:deprecate-tensor-type

ngoldbaum commented Nov 22, 2019

Uh oh!

ezyang commented Nov 22, 2019

Uh oh!

ngoldbaum commented Nov 26, 2019

Uh oh!

ngoldbaum commented Nov 26, 2019

Uh oh!

ezyang commented Dec 3, 2019

Uh oh!

ngoldbaum commented Dec 3, 2019

Uh oh!

ezyang commented Dec 4, 2019

Uh oh!

ngoldbaum commented Dec 4, 2019

Uh oh!

facebook-github-bot left a comment

Uh oh!

facebook-github-bot commented Dec 10, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

ngoldbaum commented Nov 22, 2019

Uh oh!

ezyang commented Nov 22, 2019

Uh oh!

ngoldbaum commented Nov 26, 2019

Uh oh!

ngoldbaum commented Nov 26, 2019

Uh oh!

ezyang commented Dec 3, 2019

Uh oh!

ngoldbaum commented Dec 3, 2019

Uh oh!

ezyang commented Dec 4, 2019

Uh oh!

ngoldbaum commented Dec 4, 2019

Uh oh!

facebook-github-bot left a comment

Choose a reason for hiding this comment

Uh oh!

facebook-github-bot commented Dec 10, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants