Fix

Author: co63oc

paddle/fluid/framework/feed_fetch_type.h

@@ -13,37 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-
-#include <vector>
-
-#include "paddle/fluid/framework/lod_tensor.h"
-#include "paddle/fluid/framework/lod_tensor_array.h"
-#include "paddle/fluid/framework/string_array.h"
-#include "paddle/phi/core/extended_tensor.h"
-
+#include "paddle/phi/core/framework/feed_fetch_type.h "
 namespace paddle {
 namespace framework {
-using FeedType =
-    paddle::variant<phi::DenseTensor, Strings, phi::SparseCooTensor>;
-using FetchType = paddle::variant<phi::DenseTensor,
-                                  phi::TensorArray,
-                                  framework::Vocab,
-                                  phi::SparseCooTensor>;
-
-template <>
-struct PhiVectorType<FeedType> {
-  const char *type_name = "PhiVectorFeedType";
-};
-
-template <>
-struct PhiVectorType<FetchType> {
-  const char *type_name = "PhiVectorFetchType";
-};
-
-using FeedList = paddle::framework::PhiVector<FeedType>;
-using FetchList = paddle::framework::PhiVector<FetchType>;
-
-using FetchUnmergedList = std::vector<std::vector<FetchType>>;
 
 inline bool data_is_lod_tensor(const FetchType &data) {
   if (data.type() == typeid(phi::DenseTensor)) {

paddle/phi/core/framework/feed_fetch_type.h

@@ -42,35 +42,14 @@ using FeedList = PhiVector<FeedType>;
 using FetchList = PhiVector<FetchType>;
 using FetchUnmergedList = std::vector<std::vector<FetchType>>;
 
-inline bool data_is_lod_tensor(const FetchType &data) {
-  if (data.type() == typeid(phi::DenseTensor)) {
-    return true;
-  }
-  return false;
-}
-
-inline bool data_is_lod_tensor_array(const FetchType &data) {
-  if (data.type() == typeid(phi::TensorArray)) {
-    return true;
-  }
-  return false;
-}
-
-inline bool data_is_string_tensor(const FeedType &data) {
-  if (data.type() == typeid(Strings)) {
-    return true;
-  }
-  return false;
-}
-
-inline bool data_is_sparse_coo_tensor(const FetchType &data) {
-  if (data.type() == typeid(phi::SparseCooTensor)) {
-    return true;
-  }
-  return false;
-}
-
-static const char kFeedOpType[] = "feed";
-static const char kFetchOpType[] = "fetch";
-
 }  // namespace phi
+
+namespace paddle {
+namespace framework {
+using FeedType = phi::FeedType;
+using FetchType = phi::FetchType;
+using FeedList = phi::FeedList;
+using FetchList = phi::FetchList;
+using FetchUnmergedList = phi::FetchUnmergedList;
+}  // namespace framework
+}  // namespace paddle