【Hackathon 7th Fundable Projects 2 No.73】 [fluid_ops] load_combine (#68665)

co63oc · web-flow · commit 57a6dbb8ec89 · 2024-10-23T11:19:00.000+08:00
diff --git a/paddle/fluid/framework/infershape_utils.cc b/paddle/fluid/framework/infershape_utils.cc
@@ -140,6 +140,15 @@ class InferShapeArgumentMappingContext : public phi::ArgumentMappingContext {
                        });
   }
 
+  bool IsVocabOutput(const std::string& name) const override {
+    auto var_types = ctx_.GetOutputsVarType(name);
+    return std::all_of(var_types.begin(),
+                       var_types.end(),
+                       [](const proto::VarType::Type& type) {
+                         return type == proto::VarType::VOCAB;
+                       });
+  }
+
   bool IsSelectedRowsOutput(const std::string& name) const override {
     auto var_types = ctx_.GetOutputsVarType(name);
     return std::all_of(var_types.begin(),
diff --git a/paddle/fluid/framework/new_executor/interpreter/static_build.cc b/paddle/fluid/framework/new_executor/interpreter/static_build.cc
@@ -186,8 +186,8 @@ bool BlockCanBeStaticBuilt(const framework::BlockDesc& block) {
 }
 
 inline bool IsExtendedTensor(const phi::TensorBase& tensor) {
-  return framework::RawTensor::classof(&tensor) ||
-         phi::Strings::classof(&tensor) || phi::Vocab::classof(&tensor);
+  return phi::RawTensor::classof(&tensor) || phi::Strings::classof(&tensor) ||
+         phi::Vocab::classof(&tensor);
 }
 
 bool TensorShouldBeFakeInitialized(const OperatorBase& op,
@@ -281,9 +281,11 @@ phi::TensorBase* GetTensorFormVar(framework::Variable* var) {
       return var->template GetMutable<phi::TensorArray>();
     } else if (var->template IsType<phi::Strings>()) {
       return var->template GetMutable<phi::Strings>();
-    } else if (var->template IsType<paddle::framework::RawTensor>() ||
+    } else if (var->template IsType<phi::Vocab>()) {
+      return var->template GetMutable<phi::Vocab>();
+    } else if (var->template IsType<phi::RawTensor>() ||
                !var->IsInitialized()) {
-      return var->template GetMutable<paddle::framework::RawTensor>();
+      return var->template GetMutable<phi::RawTensor>();
     } else {
       PADDLE_THROW(common::errors::Unimplemented(
           "Unsupported `%s` type when get tensor.",
diff --git a/paddle/fluid/framework/operator.h b/paddle/fluid/framework/operator.h
@@ -39,6 +39,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/unused_var_check.h"
 #include "paddle/phi/core/memory/malloc.h"
 #include "paddle/phi/core/platform/device_context.h"
+#include "paddle/phi/core/vocab/string_array.h"
 
 #include "paddle/common/flags.h"
 #include "paddle/common/macros.h"
@@ -697,6 +698,13 @@ class ExecutionArgumentMappingContext : public phi::ArgumentMappingContext {
     });
   }
 
+  bool IsVocabOutput(const std::string& name) const override {
+    auto vars = ctx_.MultiOutputVar(name);
+    return std::all_of(vars.begin(), vars.end(), [](const Variable* var) {
+      return var->IsType<phi::Vocab>();
+    });
+  }
+
   bool IsSelectedRowsOutput(const std::string& name) const override {
     auto vars = ctx_.MultiOutputVar(name);
     return std::all_of(vars.begin(), vars.end(), [](const Variable* var) {
diff --git a/paddle/fluid/framework/type_info.cc b/paddle/fluid/framework/type_info.cc
@@ -38,7 +38,6 @@ bool TypeInfoTraits<BaseT, DerivedT>::classof(const BaseT* obj) {
   return obj->type_info() == kType;
 }
 
-template class TypeInfoTraits<phi::TensorBase, paddle::framework::RawTensor>;
 template class TypeInfoTraits<phi::TensorBase, egr::VariableCompatTensor>;
 template class TypeInfoTraits<phi::TensorBase, paddle::prim::DescTensor>;
 template class TypeInfoTraits<phi::TensorBase, paddle::primitive::LazyTensor>;
diff --git a/paddle/fluid/framework/variable.h b/paddle/fluid/framework/variable.h
@@ -49,6 +49,12 @@ class Variable {
     if (!holder_) {
       holder_.reset(new PlaceholderImpl<T>());
     } else {
+      // If holder_ is RawTensor, call holder_->Ptr() GetMutable again. Used for
+      // load_combine.
+      if (holder_->Type() == VarTypeTrait<RawTensor>::kId &&
+          holder_->Type() != VarTypeTrait<T>::kId) {
+        return static_cast<RawTensor*>(holder_->Ptr())->GetMutable<T>();
+      }
       PADDLE_ENFORCE_EQ(
           holder_->Type(),
           VarTypeTrait<T>::kId,
diff --git a/paddle/fluid/operators/load_combine_op.cc b/paddle/fluid/operators/load_combine_op.cc
@@ -81,14 +81,3 @@ namespace ops = paddle::operators;  // NOLINT
 REGISTER_OPERATOR(load_combine,
                   ops::LoadCombineOp,
                   ops::LoadCombineOpProtoMaker);
-
-PD_REGISTER_STRUCT_KERNEL(load_combine,
-                          CPU,
-                          ALL_LAYOUT,
-                          ops::LoadCombineOpKernel,
-                          float,
-                          double,
-                          phi::dtype::bfloat16,
-                          int,
-                          int8_t,
-                          int64_t) {}
diff --git a/paddle/fluid/operators/load_combine_op.cu b/paddle/fluid/operators/load_combine_op.cu
diff --git a/paddle/fluid/operators/load_combine_op_xpu.cc b/paddle/fluid/operators/load_combine_op_xpu.cc
diff --git a/paddle/fluid/operators/ops_signature/load_combine_sig.cc b/paddle/fluid/operators/ops_signature/load_combine_sig.cc
@@ -0,0 +1,41 @@
+// Copyright (c) 2022 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
+//
+//     https://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/compat/op_utils.h"
+
+namespace phi {
+
+KernelSignature LoadCombineOpArgumentMapping(
+    const ArgumentMappingContext& ctx) {
+  if (ctx.IsDenseTensorOutput("Out")) {
+    return KernelSignature("load_combine",
+                           {},
+                           {"file_path", "load_as_fp16", "model_from_memory"},
+                           {"Out"});
+  } else if (ctx.IsVocabOutput("Out")) {
+    return KernelSignature("load_combine_vocab",
+                           {},
+                           {"file_path", "load_as_fp16", "model_from_memory"},
+                           {"Out"});
+  } else {
+    return KernelSignature("load_combine_extended",
+                           {},
+                           {"file_path", "load_as_fp16", "model_from_memory"},
+                           {"Out"});
+  }
+}
+
+}  // namespace phi
+
+PD_REGISTER_ARG_MAPPING_FN(load_combine, phi::LoadCombineOpArgumentMapping);
diff --git a/paddle/fluid/pir/dialect/operator/utils/utils.cc b/paddle/fluid/pir/dialect/operator/utils/utils.cc
@@ -36,7 +36,6 @@ namespace paddle {
 namespace dialect {
 
 const std::unordered_set<std::string> LegacyOpList = {
-    LoadCombineOp::name(),
     CConcatOp::name(),
     CBroadcast_Op::name(),
     CBroadcastOp::name(),
diff --git a/paddle/phi/core/compat/arg_map_context.h b/paddle/phi/core/compat/arg_map_context.h
@@ -119,6 +119,7 @@ class ArgumentMappingContext {
 
   virtual bool IsDenseTensorOutput(const std::string& name) const = 0;
   virtual bool IsSelectedRowsOutput(const std::string& name) const = 0;
+  virtual bool IsVocabOutput(const std::string& name) const { return false; }
 
   // use this function to mark it comes from InferShapeArgumentMappingContext
   // and will be used in infershape
diff --git a/paddle/phi/core/kernel_registry.cc b/paddle/phi/core/kernel_registry.cc
@@ -218,8 +218,11 @@ void SetKernelArgsDef(const std::vector<std::type_index>& args_type,
                              default_tensor_layout,
                              default_key.dtype(),
                              arg_type);
-    } else if (arg_type ==
-               std::type_index(typeid(ExtendedTensor*))) {  // NOLINT
+    } else if (arg_type == std::type_index(typeid(ExtendedTensor*)) ||
+               arg_type ==
+                   std::type_index(typeid(std::vector<ExtendedTensor*>)) ||
+               arg_type ==
+                   std::type_index(typeid(std::vector<Vocab*>))) {  // NOLINT
       args_def->AppendOutput(default_key.backend(),
                              default_tensor_layout,
                              default_key.dtype(),
diff --git a/paddle/phi/core/kernel_utils.h b/paddle/phi/core/kernel_utils.h
@@ -387,6 +387,8 @@ struct KernelImpl<Return (*)(DevCtx, Args...), kernel_fn> {
 
   PD_SPECIALIZE_KernelCallHelper_FOR_OUTPUT(TensorArray);
   PD_SPECIALIZE_KernelCallHelper_FOR_OUTPUT(ExtendedTensor);
+  PD_SPECIALIZE_KernelCallHelper_FOR_MULTI_OUTPUT(ExtendedTensor);
+  PD_SPECIALIZE_KernelCallHelper_FOR_MULTI_OUTPUT(Vocab);
 
   /* End case */
   template <typename T>
diff --git a/paddle/phi/core/utils/type_info.cc b/paddle/phi/core/utils/type_info.cc
@@ -20,6 +20,7 @@ limitations under the License. */
 #include "paddle/phi/backends/xpu/xpu_context.h"
 #include "paddle/phi/core/distributed/auto_parallel/dist_tensor.h"
 #include "paddle/phi/core/framework/feed_fetch_type.h"
+#include "paddle/phi/core/raw_tensor.h"
 #include "paddle/phi/core/selected_rows.h"
 #include "paddle/phi/core/sparse_coo_tensor.h"
 #include "paddle/phi/core/sparse_csr_tensor.h"
@@ -54,6 +55,7 @@ template class TypeInfoTraits<phi::TensorBase, TensorArray>;
 template class TypeInfoTraits<phi::TensorBase, phi::distributed::DistTensor>;
 template class TypeInfoTraits<phi::TensorBase, Vocab>;
 template class TypeInfoTraits<phi::TensorBase, Strings>;
+template class TypeInfoTraits<phi::TensorBase, RawTensor>;
 template class TypeInfoTraits<phi::TensorBase, FeedList>;
 
 template class TypeInfoTraits<phi::DeviceContext, CPUContext>;
diff --git a/paddle/phi/kernels/cpu/load_combine_kernel.cc b/paddle/phi/kernels/cpu/load_combine_kernel.cc
@@ -0,0 +1,48 @@
+// Copyright (c) 2024 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
+//
+//     https://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/kernels/impl/load_combine_kernel_impl.h"
+
+PD_REGISTER_KERNEL(load_combine,
+                   CPU,
+                   ALL_LAYOUT,
+                   phi::LoadCombineKernel,
+                   float,
+                   double,
+                   phi::dtype::bfloat16,
+                   int,
+                   int8_t,
+                   int64_t) {}
+
+PD_REGISTER_KERNEL(load_combine_vocab,
+                   CPU,
+                   ALL_LAYOUT,
+                   phi::LoadCombineVocabKernel,
+                   float,
+                   double,
+                   phi::dtype::bfloat16,
+                   int,
+                   int8_t,
+                   int64_t) {}
+
+PD_REGISTER_KERNEL(load_combine_extended,
+                   CPU,
+                   ALL_LAYOUT,
+                   phi::LoadCombineExtendedKernel,
+                   float,
+                   double,
+                   phi::dtype::bfloat16,
+                   int,
+                   int8_t,
+                   int64_t) {}
diff --git a/paddle/phi/kernels/gpu/load_combine_kernel.cu b/paddle/phi/kernels/gpu/load_combine_kernel.cu
@@ -0,0 +1,45 @@
+// Copyright (c) 2024 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
+//
+//     https://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/kernels/impl/load_combine_kernel_impl.h"
+
+PD_REGISTER_KERNEL(load_combine,
+                   GPU,
+                   ALL_LAYOUT,
+                   phi::LoadCombineKernel,
+                   float,
+                   double,
+                   int,
+                   int8_t,
+                   int64_t) {}
+
+PD_REGISTER_KERNEL(load_combine_vocab,
+                   GPU,
+                   ALL_LAYOUT,
+                   phi::LoadCombineVocabKernel,
+                   float,
+                   double,
+                   int,
+                   int8_t,
+                   int64_t) {}
+
+PD_REGISTER_KERNEL(load_combine_extended,
+                   GPU,
+                   ALL_LAYOUT,
+                   phi::LoadCombineExtendedKernel,
+                   float,
+                   double,
+                   int,
+                   int8_t,
+                   int64_t) {}
diff --git a/paddle/phi/kernels/impl/load_combine_kernel_impl.h b/paddle/phi/kernels/impl/load_combine_kernel_impl.h
diff --git a/paddle/phi/kernels/xpu/load_combine_kernel.cc b/paddle/phi/kernels/xpu/load_combine_kernel.cc

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ bool TypeInfoTraits<BaseT, DerivedT>::classof(const BaseT* obj) {`
`38`	`38`	`return obj->type_info() == kType;`
`39`	`39`	`}`
`40`	`40`
`41`		`-template class TypeInfoTraits<phi::TensorBase, paddle::framework::RawTensor>;`
`42`	`41`	`template class TypeInfoTraits<phi::TensorBase, egr::VariableCompatTensor>;`
`43`	`42`	`template class TypeInfoTraits<phi::TensorBase, paddle::prim::DescTensor>;`
`44`	`43`	`template class TypeInfoTraits<phi::TensorBase, paddle::primitive::LazyTensor>;`