【pir_save_load】delete -1 shape check for paddlescience biharmonic2d.py (#66931)

xiaoguoguo626807 · web-flow · commit aa44e53e4929 · 2024-08-06T14:11:05.000+08:00
* delete -1 shape check

* recommit

* recover support -1 shape

* add meta config

* modify windows bug

* windows bug

* modify
diff --git a/paddle/fluid/pir/dialect/op_generator/op_build_gen.py b/paddle/fluid/pir/dialect/op_generator/op_build_gen.py
@@ -65,6 +65,7 @@
     'StackInferMeta',
     'FusedConvInferMeta',
     # nullary.h
+    'CreateInferMeta',
     'EyeInferMeta',
     # ternary.h
     'AccuracyInferMeta',
diff --git a/paddle/phi/core/infermeta_utils.h b/paddle/phi/core/infermeta_utils.h
@@ -38,7 +38,7 @@ class InferMetaContext {
   explicit InferMetaContext(MetaConfig config) : config_(config) {}
 
   void SetMetaConfig(MetaConfig config);
-  const MetaConfig& GetMetaConfig() const;
+  TEST_API const MetaConfig& GetMetaConfig() const;
 
   void EmplaceBackInput(MetaTensor input);
   TEST_API void EmplaceBackOutput(MetaTensor output);
diff --git a/paddle/phi/core/meta_tensor.h b/paddle/phi/core/meta_tensor.h
@@ -23,7 +23,7 @@ limitations under the License. */
 
 namespace phi {
 
-struct MetaConfig {
+struct TEST_API MetaConfig {
   bool is_runtime{true};
   bool is_run_mkldnn_kernel{false};
   MetaConfig() = default;
diff --git a/paddle/phi/infermeta/nullary.cc b/paddle/phi/infermeta/nullary.cc
@@ -45,8 +45,11 @@ void CreateArrayInferMeta(DataType dtype, MetaTensor* out) {
   out->set_dtype(dtype);
 }
 
-void CreateInferMeta(const IntArray& shape, DataType dtype, MetaTensor* out) {
-  if (!shape.FromTensor()) {
+void CreateInferMeta(const IntArray& shape,
+                     DataType dtype,
+                     MetaTensor* out,
+                     MetaConfig config) {
+  if (config.is_runtime || !shape.FromTensor()) {
     const auto& data = shape.GetData();
     for (size_t i = 0; i < data.size(); ++i) {
       PADDLE_ENFORCE_GE(
diff --git a/paddle/phi/infermeta/nullary.h b/paddle/phi/infermeta/nullary.h
@@ -50,7 +50,8 @@ void CreateArrayInferMeta(DataType dtype, MetaTensor* out);
 
 TEST_API void CreateInferMeta(const IntArray& shape,
                               DataType dtype,
-                              MetaTensor* out);
+                              MetaTensor* out,
+                              MetaConfig config = MetaConfig());
 
 void CreateInferMetaBase(const std::vector<int64_t>& shape,
                          DataType dtype,
