Fixed merge conflicts

Author: jim19930609

paddle/fluid/eager/tests/task_tests/CMakeLists.txt

@@ -1 +1 @@
-cc_test(test_egr_ds_eager_utils SRCS eager_utils_test.cc DEPS ${eager_deps})
+cc_test(test_egr_task_eager_utils SRCS eager_utils_test.cc DEPS ${eager_deps})

paddle/fluid/eager/utils.cc

@@ -188,18 +188,4 @@ egr::EagerTensor EagerUtils::GetOutput(
  return EagerTensor((*(out.get())));
 }
 
-AutogradMeta* EagerUtils::unsafe_autograd_meta(const egr::EagerTensor& target) {
- auto* p_autograd_meta = target.get_autograd_meta();
- PADDLE_ENFORCE(p_autograd_meta,
- paddle::platform::errors::Fatal(
- "Null autograd_meta gotten from unsafe_autograd_meta(), "
- "if you are using unsafe_autograd_meta, please make sure "
- "your tensor's autograd_meta is set"));
- return static_cast<AutogradMeta*>(p_autograd_meta);
-}
-
-std::pair<size_t, size_t> EagerUtils::OutRankInfo(
- const egr::EagerTensor& target) {
- return unsafe_autograd_meta(target)->OutRankInfo();
-}
 } // namespace egr

paddle/fluid/eager/utils.h

@@ -130,9 +130,6 @@ class EagerUtils {
  iter.SetStopGradient(stop_gradient);
  iter.apply(std::forward<Args>(args)...);
  }
- static std::pair<size_t, size_t> OutRankInfo(const egr::EagerTensor& target);
- // This method will return an AutogradMeta pointer unsafely.
- static AutogradMeta* unsafe_autograd_meta(const egr::EagerTensor& target);
 
  // Intermidate needed remove this once we don't need legacy
  static std::vector<std::shared_ptr<egr::EagerTensor>> SyncToVars(