From d117842e560e614f3c46531b2c2bc5bfd71f52bc Mon Sep 17 00:00:00 2001 From: Pavel Belevich Date: Sat, 21 Sep 2019 08:36:11 -0700 Subject: [PATCH] C++ API parity: at::Tensor::version Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/26561 Test Plan: Imported from OSS Differential Revision: D17507167 Pulled By: pbelevich fbshipit-source-id: 167890c7b745acc9cb9ce4185f1d8c1745aaecc2 --- aten/src/ATen/core/OpsAlreadyMovedToC10.cpp | 1 + aten/src/ATen/core/TensorBody.h | 1 + aten/src/ATen/core/TensorMethods.h | 8 ++++++++ aten/src/ATen/function_wrapper.py | 3 ++- aten/src/ATen/native/VariableMethodStubs.cpp | 4 ++++ aten/src/ATen/native/native_functions.yaml | 3 +++ test/cpp/api/tensor.cpp | 17 +++++++++++++++++ tools/autograd/gen_python_functions.py | 2 +- tools/autograd/gen_variable_type.py | 2 +- torch/csrc/autograd/VariableTypeManual.cpp | 4 ++++ 10 files changed, 42 insertions(+), 3 deletions(-) diff --git a/aten/src/ATen/core/OpsAlreadyMovedToC10.cpp b/aten/src/ATen/core/OpsAlreadyMovedToC10.cpp index 633edefa8bb0..42f73e4e086e 100644 --- a/aten/src/ATen/core/OpsAlreadyMovedToC10.cpp +++ b/aten/src/ATen/core/OpsAlreadyMovedToC10.cpp @@ -754,6 +754,7 @@ bool aten_op_is_not_moved_to_c10_yet(const c10::OperatorName& opName) { {"aten::set_data", ""}, {"aten::is_leaf", ""}, {"aten::output_nr", ""}, + {"aten::_version", ""}, #ifdef BUILD_NAMEDTENSOR {"aten::names_", ""}, #endif diff --git a/aten/src/ATen/core/TensorBody.h b/aten/src/ATen/core/TensorBody.h index 1549e470478d..8eafa8ca7da6 100644 --- a/aten/src/ATen/core/TensorBody.h +++ b/aten/src/ATen/core/TensorBody.h @@ -403,6 +403,7 @@ class CAFFE2_API Tensor { Tensor data() const; bool is_leaf() const; int64_t output_nr() const; + int64_t _version() const; #ifdef BUILD_NAMEDTENSOR Tensor & names_(c10::optional names) const; #endif diff --git a/aten/src/ATen/core/TensorMethods.h b/aten/src/ATen/core/TensorMethods.h index 871e1dd268e3..d699da964394 100644 --- a/aten/src/ATen/core/TensorMethods.h +++ b/aten/src/ATen/core/TensorMethods.h @@ -123,6 +123,14 @@ inline int64_t Tensor::output_nr() const { return table->getOp(at::detail::multi_dispatch_tensor_type_set(*this))(const_cast(*this)); #endif } +inline int64_t Tensor::_version() const { +#ifdef USE_STATIC_DISPATCH + return TypeDefault::_version(const_cast(*this)); +#else + static auto table = globalATenDispatch().getOpTable("aten::_version(Tensor self) -> int"); + return table->getOp(at::detail::multi_dispatch_tensor_type_set(*this))(const_cast(*this)); +#endif +} #ifdef BUILD_NAMEDTENSOR inline Tensor & Tensor::names_(c10::optional names) const { #ifdef USE_STATIC_DISPATCH diff --git a/aten/src/ATen/function_wrapper.py b/aten/src/ATen/function_wrapper.py index cc34c534cac6..188f6af2d012 100644 --- a/aten/src/ATen/function_wrapper.py +++ b/aten/src/ATen/function_wrapper.py @@ -739,7 +739,8 @@ def is_mutable_formal_argument(argument, option): def check_methods_do_not_start_with_underscore(name, is_method): - if name in {'_values', '_indices', '_nnz', '_dimI', '_dimV', '_coalesced_'}: + if name in {'_values', '_indices', '_nnz', '_dimI', '_dimV', '_coalesced_', + '_version'}: return if is_method and name.startswith('_') and not name.startswith('__') and not name.startswith('_th_'): message = "Function '{}' starts with a single underscore and is ".format(name) diff --git a/aten/src/ATen/native/VariableMethodStubs.cpp b/aten/src/ATen/native/VariableMethodStubs.cpp index f3d01b9bce02..09901f5aecc0 100644 --- a/aten/src/ATen/native/VariableMethodStubs.cpp +++ b/aten/src/ATen/native/VariableMethodStubs.cpp @@ -24,5 +24,9 @@ int64_t output_nr(const Tensor& self) { AT_ERROR("output_nr is not implemented for Tensor"); } +int64_t _version(const Tensor& self) { + AT_ERROR("version is not implemented for Tensor"); +} + } // namespace native } // namespace at diff --git a/aten/src/ATen/native/native_functions.yaml b/aten/src/ATen/native/native_functions.yaml index 2e96ea74247a..723e027d297f 100644 --- a/aten/src/ATen/native/native_functions.yaml +++ b/aten/src/ATen/native/native_functions.yaml @@ -53,6 +53,9 @@ - func: output_nr(Tensor self) -> int variants: method +- func: _version(Tensor self) -> int + variants: method + - func: names_(Tensor(a!) self, Dimname[]? names) -> Tensor(a!) variants: method supports_named_tensor: True diff --git a/test/cpp/api/tensor.cpp b/test/cpp/api/tensor.cpp index aa55543aacdd..f9bba4cac2f4 100644 --- a/test/cpp/api/tensor.cpp +++ b/test/cpp/api/tensor.cpp @@ -441,3 +441,20 @@ TEST(TensorTest, OutputNr) { ASSERT_THROWS_WITH(y.output_nr(), message); ASSERT_THROWS_WITH(x.output_nr(), message); } + +TEST(TensorTest, Version) { + auto x = torch::ones(3); + ASSERT_EQ(x._version(), 0); + x.mul_(2); + ASSERT_EQ(x._version(), 1); + x.add_(1); + ASSERT_EQ(x._version(), 2); + + x = at::ones(3); + const auto message = "version is not implemented for Tensor"; + ASSERT_THROWS_WITH(x._version(), message); + x.mul_(2); + ASSERT_THROWS_WITH(x._version(), message); + x.add_(1); + ASSERT_THROWS_WITH(x._version(), message); +} diff --git a/tools/autograd/gen_python_functions.py b/tools/autograd/gen_python_functions.py index 753af1519c3f..8aa316b1ae33 100644 --- a/tools/autograd/gen_python_functions.py +++ b/tools/autograd/gen_python_functions.py @@ -36,7 +36,7 @@ SKIP_PYTHON_BINDINGS = [ 'set_quantizer_', # return types not supported yet 'set_data', '.*_overrideable', # overrideable functions for backend extension - 'data', 'is_leaf', 'output_nr' + 'data', 'is_leaf', 'output_nr', '_version' ] # These function signatures are not exposed to Python. Note that this signature diff --git a/tools/autograd/gen_variable_type.py b/tools/autograd/gen_variable_type.py index da3dc48bb21c..5ede064735b8 100644 --- a/tools/autograd/gen_variable_type.py +++ b/tools/autograd/gen_variable_type.py @@ -30,7 +30,7 @@ from .gen_autograd_functions import uses_single_grad # These functions are written manually in templates/VariableType.cpp MANUAL_IMPLEMENTATIONS = { 'resize_', 'resize_as_', 'detach', 'detach_', 'copy_', 'backward', - 'set_data', 'data', 'is_leaf', 'output_nr' + 'set_data', 'data', 'is_leaf', 'output_nr', '_version' } # These functions we don't want to record for tracing, because we always want diff --git a/torch/csrc/autograd/VariableTypeManual.cpp b/torch/csrc/autograd/VariableTypeManual.cpp index 4015c9fb7202..3727bd05f075 100644 --- a/torch/csrc/autograd/VariableTypeManual.cpp +++ b/torch/csrc/autograd/VariableTypeManual.cpp @@ -105,6 +105,10 @@ int64_t VariableType::output_nr(const Tensor & self) { return as_variable_ref(self).output_nr(); } +int64_t VariableType::_version(const Tensor & self) { + return as_variable_ref(self).current_version(); +} + // We don't have an outplace copy, so this can't be generated automatically Tensor & VariableType::copy_(Tensor & self, const Tensor & src, bool non_blocking) { jit::Value* output = nullptr;