[SOT] clean code in eval frame and fix dy2st uts (#57662)

paddle/fluid/pybind/eval_frame.c

@@ -17,6 +17,11 @@ limitations under the License. */
 #include <Python.h>
 #include <frameobject.h>
 
+#if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x3090000
+#define Py_BUILD_CORE  // internal/pycore_pymem.h need this macro
+#include <internal/pycore_pystate.h>
+#undef Py_BUILD_CORE
+#endif
 #if PY_VERSION_HEX < 0x030b0000
 #include <code.h>
 #endif

paddle/fluid/pybind/eval_frame.h

@@ -19,97 +19,6 @@ extern "C" {
 
 #include <Python.h>
 
-// see https://bugs.python.org/issue35886
-// If py_version==3.8.*, we need to redefine _PyEvalFrameFunc and the
-// related functions and structs.
-
-#if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x3090000
-
-typedef PyObject *(*_PyFrameEvalFunction)(struct _frame *, int);
-
-struct _warnings_runtime_state {
-  /* Both 'filters' and 'onceregistry' can be set in warnings.py;
-     get_warnings_attr() will reset these variables accordingly. */
-  PyObject *filters;        /* List */
-  PyObject *once_registry;  /* Dict */
-  PyObject *default_action; /* String */
-  long filters_version;     // NOLINT
-};
-
-struct _is {
-  struct _is *next;
-  struct _ts *tstate_head;
-
-  int64_t id;
-  int64_t id_refcount;
-  int requires_idref;
-  PyThread_type_lock id_mutex;
-
-  int finalizing;
-
-  PyObject *modules;
-  PyObject *modules_by_index;
-  PyObject *sysdict;
-  PyObject *builtins;
-  PyObject *importlib;
-
-  /* Used in Python/sysmodule.c. */
-  int check_interval;
-
-  /* Used in Modules/_threadmodule.c. */
-  long num_threads;  // NOLINT
-  /* Support for runtime thread stack size tuning.
-     A value of 0 means using the platform's default stack size
-     or the size specified by the THREAD_STACK_SIZE macro. */
-  /* Used in Python/thread.c. */
-  size_t pythread_stacksize;
-
-  PyObject *codec_search_path;
-  PyObject *codec_search_cache;
-  PyObject *codec_error_registry;
-  int codecs_initialized;
-
-  /* fs_codec.encoding is initialized to NULL.
-     Later, it is set to a non-NULL string by _PyUnicode_InitEncodings(). */
-  struct {
-    char *encoding; /* Filesystem encoding (encoded to UTF-8) */
-    char *errors;   /* Filesystem errors (encoded to UTF-8) */
-    _Py_error_handler error_handler;
-  } fs_codec;
-
-  PyConfig config;
-#ifdef HAVE_DLOPEN
-  int dlopenflags;
-#endif
-
-  PyObject *dict; /* Stores per-interpreter state */
-
-  PyObject *builtins_copy;
-  PyObject *import_func;
-  /* Initialized to PyEval_EvalFrameDefault(). */
-  _PyFrameEvalFunction eval_frame;
-
-  Py_ssize_t co_extra_user_count;
-  freefunc co_extra_freefuncs[MAX_CO_EXTRA_USERS];
-
-#ifdef HAVE_FORK
-  PyObject *before_forkers;
-  PyObject *after_forkers_parent;
-  PyObject *after_forkers_child;
-#endif
-  /* AtExit module */
-  void (*pyexitfunc)(PyObject *);
-  PyObject *pyexitmodule;
-
-  uint64_t tstate_next_unique_id;
-
-  struct _warnings_runtime_state warnings;
-
-  PyObject *audit_hooks;
-};
-
-#endif
-
 PyObject *set_eval_frame_py(PyObject *callback);
 PyMODINIT_FUNC PyInit__eval_frame();
 

test/cpp/pir/tools/CMakeLists.txt

@@ -1,4 +1,4 @@
 cc_library(
   test_dialect
   SRCS test_dialect.cc test_op.cc test_trait.cc test_interface.cc
-  DEPS pir)
+  DEPS pir gtest)

test/dygraph_to_static/test_new_ir_selectedrows.py

@@ -15,7 +15,10 @@
 import random
 import unittest
 
-from dygraph_to_static_util import test_and_compare_with_new_ir
+from dygraph_to_static_util import (
+    enable_fallback_guard,
+    test_and_compare_with_new_ir,
+)
 
 import paddle
 from paddle.jit.api import to_static
@@ -53,7 +56,6 @@ def forward(self, x):
         return x
 
 
-@to_static
 def train(net, adam, x):
     loss_data = []
     for i in range(10):
@@ -75,7 +77,6 @@ def train_dygraph():
         parameters=net.parameters(), learning_rate=0.01, grad_clip=clip
     )
 
-    paddle.jit.enable_to_static(False)
     return train(net, adam, x)
 
 
@@ -89,8 +90,7 @@ def train_static():
         parameters=net.parameters(), learning_rate=0.01, grad_clip=clip
     )
 
-    paddle.jit.enable_to_static(True)
-    return train(net, adam, x)
+    return to_static(train)(net, adam, x)
 
 
 class TestSimnet(unittest.TestCase):
@@ -104,4 +104,5 @@ def test_dygraph_static_same_loss(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    with enable_fallback_guard("False"):
+        unittest.main()