Fix

Author: co63oc

paddle/fluid/framework/variable.h

@@ -49,10 +49,10 @@ class Variable {
     if (!holder_) {
       holder_.reset(new PlaceholderImpl<T>());
     } else {
-      // If holder_ is RawTensor, return it. Used for load_combine.
+      // If holder_ is RawTensor, call GetMutable again. Used for load_combine.
       if (holder_->Type() == VarTypeTrait<RawTensor>::kId &&
           holder_->Type() != VarTypeTrait<T>::kId) {
-        return static_cast<T*>(holder_->Ptr());
+        return static_cast<RawTensor*>(holder_->Ptr())->GetMutable<T>();
       }
       PADDLE_ENFORCE_EQ(
           holder_->Type(),

paddle/phi/core/framework/raw_tensor.h

@@ -19,7 +19,7 @@ limitations under the License. */
 #include "paddle/phi/backends/gpu/gpu_context.h"
 #include "paddle/phi/backends/xpu/xpu_context.h"
 #include "paddle/phi/core/distributed/auto_parallel/dist_tensor.h"
-#include "paddle/phi/core/framework/raw_tensor.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"

paddle/phi/core/utils/type_info.cc

@@ -22,10 +22,10 @@
 #include "paddle/phi/core/framework/convert_utils.h"
 #include "paddle/phi/core/framework/data_type_transform.h"
 #include "paddle/phi/core/framework/lod_tensor_serialize.h"
-#include "paddle/phi/core/framework/raw_tensor.h"
 #include "paddle/phi/core/framework/var_type_helper.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/platform/device_context.h"
+#include "paddle/phi/core/raw_tensor.h"
 #include "paddle/phi/core/tensor_utils.h"
 #include "paddle/phi/core/vocab/string_array.h"