PaddlePaddle
diff --git a/‎paddle/fluid/framework/feed_fetch_type.h
Copy file name to clipboard
+1-34Lines changed: 1 addition & 34 deletions b/‎paddle/fluid/framework/feed_fetch_type.h
Copy file name to clipboard
+1-34Lines changed: 1 addition & 34 deletions
diff --git a/‎paddle/fluid/framework/operator.cc
Copy file name to clipboard
+5-2Lines changed: 5 additions & 2 deletions b/‎paddle/fluid/framework/operator.cc
Copy file name to clipboard
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎paddle/fluid/framework/raw_tensor.h
Copy file name to clipboard
+1-86Lines changed: 1 addition & 86 deletions b/‎paddle/fluid/framework/raw_tensor.h
Copy file name to clipboard
+1-86Lines changed: 1 addition & 86 deletions
diff --git a/‎paddle/fluid/operators/save_combine_op.cc
Copy file name to clipboard
-20Lines changed: 0 additions & 20 deletions b/‎paddle/fluid/operators/save_combine_op.cc
Copy file name to clipboard
-20Lines changed: 0 additions & 20 deletions
diff --git a/‎paddle/fluid/operators/save_op.cc
Copy file name to clipboard
+8-86Lines changed: 8 additions & 86 deletions b/‎paddle/fluid/operators/save_op.cc
Copy file name to clipboard
+8-86Lines changed: 8 additions & 86 deletions
@@ -13,43 +13,10 @@ 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/phi/core/extended_tensor.h"
-#include "paddle/phi/core/vocab/string_array.h"
-
-namespace phi {
-using FeedType = paddle::
-    variant<phi::DenseTensor, paddle::framework::Strings, phi::SparseCooTensor>;
-using FetchType = paddle::variant<phi::DenseTensor,
-                                  phi::TensorArray,
-                                  paddle::framework::Vocab,
-                                  phi::SparseCooTensor>;
-
-template <>
-struct PhiVectorType<FeedType> {
-  const char *type_name = "PhiVectorFeedType";
-};
-
-template <>
-struct PhiVectorType<FetchType> {
-  const char *type_name = "PhiVectorFetchType";
-};
-
-using FeedList = PhiVector<FeedType>;
-using FetchList = PhiVector<FetchType>;
-}  // namespace phi
+#include "paddle/phi/core/framework/feed_fetch_type.h"
 
 namespace paddle {
 namespace framework {
-using FeedType = phi::FeedType;
-using FetchType = phi::FetchType;
-using FeedList = phi::FeedList;
-using FetchList = phi::FetchList;
-using FetchUnmergedList = std::vector<std::vector<FetchType>>;
 
 inline bool data_is_lod_tensor(const FetchType &data) {
   if (data.type() == typeid(phi::DenseTensor)) {
 
@@ -3314,9 +3314,12 @@ void OperatorWithKernel::BuildPhiKernelContext(
         } else if (var->template IsType<phi::Strings>()) {
           tensor_out = var->template GetMutable<phi::Strings>();
           phi_kernel_context->EmplaceBackOutputWithoutSetRange(tensor_out);
-        } else if (var->template IsType<paddle::framework::RawTensor>() ||
+        } else if (var->template IsType<phi::Vocab>()) {
+          tensor_out = var->template GetMutable<phi::Vocab>();
+          phi_kernel_context->EmplaceBackOutputWithoutSetRange(tensor_out);
+        } else if (var->template IsType<phi::RawTensor>() ||
                    !var->IsInitialized()) {
-          tensor_out = var->template GetMutable<paddle::framework::RawTensor>();
+          tensor_out = var->template GetMutable<phi::RawTensor>();
           phi_kernel_context->EmplaceBackOutputWithoutSetRange(tensor_out);
         } else {
           PADDLE_THROW(common::errors::Unimplemented(
 
@@ -13,89 +13,4 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-
-#include <unordered_map>
-
-#include "paddle/phi/core/enforce.h"
-#include "paddle/phi/core/extended_tensor.h"
-#include "paddle/utils/any.h"
-
-namespace paddle {
-namespace framework {
-
-/// \brief Fluid Kernel and PHI Kernel will be unified in the future.
-/// So, we need a class in PHI that can represent the RawTensor type in Fluid.
-/// The RawTensor is for PHI Kernel that has RawTensor type arguments.
-class RawTensor : public phi::ExtendedTensor,
-                  public phi::TypeInfoTraits<phi::TensorBase, RawTensor> {
- public:
-  RawTensor() = default;
-
-  RawTensor(RawTensor&& other) = default;
-
-  RawTensor(const RawTensor& other) = default;
-
-  RawTensor& operator=(RawTensor&& other) = default;
-
-  /// \brief Destroy the RawTensor and release exclusive resources.
-  virtual ~RawTensor() {
-    if (!data_.empty()) {
-      data_deleter_();
-    }
-  }
-
- public:
-  /// \brief Returns the name of the class for type traits.
-  /// \return The name of the class.
-  static const char* name() { return "RawTensor"; }
-
-  template <typename T>
-  T& Get() const {
-    PADDLE_ENFORCE_EQ(data_.empty(),
-                      false,
-                      common::errors::PreconditionNotMet(
-                          "The data in RawTensor is empty. Please set data "
-                          "before using it."));
-
-    try {
-      return *(paddle::any_cast<T*>(data_));
-    } catch (paddle::bad_any_cast&) {
-      PADDLE_THROW(common::errors::InvalidArgument(
-          "Invalid data type error, expected %s, actual %s.",
-          typeid(T).name(),
-          data_type_.name()));
-    }
-  }
-
-  template <typename T>
-  T* GetMutable() {
-    if (!data_.empty()) {
-      try {
-        return paddle::any_cast<T*>(data_);
-      } catch (paddle::bad_any_cast&) {
-        PADDLE_THROW(common::errors::InvalidArgument(
-            "Invalid data type error, expected %s, actual %s.",
-            typeid(T).name(),
-            data_type_.name()));
-      }
-    }
-    T* created_data = new T();
-    data_ = created_data;
-    data_deleter_ = [created_data]() { delete created_data; };
-    data_type_ = std::type_index(typeid(T));
-    return created_data;
-  }
-
-  template <typename T>
-  bool IsType() const {
-    return std::type_index(typeid(T)) == data_type_;
-  }
-
- private:
-  paddle::any data_;
-  std::function<void(void)> data_deleter_ = []() {};
-  std::type_index data_type_ = std::type_index(typeid(void));
-};
-
-}  // namespace framework
-}  // namespace paddle
+#include "paddle/phi/core/raw_tensor.h"
@@ -103,23 +103,3 @@ REGISTER_OPERATOR(save_combine,
                   ops::SaveCombineOp,
                   ops::SaveCombineOpProtoMaker,
                   ops::SaveCombineOpInferVarType);
-
-PD_REGISTER_KERNEL(save_combine_tensor,
-                   CPU,
-                   ALL_LAYOUT,
-                   paddle::operators::SaveCombineTensorKernel,
-                   int,
-                   int64_t,
-                   float,
-                   double,
-                   phi::dtype::bfloat16) {}
-
-PD_REGISTER_KERNEL(save_combine_vocab,
-                   CPU,
-                   ALL_LAYOUT,
-                   paddle::operators::SaveCombineVocabKernel,
-                   int,
-                   int64_t,
-                   float,
-                   double,
-                   phi::dtype::bfloat16) {}
@@ -12,17 +12,22 @@ 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/fluid/operators/save_op.h"
-
 #include <cstdint>
-
 #include <fstream>
 #include <numeric>
 #include <string>
 #include <vector>
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/data_type_transform.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/variable.h"
 
 namespace paddle {
 namespace operators {
+// define LOOKUP_TABLE_PATH for checkpoint notify to save lookup table variables
+// to directory specified.
+constexpr char LOOKUP_TABLE_PATH[] = "kLookupTablePath";
+
 class SaveOp : public framework::OperatorWithKernel {
  public:
   using framework::OperatorWithKernel::OperatorWithKernel;
@@ -88,86 +93,3 @@ REGISTER_OPERATOR(save,
                   ops::SaveOp,
                   ops::SaveOpProtoMaker,
                   ops::SaveOpVarTypeInference);
-
-PD_REGISTER_KERNEL(save,
-                   CPU,
-                   ALL_LAYOUT,
-                   ops::SaveKernel,
-                   float,
-                   double,
-                   int,
-                   uint8_t,
-                   int8_t,
-                   int16_t,
-                   int64_t,
-                   phi::dtype::float16,
-                   phi::dtype::bfloat16) {
-  kernel->InputAt(0).SetBackend(phi::Backend::ALL_BACKEND);
-}
-
-#ifdef PADDLE_WITH_XPU
-PD_REGISTER_KERNEL(save,
-                   XPU,
-                   ALL_LAYOUT,
-                   ops::SaveKernel,
-                   float,
-                   double,
-                   int,
-                   uint8_t,
-                   int8_t,
-                   int64_t,
-                   phi::dtype::float16,
-                   phi::dtype::bfloat16) {
-  kernel->InputAt(0).SetBackend(phi::Backend::ALL_BACKEND);
-}
-#endif
-
-PD_REGISTER_KERNEL(save_sr,
-                   CPU,
-                   ALL_LAYOUT,
-                   ops::SaveSelectedRowsKernel,
-                   float,
-                   double,
-                   int,
-                   uint8_t,
-                   int8_t,
-                   int16_t,
-                   int64_t,
-                   phi::dtype::float16,
-                   phi::dtype::bfloat16) {
-  kernel->InputAt(0).SetBackend(phi::Backend::ALL_BACKEND);
-}
-
-#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
-PD_REGISTER_KERNEL(save,
-                   GPU,
-                   ALL_LAYOUT,
-                   ops::SaveKernel,
-                   float,
-                   double,
-                   int,
-                   uint8_t,
-                   int8_t,
-                   int16_t,
-                   int64_t,
-                   phi::dtype::float16,
-                   phi::dtype::bfloat16) {
-  kernel->InputAt(0).SetBackend(phi::Backend::ALL_BACKEND);
-}
-
-PD_REGISTER_KERNEL(save_sr,
-                   GPU,
-                   ALL_LAYOUT,
-                   ops::SaveSelectedRowsKernel,
-                   float,
-                   double,
-                   int,
-                   uint8_t,
-                   int8_t,
-                   int16_t,
-                   int64_t,
-                   phi::dtype::float16,
-                   phi::dtype::bfloat16) {
-  kernel->InputAt(0).SetBackend(phi::Backend::ALL_BACKEND);
-}
-#endif