From 422979951c710be331c59f2b848ff08df255fc42 Mon Sep 17 00:00:00 2001
From: Zhou Wei <1183042833@qq.com>
Date: Tue, 26 Apr 2022 11:03:10 +0800
Subject: [PATCH] fix python3.10 compile bug on windows (#42140) (#42180)

cherry-pick #42140
---
 paddle/fluid/pybind/bind_fleet_executor.h             | 4 ++++
 paddle/fluid/pybind/compatible.h                      | 4 ++++
 paddle/fluid/pybind/eager_functions.cc                | 6 ++++++
 paddle/fluid/pybind/eager_method.cc                   | 6 ++++++
 paddle/fluid/pybind/eager_utils.h                     | 5 +++++
 paddle/fluid/pybind/inference_api.h                   | 5 +++++
 paddle/fluid/pybind/io.h                              | 5 +++++
 paddle/fluid/pybind/op_function_common.h              | 5 +++++
 paddle/fluid/pybind/protobuf.h                        | 4 ++++
 python/paddle/fluid/tests/unittests/cc_imp_py_test.cc | 3 ++-
 10 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/paddle/fluid/pybind/bind_fleet_executor.h b/paddle/fluid/pybind/bind_fleet_executor.h
index 733701fa36..f956881968 100644
--- a/paddle/fluid/pybind/bind_fleet_executor.h
+++ b/paddle/fluid/pybind/bind_fleet_executor.h
@@ -14,6 +14,10 @@
 
 #pragma once
 
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
 #include <pybind11/pybind11.h>
 
 namespace paddle {
diff --git a/paddle/fluid/pybind/compatible.h b/paddle/fluid/pybind/compatible.h
index f9d4cf5888..5f7628e5f2 100644
--- a/paddle/fluid/pybind/compatible.h
+++ b/paddle/fluid/pybind/compatible.h
@@ -14,6 +14,10 @@
 
 #pragma once
 
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
 #include <pybind11/pybind11.h>
 
 namespace paddle {
diff --git a/paddle/fluid/pybind/eager_functions.cc b/paddle/fluid/pybind/eager_functions.cc
index 1073cdc83a..4d7b50943d 100644
--- a/paddle/fluid/pybind/eager_functions.cc
+++ b/paddle/fluid/pybind/eager_functions.cc
@@ -9,6 +9,12 @@ 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. */
 // disable numpy compile error
+
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 #include <Python.h>
 
 #include <string>
diff --git a/paddle/fluid/pybind/eager_method.cc b/paddle/fluid/pybind/eager_method.cc
index 7620be96c1..000928e0e0 100644
--- a/paddle/fluid/pybind/eager_method.cc
+++ b/paddle/fluid/pybind/eager_method.cc
@@ -9,6 +9,12 @@ 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. */
 // disable numpy compile error
+
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 #include <Python.h>
 
 #include <string>
diff --git a/paddle/fluid/pybind/eager_utils.h b/paddle/fluid/pybind/eager_utils.h
index 1e9cf705ac..f1fab6db6e 100644
--- a/paddle/fluid/pybind/eager_utils.h
+++ b/paddle/fluid/pybind/eager_utils.h
@@ -10,6 +10,11 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #pragma once
 
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 #include <Python.h>
 #include "paddle/phi/common/backend.h"
 #include "paddle/phi/common/data_type.h"
diff --git a/paddle/fluid/pybind/inference_api.h b/paddle/fluid/pybind/inference_api.h
index c2adfbecf7..300d3b480e 100644
--- a/paddle/fluid/pybind/inference_api.h
+++ b/paddle/fluid/pybind/inference_api.h
@@ -14,6 +14,11 @@
 
 #pragma once
 
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 #include <pybind11/pybind11.h>
 
 namespace paddle {
diff --git a/paddle/fluid/pybind/io.h b/paddle/fluid/pybind/io.h
index dfe3154cb9..942c93decc 100644
--- a/paddle/fluid/pybind/io.h
+++ b/paddle/fluid/pybind/io.h
@@ -14,6 +14,11 @@ limitations under the License. */
 
 #pragma once
 
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 #include <Python.h>
 #include "paddle/fluid/pybind/pybind_boost_headers.h"
 
diff --git a/paddle/fluid/pybind/op_function_common.h b/paddle/fluid/pybind/op_function_common.h
index debaf8fae1..549da39d9b 100644
--- a/paddle/fluid/pybind/op_function_common.h
+++ b/paddle/fluid/pybind/op_function_common.h
@@ -14,6 +14,11 @@
 
 #pragma once
 
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 #include <pybind11/chrono.h>
 #include <pybind11/complex.h>
 #include <pybind11/functional.h>
diff --git a/paddle/fluid/pybind/protobuf.h b/paddle/fluid/pybind/protobuf.h
index 4c5aa9701c..54b788cccb 100644
--- a/paddle/fluid/pybind/protobuf.h
+++ b/paddle/fluid/pybind/protobuf.h
@@ -13,6 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #pragma once
 
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
 #include <Python.h>
 
 #include <fstream>
diff --git a/python/paddle/fluid/tests/unittests/cc_imp_py_test.cc b/python/paddle/fluid/tests/unittests/cc_imp_py_test.cc
index 8609aff1fa..a0b9ec5f9f 100644
--- a/python/paddle/fluid/tests/unittests/cc_imp_py_test.cc
+++ b/python/paddle/fluid/tests/unittests/cc_imp_py_test.cc
@@ -50,7 +50,8 @@ TEST(CC, IMPORT_PY) {
   // 3. C/C++ Run Python file
   std::string file_name(cwd);
   file_name.append("/test_install_check.py");
-  FILE* fp = _Py_fopen(file_name.c_str(), "r+");
+  PyObject* obj = Py_BuildValue("s", file_name.c_str());
+  FILE* fp = _Py_fopen_obj(obj, "r+");
   ASSERT_TRUE(fp != NULL);
   ASSERT_FALSE(PyRun_SimpleFile(fp, file_name.c_str()));
 
-- 
GitLab