Revert "Removed merge conflict marker" (#58305)

tensorflow · Oct 25, 2022 · 32bfb01 · 32bfb01
1 parent aa3f8d4
commit 32bfb01
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/tensorflow/core/common_runtime/eager/execute.cc b/tensorflow/core/common_runtime/eager/execute.cc
@@ -321,6 +321,7 @@ bool IsHostMemoryArg(const EagerOperation& op, const NodeDef* node_def,
 Status GetDeviceForInput(const EagerOperation& op, const EagerContext& ctx,
                          const bool is_host_memory_arg,
                          TensorHandle* tensor_handle, Device** result) {
+>>>>>>> f5381e0e10b (Fix OOB error when op input sizes do not match.)
   Device* cpu_device = ctx.HostCPU();
   string device_name;
   if (tensor_handle->Type() != TensorHandle::LOCAL) {