From 80a700bd1b170da0e89c61d7746efaf3b546fbe3 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Tue, 12 Jul 2022 10:43:19 -0700 Subject: [PATCH] [caffe2] Don't copy Tensor dims during deserialization (#79471) We can just make an IntArrayRef. Differential Revision: [D37124427](https://our.internmc.facebook.com/intern/diff/D37124427/) **NOTE FOR REVIEWERS**: This PR has internal Facebook specific changes or comments, please review them on [Phabricator](https://our.internmc.facebook.com/intern/diff/D37124427/)! Pull Request resolved: https://github.com/pytorch/pytorch/pull/79471 Approved by: https://github.com/ezyang --- caffe2/core/blob_serialization.cc | 9 ++------- caffe2/core/blob_serialization.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/caffe2/core/blob_serialization.cc b/caffe2/core/blob_serialization.cc index 1b2c58bacd4..5cd01ba7cc5 100644 --- a/caffe2/core/blob_serialization.cc +++ b/caffe2/core/blob_serialization.cc @@ -785,13 +785,8 @@ void DeserializeBlob(const BlobProto& blob_proto, Blob* result) { // === Local helper functions === // Get dimensions from Tensor proto -std::vector DimsFromTensorProto(const TensorProto& proto) { - std::vector dims; - dims.reserve(proto.dims().size()); - for (const int64_t d : proto.dims()) { - dims.push_back(d); - } - return dims; +c10::IntArrayRef DimsFromTensorProto(const TensorProto& proto) { + return c10::IntArrayRef(proto.dims().data(), proto.dims().size()); } // Get number of elements from Tensor proto diff --git a/caffe2/core/blob_serialization.h b/caffe2/core/blob_serialization.h index 68ba3695693..17992b7c611 100644 --- a/caffe2/core/blob_serialization.h +++ b/caffe2/core/blob_serialization.h @@ -296,7 +296,7 @@ inline std::string SerializeBlobProtoAsString_EnforceCheck( int64_t NumelFromTensorProto(const TensorProto& tensor_proto); -std::vector DimsFromTensorProto(const TensorProto& proto); +c10::IntArrayRef DimsFromTensorProto(const TensorProto& proto); TypeMeta GetDataType(const TensorProto& tensor_proto);