From fa6b3c9a47c55b6bff5923c3e956e0b1cf3ab732 Mon Sep 17 00:00:00 2001
From: zyfncg <zhangyunfei07@baidu.com>
Date: Mon, 23 May 2022 14:19:20 +0800
Subject: [PATCH] [Phi] Remove Storage (#42872)

* remove storage

* add glog include

* add glog include

* add glog include
---
 paddle/fluid/pybind/eager.cc                  |   1 -
 paddle/fluid/pybind/eager_functions.cc        |   1 -
 paddle/infrt/tensor/phi/tensor_map.cc         |   2 +
 paddle/phi/api/lib/api_custom_impl.cc         |   1 -
 paddle/phi/api/lib/api_gen_utils.h            |   1 -
 paddle/phi/api/lib/op_meta_info.cc            |   1 +
 paddle/phi/api/lib/sparse_api_custom_impl.cc  |   1 -
 paddle/phi/api/lib/tensor_copy.cc             |   1 -
 paddle/phi/api/lib/utils/CMakeLists.txt       |   2 +-
 paddle/phi/api/lib/utils/allocator.h          |   1 -
 paddle/phi/api/lib/utils/storage.cc           |  40 ------
 paddle/phi/api/lib/utils/storage.h            |  80 -----------
 paddle/phi/api/lib/utils/tensor_utils.h       |   1 -
 paddle/phi/core/dense_tensor.h                |   1 -
 paddle/phi/core/dense_tensor.inl              |  12 --
 paddle/phi/core/dense_tensor_impl.cc          |  10 +-
 paddle/phi/core/meta_tensor.h                 |   2 +
 paddle/phi/core/storage.cc                    |  25 ----
 paddle/phi/core/storage.h                     | 132 ------------------
 paddle/phi/core/string_tensor.cc              |   2 +-
 paddle/phi/core/string_tensor.h               |   1 -
 paddle/phi/kernels/cpu/allclose_kernel.cc     |   2 +-
 paddle/phi/kernels/cpu/reduce.h               |   1 -
 .../phi/kernels/cpu/uniform_random_kernel.cc  |   1 -
 .../phi/kernels/sparse/convolution_kernel.h   |   1 -
 paddle/phi/kernels/sparse/copy_kernel.h       |   1 -
 .../kernels/sparse/gpu/sparse_utils_kernel.cu |   2 +
 .../phi/kernels/sparse/sparse_utils_kernel.h  |   1 -
 .../strings/cpu/strings_copy_kernel.cc        |   2 +
 .../kernels/strings/strings_empty_kernel.h    |   1 -
 .../strings/strings_lower_upper_kernel.h      |   1 -
 paddle/phi/tests/api/scale_api.h              |   1 -
 paddle/phi/tests/core/test_custom_kernel.cc   |   1 -
 paddle/phi/tests/core/test_dense_tensor.cc    |   1 +
 .../phi/tests/core/test_sparse_coo_tensor.cc  |   1 +
 python/paddle/utils/code_gen/api_gen.py       |   1 -
 .../paddle/utils/code_gen/backward_api_gen.py |   1 -
 .../utils/code_gen/intermediate_api_gen.py    |   1 -
 38 files changed, 16 insertions(+), 322 deletions(-)
 delete mode 100644 paddle/phi/api/lib/utils/storage.cc
 delete mode 100644 paddle/phi/api/lib/utils/storage.h
 delete mode 100644 paddle/phi/core/storage.cc
 delete mode 100644 paddle/phi/core/storage.h

diff --git a/paddle/fluid/pybind/eager.cc b/paddle/fluid/pybind/eager.cc
index 530cc6992d3..c1b26ee0b79 100644
--- a/paddle/fluid/pybind/eager.cc
+++ b/paddle/fluid/pybind/eager.cc
@@ -34,7 +34,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/python_headers.h"
 #include "paddle/fluid/pybind/eager_op_function_impl.h"
 #include "paddle/fluid/pybind/tensor_py.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/api/lib/utils/tensor_utils.h"
 #include "paddle/phi/core/string_tensor.h"
 namespace paddle {
diff --git a/paddle/fluid/pybind/eager_functions.cc b/paddle/fluid/pybind/eager_functions.cc
index 5395b4f31c8..628e808ef99 100644
--- a/paddle/fluid/pybind/eager_functions.cc
+++ b/paddle/fluid/pybind/eager_functions.cc
@@ -45,7 +45,6 @@ typedef SSIZE_T ssize_t;
 #include "paddle/fluid/pybind/tensor_py.h"
 #include "paddle/phi/api/ext/op_meta_info.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/api/lib/utils/tensor_utils.h"
 #include "paddle/phi/common/data_type.h"
 #include "paddle/phi/core/compat/convert_utils.h"
diff --git a/paddle/infrt/tensor/phi/tensor_map.cc b/paddle/infrt/tensor/phi/tensor_map.cc
index 7690322aed4..afac7175caf 100644
--- a/paddle/infrt/tensor/phi/tensor_map.cc
+++ b/paddle/infrt/tensor/phi/tensor_map.cc
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 #include "paddle/infrt/tensor/phi/tensor_map.h"
+
+#include "glog/logging.h"
 #include "llvm/Support/ErrorHandling.h"
 
 namespace infrt {
diff --git a/paddle/phi/api/lib/api_custom_impl.cc b/paddle/phi/api/lib/api_custom_impl.cc
index d80444e7f71..8a845c331cc 100644
--- a/paddle/phi/api/lib/api_custom_impl.cc
+++ b/paddle/phi/api/lib/api_custom_impl.cc
@@ -18,7 +18,6 @@ limitations under the License. */
 #include "paddle/phi/api/lib/data_transform.h"
 #include "paddle/phi/api/lib/kernel_dispatch.h"
 #include "paddle/phi/api/lib/tensor_copy.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/common/type_traits.h"
 #include "paddle/phi/core/compat/convert_utils.h"
 #include "paddle/phi/core/kernel_registry.h"
diff --git a/paddle/phi/api/lib/api_gen_utils.h b/paddle/phi/api/lib/api_gen_utils.h
index 7303e6b4611..097178ae0d9 100644
--- a/paddle/phi/api/lib/api_gen_utils.h
+++ b/paddle/phi/api/lib/api_gen_utils.h
@@ -15,7 +15,6 @@ limitations under the License. */
 #pragma once
 
 #include "paddle/phi/api/include/tensor.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/compat/convert_utils.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/meta_tensor.h"
diff --git a/paddle/phi/api/lib/op_meta_info.cc b/paddle/phi/api/lib/op_meta_info.cc
index 048e4f2b428..8d64246bdb6 100644
--- a/paddle/phi/api/lib/op_meta_info.cc
+++ b/paddle/phi/api/lib/op_meta_info.cc
@@ -18,6 +18,7 @@ limitations under the License. */
 #include <unordered_map>
 #include <vector>
 
+#include "glog/logging.h"
 #include "paddle/fluid/framework/custom_operator.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/enforce.h"
diff --git a/paddle/phi/api/lib/sparse_api_custom_impl.cc b/paddle/phi/api/lib/sparse_api_custom_impl.cc
index c88e2e367fe..71ba8eaae2d 100644
--- a/paddle/phi/api/lib/sparse_api_custom_impl.cc
+++ b/paddle/phi/api/lib/sparse_api_custom_impl.cc
@@ -17,7 +17,6 @@ limitations under the License. */
 #include <memory>
 #include "glog/logging.h"
 #include "paddle/phi/api/lib/kernel_dispatch.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/kernel_registry.h"
 
 namespace paddle {
diff --git a/paddle/phi/api/lib/tensor_copy.cc b/paddle/phi/api/lib/tensor_copy.cc
index 57e3c28d8cb..85de3601fd9 100644
--- a/paddle/phi/api/lib/tensor_copy.cc
+++ b/paddle/phi/api/lib/tensor_copy.cc
@@ -15,7 +15,6 @@ limitations under the License. */
 #include "paddle/phi/api/lib/tensor_copy.h"
 #include "paddle/phi/api/lib/api_gen_utils.h"
 #include "paddle/phi/api/lib/kernel_dispatch.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/compat/convert_utils.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/meta_tensor.h"
diff --git a/paddle/phi/api/lib/utils/CMakeLists.txt b/paddle/phi/api/lib/utils/CMakeLists.txt
index 5689b2d43a4..0e1cd0cb83f 100644
--- a/paddle/phi/api/lib/utils/CMakeLists.txt
+++ b/paddle/phi/api/lib/utils/CMakeLists.txt
@@ -1,2 +1,2 @@
-cc_library(phi_api_utils SRCS storage.cc tensor_utils.cc DEPS
+cc_library(phi_api_utils SRCS tensor_utils.cc DEPS
 tensor_base convert_utils dense_tensor lod_tensor selected_rows_utils place var_type_traits string_tensor int_array scalar)
diff --git a/paddle/phi/api/lib/utils/allocator.h b/paddle/phi/api/lib/utils/allocator.h
index 84a089e5899..96f1294102a 100644
--- a/paddle/phi/api/lib/utils/allocator.h
+++ b/paddle/phi/api/lib/utils/allocator.h
@@ -17,7 +17,6 @@ limitations under the License. */
 #include "paddle/fluid/memory/allocation/allocator.h"
 #include "paddle/fluid/memory/malloc.h"
 #include "paddle/phi/core/allocator.h"
-#include "paddle/phi/core/storage.h"
 
 namespace paddle {
 namespace experimental {
diff --git a/paddle/phi/api/lib/utils/storage.cc b/paddle/phi/api/lib/utils/storage.cc
deleted file mode 100644
index 09ff18d10e3..00000000000
--- a/paddle/phi/api/lib/utils/storage.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. */
-
-#include "paddle/phi/api/lib/utils/storage.h"
-
-namespace paddle {
-namespace experimental {
-
-ExternalStorage::ExternalStorage(void* ptr,
-                                 size_t size,
-                                 const phi::Place& place)
-    : phi::Storage(std::make_shared<phi::Allocation>(ptr, size, place)),
-      size_(size) {}
-
-ExternalStorage::ExternalStorage(const phi::intrusive_ptr<phi::Storage>& root,
-                                 size_t delta,
-                                 size_t size)
-    : Storage(std::make_shared<phi::Allocation>(
-          static_cast<uint8_t*>(root->data()) + delta, size, root->place())),
-      size_(size) {
-  PADDLE_ENFORCE_LE(
-      static_cast<size_t>(delta + size),
-      root->size(),
-      phi::errors::InvalidArgument("The size of the external storage does "
-                                   "not meet the metadata requirements."));
-}
-
-}  // namespace experimental
-}  // namespace paddle
diff --git a/paddle/phi/api/lib/utils/storage.h b/paddle/phi/api/lib/utils/storage.h
deleted file mode 100644
index 5fe17bc51b6..00000000000
--- a/paddle/phi/api/lib/utils/storage.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. */
-
-#pragma once
-
-#include "paddle/fluid/memory/malloc.h"
-#include "paddle/phi/core/storage.h"
-
-namespace paddle {
-namespace experimental {
-
-class ExternalStorage : public phi::Storage {
- public:
-  ExternalStorage(void* ptr, size_t size, const phi::Place& place);
-  ExternalStorage(const phi::intrusive_ptr<phi::Storage>& root,
-                  size_t delta,
-                  size_t size);
-
-  static const char* name() { return "ExternalStorage"; }
-
-  void Realloc(size_t n) override {
-    PADDLE_THROW(phi::errors::Unavailable(
-        "The external shared storage cannot be reallocated."));
-  }
-
-  void Clear() override {
-    data_ = nullptr;
-    size_ = 0;
-  }
-
-  void set_data_shared(
-      const std::shared_ptr<paddle::memory::Allocation>& holder) override {
-    CHECK(holder);
-    data_ = holder;
-    size_ = holder->size();
-  }
-
-  std::shared_ptr<paddle::memory::Allocation>&& move_data_shared() override {
-    size_ = 0;
-    return std::move(data_);
-  }
-
-  size_t size() const noexcept override { return size_; }
-  const phi::Place& place() const override {
-    PADDLE_ENFORCE_NOT_NULL(
-        data_,
-        phi::errors::Unavailable(
-            "Unable to visit place as data_ has not been initialized yet."));
-    return data_->place();
-  }
-  bool OwnsMemory() const noexcept override { return false; }
-
- private:
-  int64_t size_{0};
-};
-
-class TensorStorage : public paddle::memory::allocation::Allocation {
- public:
-  explicit TensorStorage(phi::intrusive_ptr<phi::Storage> storage)
-      : paddle::memory::allocation::Allocation(
-            storage->data(), storage->size(), storage->place()),
-        storage_(std::move(storage)) {}
-
- private:
-  phi::intrusive_ptr<phi::Storage> storage_;
-};
-
-}  // namespace experimental
-}  // namespace paddle
diff --git a/paddle/phi/api/lib/utils/tensor_utils.h b/paddle/phi/api/lib/utils/tensor_utils.h
index 00199da1280..36a0901bbe9 100644
--- a/paddle/phi/api/lib/utils/tensor_utils.h
+++ b/paddle/phi/api/lib/utils/tensor_utils.h
@@ -20,7 +20,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/variable.h"
 
 #include "paddle/phi/api/lib/utils/allocator.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/common/int_array.h"
 #include "paddle/phi/common/scalar.h"
 #include "paddle/phi/core/compat/convert_utils.h"
diff --git a/paddle/phi/core/dense_tensor.h b/paddle/phi/core/dense_tensor.h
index 9861bd68e4a..06d3e435bc1 100644
--- a/paddle/phi/core/dense_tensor.h
+++ b/paddle/phi/core/dense_tensor.h
@@ -15,7 +15,6 @@ limitations under the License. */
 #pragma once
 
 #include "paddle/phi/core/allocator.h"
-#include "paddle/phi/core/storage.h"
 #include "paddle/phi/core/stream.h"
 #include "paddle/phi/core/tensor_base.h"
 #include "paddle/phi/core/tensor_meta.h"
diff --git a/paddle/phi/core/dense_tensor.inl b/paddle/phi/core/dense_tensor.inl
index 93513067a26..01c19e8a55f 100644
--- a/paddle/phi/core/dense_tensor.inl
+++ b/paddle/phi/core/dense_tensor.inl
@@ -26,18 +26,6 @@ public:
 */
 explicit DenseTensor(paddle::experimental::DataType dtype);
 
-/// \brief Use existing storage space to create dense tensor. This interface
-/// can be used to deliberately create an uninitialized dense tensor.
-/// \param storage The existing storage.
-/// \param meta The meta data of dense tensor.
-DenseTensor(intrusive_ptr<Storage> storage, const DenseTensorMeta& meta);
-
-/// \brief Use existing storage space to create dense tensor. This interface
-/// can be used to deliberately create an uninitialized dense tensor.
-/// \param storage The existing storage.
-/// \param meta The meta data of dense tensor.
-DenseTensor(intrusive_ptr<Storage> storage, DenseTensorMeta&& meta);
-
 inline bool IsInitialized() const { return holder_ != nullptr; }
 
 template <typename T>
diff --git a/paddle/phi/core/dense_tensor_impl.cc b/paddle/phi/core/dense_tensor_impl.cc
index 3c030cac2e7..8c97b6bf223 100644
--- a/paddle/phi/core/dense_tensor_impl.cc
+++ b/paddle/phi/core/dense_tensor_impl.cc
@@ -18,9 +18,10 @@ limitations under the License. */
 #include "paddle/phi/common/complex.h"
 #include "paddle/phi/common/float16.h"
 
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/compat/convert_utils.h"
 
+#include "paddle/fluid/memory/malloc.h"
+
 #ifdef PADDLE_WITH_MKLDNN
 #include "paddle/fluid/platform/mkldnn_utils.h"
 #endif
@@ -211,13 +212,6 @@ LEGACY_DATA_MEMBER_FUNC_INSTANTIATION(::phi::dtype::complex<double>)
 /*   From framework::LoDTensor    */
 /* ------------------------------ */
 
-DenseTensor::DenseTensor(intrusive_ptr<Storage> storage,
-                         const DenseTensorMeta& meta)
-    : meta_(meta), holder_(storage->move_data_shared()) {}
-
-DenseTensor::DenseTensor(intrusive_ptr<Storage> storage, DenseTensorMeta&& meta)
-    : meta_(std::move(meta)), holder_(storage->move_data_shared()) {}
-
 DenseTensor::DenseTensor(const LoD& lod) : DenseTensor() { meta_.lod = lod; }
 
 void DenseTensor::set_lod(const LoD& lod) { meta_.lod = lod; }
diff --git a/paddle/phi/core/meta_tensor.h b/paddle/phi/core/meta_tensor.h
index 3cdbfda61d6..29afe0d0292 100644
--- a/paddle/phi/core/meta_tensor.h
+++ b/paddle/phi/core/meta_tensor.h
@@ -21,6 +21,8 @@ limitations under the License. */
 #include "paddle/phi/core/tensor_base.h"
 #include "paddle/phi/core/tensor_meta.h"
 
+#include "glog/logging.h"
+
 namespace phi {
 
 // TODO(chenweihang): add other flags if needed
diff --git a/paddle/phi/core/storage.cc b/paddle/phi/core/storage.cc
deleted file mode 100644
index 0ddf5084464..00000000000
--- a/paddle/phi/core/storage.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. */
-
-#include "paddle/phi/core/storage.h"
-
-namespace phi {
-
-void TensorStorage::Realloc(size_t size) {
-  this->Clear();
-  data_ = alloc_->Allocate(size);
-  size_ = size;
-}
-
-}  // namespace phi
diff --git a/paddle/phi/core/storage.h b/paddle/phi/core/storage.h
deleted file mode 100644
index 24dc2c4a4f9..00000000000
--- a/paddle/phi/core/storage.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. */
-
-#pragma once
-
-#include <cstddef>
-
-#include "boost/intrusive_ptr.hpp"
-#include "paddle/phi/common/place.h"
-#include "paddle/phi/core/allocator.h"
-#include "paddle/phi/core/utils/intrusive_ptr.h"
-#include "paddle/phi/core/utils/intrusive_ref_counter.h"
-#include "paddle/phi/core/utils/type_info.h"
-
-namespace phi {
-
-/// \brief The interface of contiguous storage used for the dense tensor.
-/// It should be used in conjunction with the intrusive pointer. We prohibit
-/// all default copy operations to ensure the integrity of the package.
-class Storage : public intrusive_ref_counter<Storage> {
- public:
-  Storage() = default;
-  Storage(const Storage&) = delete;
-
-  /* @jim19930609: Following interfaces will be modified/replaced/removed
-                   as soon as the new Allocation - Allocator design get
-     finalized.
-    */
-
-  /*   --------- shared_ptr<Allocation> -------- */
-  // Initialize a Storage with unique Allocation
-  explicit Storage(std::shared_ptr<phi::Allocation>&& data)
-      : data_(std::move(data)) {}
-
-  // Initialize a Storage shareing Allocation with another storage
-  explicit Storage(const std::shared_ptr<phi::Allocation>& data)
-      : data_(data) {}
-
-  void* data() const {
-    return data_ ? reinterpret_cast<void*>(
-                       reinterpret_cast<uintptr_t>(data_->ptr()))
-                 : nullptr;
-  }
-
-  const std::shared_ptr<phi::Allocation>& data_shared() const { return data_; }
-
-  virtual void set_data_shared(
-      const std::shared_ptr<phi::Allocation>& holder) = 0;
-
-  virtual std::shared_ptr<phi::Allocation>&& move_data_shared() = 0;
-
-  virtual void ReallocShared(size_t n) {
-    PADDLE_THROW(phi::errors::Unimplemented(
-        "ReallocShared has not been overrided by the current Storage"));
-  }
-  /* --------- shared_ptr<Allocation> -------- */
-
-  virtual ~Storage() = default;
-
-  virtual void Clear() = 0;
-
-  virtual size_t size() const = 0;
-  virtual const Place& place() const = 0;
-  virtual bool OwnsMemory() const = 0;
-  virtual void Realloc(size_t n) = 0;
-
- protected:
-  std::shared_ptr<phi::Allocation> data_;
-};
-
-class TensorStorage : public Storage {
- public:
-  explicit TensorStorage(Allocator* a) : alloc_(a) {}
-
-  TensorStorage(Allocator* a, size_t size)
-      : Storage(a->Allocate(size)), alloc_(a) {
-    size_ = data_->size();
-  }
-
-  void Clear() override {
-    data_ = nullptr;
-    size_ = 0;
-  }
-
-  void Realloc(size_t size) override;
-
-  ~TensorStorage() = default;
-
-  static const char* name() { return "TensorStorage"; }
-
-  size_t size() const noexcept override { return size_; }
-
-  const Place& place() const override {
-    if (!data_) {
-      PADDLE_THROW(phi::errors::Unimplemented(
-          "Unable to visit place: either data_ or alloc_ has to be initialized "
-          "first."));
-    }
-    return data_->place();
-  }
-
-  bool OwnsMemory() const noexcept override { return true; }
-
-  void set_data_shared(
-      const std::shared_ptr<phi::Allocation>& holder) override {
-    CHECK(holder);
-    data_ = holder;
-    size_ = holder->size();
-  }
-
-  std::shared_ptr<phi::Allocation>&& move_data_shared() override {
-    size_ = 0;
-    return std::move(data_);
-  }
-
- private:
-  Allocator* alloc_;
-  int64_t size_{0};
-};
-
-}  // namespace phi
diff --git a/paddle/phi/core/string_tensor.cc b/paddle/phi/core/string_tensor.cc
index 35444dc33fe..0a4e0d61915 100644
--- a/paddle/phi/core/string_tensor.cc
+++ b/paddle/phi/core/string_tensor.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/phi/core/string_tensor.h"
-#include "paddle/phi/api/lib/utils/storage.h"
+#include "paddle/fluid/memory/malloc.h"
 
 namespace phi {
 
diff --git a/paddle/phi/core/string_tensor.h b/paddle/phi/core/string_tensor.h
index 916c2a2bd4a..94c9974f4ad 100644
--- a/paddle/phi/core/string_tensor.h
+++ b/paddle/phi/core/string_tensor.h
@@ -16,7 +16,6 @@ limitations under the License. */
 
 #include "paddle/phi/common/pstring.h"
 #include "paddle/phi/core/allocator.h"
-#include "paddle/phi/core/storage.h"
 #include "paddle/phi/core/tensor_base.h"
 #include "paddle/phi/core/tensor_meta.h"
 
diff --git a/paddle/phi/kernels/cpu/allclose_kernel.cc b/paddle/phi/kernels/cpu/allclose_kernel.cc
index 80dea561956..f95ddc5621e 100644
--- a/paddle/phi/kernels/cpu/allclose_kernel.cc
+++ b/paddle/phi/kernels/cpu/allclose_kernel.cc
@@ -15,7 +15,7 @@
 #include "paddle/phi/kernels/allclose_kernel.h"
 
 #include <cmath>
-
+#include "glog/logging.h"
 #include "paddle/phi/core/enforce.h"
 #include "paddle/phi/core/kernel_registry.h"
 
diff --git a/paddle/phi/kernels/cpu/reduce.h b/paddle/phi/kernels/cpu/reduce.h
index b0e43b6526c..35395dccca1 100644
--- a/paddle/phi/kernels/cpu/reduce.h
+++ b/paddle/phi/kernels/cpu/reduce.h
@@ -20,7 +20,6 @@
 #include "paddle/phi/core/visit_type.h"
 #include "paddle/phi/kernels/cast_kernel.h"
 
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/kernels/funcs/eigen/common.h"
 #include "paddle/phi/kernels/funcs/math_function.h"
diff --git a/paddle/phi/kernels/cpu/uniform_random_kernel.cc b/paddle/phi/kernels/cpu/uniform_random_kernel.cc
index 91a69034182..c95a8f4ded6 100644
--- a/paddle/phi/kernels/cpu/uniform_random_kernel.cc
+++ b/paddle/phi/kernels/cpu/uniform_random_kernel.cc
@@ -54,7 +54,6 @@ void UniformRandomRawKernel(const Context &dev_ctx,
                             float diag_val,
                             DenseTensor *out) {
   out->Resize(phi::make_ddim(shape.GetData()));
-  VLOG(4) << out->dims();
   T *data = dev_ctx.template Alloc<T>(out);
   auto size = out->numel();
   std::shared_ptr<std::mt19937_64> engine;
diff --git a/paddle/phi/kernels/sparse/convolution_kernel.h b/paddle/phi/kernels/sparse/convolution_kernel.h
index 6120d6339a7..62a72a9dd41 100644
--- a/paddle/phi/kernels/sparse/convolution_kernel.h
+++ b/paddle/phi/kernels/sparse/convolution_kernel.h
@@ -14,7 +14,6 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/sparse_coo_tensor.h"
 #include "paddle/phi/kernels/empty_kernel.h"
diff --git a/paddle/phi/kernels/sparse/copy_kernel.h b/paddle/phi/kernels/sparse/copy_kernel.h
index a43621a4dfe..70e2aaef8a8 100644
--- a/paddle/phi/kernels/sparse/copy_kernel.h
+++ b/paddle/phi/kernels/sparse/copy_kernel.h
@@ -14,7 +14,6 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/sparse_coo_tensor.h"
 #include "paddle/phi/core/sparse_csr_tensor.h"
diff --git a/paddle/phi/kernels/sparse/gpu/sparse_utils_kernel.cu b/paddle/phi/kernels/sparse/gpu/sparse_utils_kernel.cu
index ff2647de731..b208e70e040 100644
--- a/paddle/phi/kernels/sparse/gpu/sparse_utils_kernel.cu
+++ b/paddle/phi/kernels/sparse/gpu/sparse_utils_kernel.cu
@@ -22,6 +22,8 @@ limitations under the License. */
 #include "paddle/phi/kernels/funcs/sparse/common_shape.h"
 #include "paddle/phi/kernels/sparse/sparse_utils_kernel.h"
 
+#include "paddle/fluid/platform/enforce.h"
+
 namespace phi {
 namespace sparse {
 
diff --git a/paddle/phi/kernels/sparse/sparse_utils_kernel.h b/paddle/phi/kernels/sparse/sparse_utils_kernel.h
index d39790fcea5..93abf70b244 100644
--- a/paddle/phi/kernels/sparse/sparse_utils_kernel.h
+++ b/paddle/phi/kernels/sparse/sparse_utils_kernel.h
@@ -14,7 +14,6 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/common/int_array.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/sparse_coo_tensor.h"
diff --git a/paddle/phi/kernels/strings/cpu/strings_copy_kernel.cc b/paddle/phi/kernels/strings/cpu/strings_copy_kernel.cc
index 156cea63f17..41889f9cc5e 100644
--- a/paddle/phi/kernels/strings/cpu/strings_copy_kernel.cc
+++ b/paddle/phi/kernels/strings/cpu/strings_copy_kernel.cc
@@ -15,6 +15,8 @@ limitations under the License. */
 #include "paddle/phi/kernels/strings/strings_copy_kernel.h"
 #include "paddle/phi/core/kernel_registry.h"
 
+#include "glog/logging.h"
+
 namespace phi {
 namespace strings {
 
diff --git a/paddle/phi/kernels/strings/strings_empty_kernel.h b/paddle/phi/kernels/strings/strings_empty_kernel.h
index 1add1963614..8a014f2a78c 100644
--- a/paddle/phi/kernels/strings/strings_empty_kernel.h
+++ b/paddle/phi/kernels/strings/strings_empty_kernel.h
@@ -15,7 +15,6 @@
 #pragma once
 
 #include "paddle/phi/api/lib/utils/allocator.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/common/int_array.h"
 #include "paddle/phi/core/string_tensor.h"
 #include "paddle/phi/infermeta/strings/nullary.h"
diff --git a/paddle/phi/kernels/strings/strings_lower_upper_kernel.h b/paddle/phi/kernels/strings/strings_lower_upper_kernel.h
index 97f53016452..db6c267a858 100644
--- a/paddle/phi/kernels/strings/strings_lower_upper_kernel.h
+++ b/paddle/phi/kernels/strings/strings_lower_upper_kernel.h
@@ -17,7 +17,6 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/phi/api/lib/utils/allocator.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/string_tensor.h"
 #include "paddle/phi/infermeta/strings/unary.h"
 #include "paddle/phi/kernels/strings/case_utils.h"
diff --git a/paddle/phi/tests/api/scale_api.h b/paddle/phi/tests/api/scale_api.h
index 0217ba23b22..16143fb11e0 100644
--- a/paddle/phi/tests/api/scale_api.h
+++ b/paddle/phi/tests/api/scale_api.h
@@ -19,7 +19,6 @@
 #include "paddle/phi/api/include/tensor.h"
 #include "paddle/phi/api/lib/kernel_dispatch.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/common/int_array.h"
 #include "paddle/phi/common/scalar.h"
 #include "paddle/phi/core/kernel_registry.h"
diff --git a/paddle/phi/tests/core/test_custom_kernel.cc b/paddle/phi/tests/core/test_custom_kernel.cc
index 634edaec96d..abd77e28624 100644
--- a/paddle/phi/tests/core/test_custom_kernel.cc
+++ b/paddle/phi/tests/core/test_custom_kernel.cc
@@ -23,7 +23,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/common/int_array.h"
 #include "paddle/phi/common/scalar.h"
 #include "paddle/phi/core/kernel_context.h"
diff --git a/paddle/phi/tests/core/test_dense_tensor.cc b/paddle/phi/tests/core/test_dense_tensor.cc
index ddfa184df2c..42814317b9c 100644
--- a/paddle/phi/tests/core/test_dense_tensor.cc
+++ b/paddle/phi/tests/core/test_dense_tensor.cc
@@ -14,6 +14,7 @@ limitations under the License. */
 
 #include "gtest/gtest.h"
 
+#include "glog/logging.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/tests/core/allocator.h"
 
diff --git a/paddle/phi/tests/core/test_sparse_coo_tensor.cc b/paddle/phi/tests/core/test_sparse_coo_tensor.cc
index 5d0e16b0528..5e7642bbfdc 100644
--- a/paddle/phi/tests/core/test_sparse_coo_tensor.cc
+++ b/paddle/phi/tests/core/test_sparse_coo_tensor.cc
@@ -14,6 +14,7 @@ limitations under the License. */
 
 #include "gtest/gtest.h"
 
+#include "glog/logging.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/sparse_coo_tensor.h"
 #include "paddle/phi/tests/core/allocator.h"
diff --git a/python/paddle/utils/code_gen/api_gen.py b/python/paddle/utils/code_gen/api_gen.py
index 0de60c14d3a..4e98985c9b1 100644
--- a/python/paddle/utils/code_gen/api_gen.py
+++ b/python/paddle/utils/code_gen/api_gen.py
@@ -195,7 +195,6 @@ def source_include(header_file_path):
 #include "paddle/phi/api/lib/api_gen_utils.h"
 #include "paddle/phi/api/lib/data_transform.h"
 #include "paddle/phi/api/lib/kernel_dispatch.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/infermeta/binary.h"
 #include "paddle/phi/infermeta/multiary.h"
diff --git a/python/paddle/utils/code_gen/backward_api_gen.py b/python/paddle/utils/code_gen/backward_api_gen.py
index 502c221952f..886748eeb29 100644
--- a/python/paddle/utils/code_gen/backward_api_gen.py
+++ b/python/paddle/utils/code_gen/backward_api_gen.py
@@ -209,7 +209,6 @@ def source_include(header_file_path):
 #include "paddle/phi/api/lib/api_gen_utils.h"
 #include "paddle/phi/api/lib/data_transform.h"
 #include "paddle/phi/api/lib/kernel_dispatch.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/api/include/api.h"
 #include "paddle/phi/infermeta/backward.h"
diff --git a/python/paddle/utils/code_gen/intermediate_api_gen.py b/python/paddle/utils/code_gen/intermediate_api_gen.py
index 2df3ac64361..4e4875b5961 100644
--- a/python/paddle/utils/code_gen/intermediate_api_gen.py
+++ b/python/paddle/utils/code_gen/intermediate_api_gen.py
@@ -44,7 +44,6 @@ def source_include(header_file_path):
 #include "paddle/phi/api/lib/data_transform.h"
 #include "paddle/phi/api/lib/kernel_dispatch.h"
 #include "paddle/phi/api/lib/sparse_api_custom_impl.h"
-#include "paddle/phi/api/lib/utils/storage.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/infermeta/binary.h"
 #include "paddle/phi/infermeta/multiary.h"
-- 
GitLab