diff --git a/paddle/fluid/lite/core/hvy_tensor.h b/paddle/fluid/lite/core/hvy_tensor.h index 7c60e1661ce1384ef5b49a57c7a5145697482909..f86ca2729212523f251939ac5c276099c64b47b7 100644 --- a/paddle/fluid/lite/core/hvy_tensor.h +++ b/paddle/fluid/lite/core/hvy_tensor.h @@ -39,6 +39,7 @@ class DDimHvy : public DDimBase { } value_type operator[](int offset) const { return data_[offset]; } + value_type& operator[](int offset) { return data_[offset]; } std::vector Vectorize() const { return framework::vectorize(data_); } diff --git a/paddle/fluid/lite/core/lite_tensor.h b/paddle/fluid/lite/core/lite_tensor.h index 24f28300d05a2c56c9305a22624fca755ff3d3ef..79f1352cb06364de93884b821540fa87892a9746 100644 --- a/paddle/fluid/lite/core/lite_tensor.h +++ b/paddle/fluid/lite/core/lite_tensor.h @@ -37,6 +37,7 @@ class DDimLite : public DDimBase { void ConstructFrom(const std::vector &x) { data_ = x; } value_type operator[](int offset) const { return data_[offset]; } + value_type &operator[](int offset) { return data_[offset]; } std::vector Vectorize() const { return data_; } size_t size() const { return data_.size(); } diff --git a/paddle/fluid/lite/model_parser/CMakeLists.txt b/paddle/fluid/lite/model_parser/CMakeLists.txt index a284f0388fa40d95aab90f98c19bbc6740e2337e..63fe21abdafb916be72fddb99023d6ba4b8530c0 100644 --- a/paddle/fluid/lite/model_parser/CMakeLists.txt +++ b/paddle/fluid/lite/model_parser/CMakeLists.txt @@ -23,7 +23,7 @@ if (LITE_WITH_CUDA) endif() cc_library(model_parser_lite SRCS model_parser.cc DEPS ${model_parser_deps}) -cc_test(test_op_desc_lite SRCS op_desc_test.cc DEPS cpp_op_desc_lite any_lite op_desc_lite compatible_pb_lite) +lite_cc_test(test_op_desc_lite SRCS op_desc_test.cc DEPS cpp_op_desc_lite op_desc_lite compatible_pb_lite) add_subdirectory(pb) add_subdirectory(cpp) diff --git a/paddle/fluid/lite/model_parser/pb/CMakeLists.txt b/paddle/fluid/lite/model_parser/pb/CMakeLists.txt index 6910542f2a17f1ec5cdbe5f77203197ae3d57b89..22d88aeabf479e9c234cfa1e9660a6d2af9439b4 100644 --- a/paddle/fluid/lite/model_parser/pb/CMakeLists.txt +++ b/paddle/fluid/lite/model_parser/pb/CMakeLists.txt @@ -1,3 +1,2 @@ cc_library(var_desc_lite SRCS var_desc.cc DEPS framework_proto_lite) cc_library(op_desc_lite SRCS op_desc.cc DEPS framework_proto_lite) - diff --git a/paddle/fluid/lite/operators/concat_op.cc b/paddle/fluid/lite/operators/concat_op.cc index e9b773ceebdf42fd53b48f3e91f0356cb64c7261..e51d6e0d3498231e97ca7fa417590dcb1edcd6c6 100644 --- a/paddle/fluid/lite/operators/concat_op.cc +++ b/paddle/fluid/lite/operators/concat_op.cc @@ -27,9 +27,9 @@ bool ConcatOpLite::CheckShape() const { } bool ConcatOpLite::InferShape() const { - std::vector input_dims; + std::vector input_dims; for (auto p : param_.x) { - input_dims.push_back(p->dims().data()); + input_dims.push_back(p->dims()); } size_t axis = static_cast(param_.axis); const size_t n = input_dims.size();