PaddlePaddle
diff --git a/‎paddle/fluid/pybind/pir.cc
Copy file name to clipboard
+17-1Lines changed: 17 additions & 1 deletion b/‎paddle/fluid/pybind/pir.cc
Copy file name to clipboard
+17-1Lines changed: 17 additions & 1 deletion
diff --git a/‎python/paddle/io/dataloader/dataloader_iter.py
Copy file name to clipboard
+22-9Lines changed: 22 additions & 9 deletions b/‎python/paddle/io/dataloader/dataloader_iter.py
Copy file name to clipboard
+22-9Lines changed: 22 additions & 9 deletions
diff --git a/‎python/paddle/jit/dy2static/program_translator.py
Copy file name to clipboard
+11-8Lines changed: 11 additions & 8 deletions b/‎python/paddle/jit/dy2static/program_translator.py
Copy file name to clipboard
+11-8Lines changed: 11 additions & 8 deletions
diff --git a/‎python/paddle/nn/functional/common.py
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions b/‎python/paddle/nn/functional/common.py
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions
diff --git a/‎python/paddle/pir/program_patch.py
Copy file name to clipboard
-10Lines changed: 0 additions & 10 deletions b/‎python/paddle/pir/program_patch.py
Copy file name to clipboard
-10Lines changed: 0 additions & 10 deletions
diff --git a/‎python/paddle/tensor/math.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎python/paddle/tensor/math.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎test/deprecated/legacy_test/CMakeLists.txt
Copy file name to clipboard
+3-11Lines changed: 3 additions & 11 deletions b/‎test/deprecated/legacy_test/CMakeLists.txt
Copy file name to clipboard
+3-11Lines changed: 3 additions & 11 deletions
@@ -312,6 +312,7 @@ py::object Clone(const Program &self, IrMapping *p_mapper = nullptr) {
 }
 
 void BindProgram(py::module *m) {
+  static int64_t global_prog_seed = 0;
   py::class_<Program, std::shared_ptr<Program>> program(
       *m, "Program", py::dynamic_attr(), R"DOC(
     Create Python Program. Program is an abstraction of model structure, divided into
@@ -376,7 +377,9 @@ void BindProgram(py::module *m) {
   )DOC");
   program
       .def(py::init([]() {
-        return std::make_shared<Program>(pir::IrContext::Instance());
+        auto prog = std::make_shared<Program>(pir::IrContext::Instance());
+        SetProgramInt64Attr(prog, "random_seed", global_prog_seed);
+        return prog;
       }))
       .def("__str__",
            [](const std::shared_ptr<Program> &self) {
@@ -432,6 +435,19 @@ void BindProgram(py::module *m) {
           [](std::shared_ptr<Program> self, int64_t random_seed) {
             SetProgramInt64Attr(self, "random_seed", random_seed);
           })
+      .def_property(
+          "_seed",
+          [](const std::shared_ptr<Program> &self) {
+            return GetProgramInt64Attr(self, "random_seed", 0);
+          },
+          [](std::shared_ptr<Program> self, int64_t random_seed) {
+            SetProgramInt64Attr(self, "random_seed", random_seed);
+          })
+      .def("global_seed",
+           [](std::shared_ptr<Program> self, int64_t random_seed) {
+             global_prog_seed = random_seed;
+             SetProgramInt64Attr(self, "random_seed", random_seed);
+           })
       .def_property_readonly(
           "blocks",
           [](const std::shared_ptr<Program> &self) {
 
@@ -26,10 +26,11 @@
 import paddle
 from paddle import profiler
 from paddle.base.framework import _current_expected_place, _set_expected_place
+from paddle.pir.core import datatype_to_vartype
 from paddle.profiler.timer import benchmark
 from paddle.profiler.utils import in_profiler_mode
 
-from ...framework import core, in_dynamic_mode
+from ...framework import core, in_dynamic_mode, in_pir_mode
 from ..multiprocess_utils import (
     MP_STATUS_CHECK_INTERVAL,
     CleanupFuncRegistrar,
@@ -188,10 +189,16 @@ def __init__(self, loader):
     def _init_thread(self):
         self._var_names = [v.name for v in self._feed_list]
         self._shapes = [v.shape for v in self._feed_list]
-        self._dtypes = [v.dtype for v in self._feed_list]
-        self._need_check_feed = [
-            v.desc.need_check_feed() for v in self._feed_list
-        ]
+        if in_pir_mode():
+            self._need_check_feed = [False for v in self._feed_list]
+            self._dtypes = [
+                datatype_to_vartype[v.dtype] for v in self._feed_list
+            ]
+        else:
+            self._need_check_feed = [
+                v.desc.need_check_feed() for v in self._feed_list
+            ]
+            self._dtypes = [v.dtype for v in self._feed_list]
         # if only 1 place, do not need to keep order
         self._blocking_queue = core.init_lod_tensor_blocking_queue(
             core.Variable(),
@@ -486,10 +493,16 @@ def _clear_and_remove_data_queue(self):
     def _init_thread(self):
         self._var_names = [v.name for v in self._feed_list]
         self._shapes = [v.shape for v in self._feed_list]
-        self._dtypes = [v.dtype for v in self._feed_list]
-        self._need_check_feed = [
-            v.desc.need_check_feed() for v in self._feed_list
-        ]
+        if in_pir_mode():
+            self._need_check_feed = [False for v in self._feed_list]
+            self._dtypes = [
+                datatype_to_vartype[v.dtype] for v in self._feed_list
+            ]
+        else:
+            self._need_check_feed = [
+                v.desc.need_check_feed() for v in self._feed_list
+            ]
+            self._dtypes = [v.dtype for v in self._feed_list]
         # if only 1 place, do not need to keep order
         self._blocking_queue = core.init_lod_tensor_blocking_queue(
             core.Variable(), self._outstanding_capacity, len(self._places) > 1
 
@@ -21,6 +21,7 @@
 import weakref
 from typing import TYPE_CHECKING
 
+import paddle
 import paddle.pir.core as ir_static
 from paddle import decomposition, get_flags
 from paddle.base import core, framework
@@ -1176,13 +1177,13 @@ def pir_from_func_spec(
         # Note: The random seed should be synchronized into cached program
         # if set in `fluid.dygraph_guard` because some ops rely on it, such as
         # `fluid.layers.dropout`.
+        main_program.random_seed = (
+            paddle.static.default_main_program().random_seed
+        )
+        startup_program.random_seed = (
+            paddle.static.default_startup_program().random_seed
+        )
 
-        # TODO: new ir has no random seed.
-        #  {{{
-        # main_program.random_seed = static.default_main_program().random_seed
-        # startup_program.random_seed = (
-        # framework.default_startup_program().random_seed
-        # ) }}}
         with ir_static.program_guard(main_program, startup_program):
             with _to_static_mode_guard_(
                 is_to_static=True
@@ -1276,9 +1277,11 @@ def from_func_spec(
         # Note: The random seed should be synchronized into cached program
         # if set in `base.dygraph_guard` because some ops rely on it, such as
         # `base.layers.dropout`.
-        main_program.random_seed = framework.default_main_program().random_seed
+        main_program.random_seed = (
+            paddle.static.default_main_program().random_seed
+        )
         startup_program.random_seed = (
-            framework.default_startup_program().random_seed
+            paddle.static.default_startup_program().random_seed
         )
 
         ProgramTranslator.get_instance()._amp_records.clear()
 
@@ -1157,9 +1157,8 @@ def dropout(
         )  # semantic transfer
 
         if in_dynamic_or_pir_mode():
-            if default_main_program().random_seed != 0:
-                seed = default_main_program().random_seed
-
+            if paddle.static.default_main_program().random_seed != 0:
+                seed = paddle.static.default_main_program().random_seed
             out = _C_ops.dropout(
                 x,
                 None,
 
@@ -18,26 +18,16 @@
 
 _already_patch_program = False
 
-global_prog_seed = 0
-
 
 def monkey_patch_program():
-    def global_seed(self, seed=0):
-        global global_prog_seed
-        global_prog_seed = seed
-        self._seed = global_prog_seed
-
     @signature_safe_contextmanager
     def _lr_schedule_guard(self, is_with_opt=False):
         # TODO(dev): Currently there has not equivalent of op_role in PIR
         # mode, so we simply remove _lr_schedule_guard here, this should
         # be fixed in the future.
         yield
 
-    global global_prog_seed
     program_attrs = {
-        "global_seed": global_seed,
-        "_seed": global_prog_seed,
         "_lr_schedule_guard": _lr_schedule_guard,
     }
 
 
@@ -2362,7 +2362,7 @@ def addmm(input, x, y, beta=1.0, alpha=1.0, name=None):
             f"The dimension of input should be 2 or 1 but receive input's shape: {input_shape}"
         )
 
-    if in_dynamic_mode():
+    if in_dynamic_or_pir_mode():
         return _C_ops.addmm(input, x, y, beta, alpha)
     else:
         inputs = {'Input': input, "X": x, "Y": y}
 
@@ -405,7 +405,7 @@ list(REMOVE_ITEM TEST_OPS test_bilinear_interp_op)
 list(REMOVE_ITEM TEST_OPS test_nearest_interp_op)
 list(REMOVE_ITEM TEST_OPS test_imperative_mnist_sorted_gradient)
 list(REMOVE_ITEM TEST_OPS test_imperative_mnist)
-list(REMOVE_ITEM TEST_OPS test_layers)
+list(REMOVE_ITEM TEST_OPS test_layers_deprecated)
 list(REMOVE_ITEM TEST_OPS test_imperative_ocr_attention_model)
 list(REMOVE_ITEM TEST_OPS test_async_ssa_graph_executor_mnist)
 list(REMOVE_ITEM TEST_OPS test_install_check)
@@ -431,7 +431,6 @@ if(APPLE OR WIN32)
   list(REMOVE_ITEM TEST_OPS test_dataset_dataloader)
   list(REMOVE_ITEM TEST_OPS test_imperative_data_loader_process)
   list(REMOVE_ITEM TEST_OPS test_imperative_data_loader_exit_func)
-  list(REMOVE_ITEM TEST_OPS test_multiprocess_dataloader_static)
   list(REMOVE_ITEM TEST_OPS test_multiprocess_dataloader_iterable_dataset)
 endif()
 
@@ -627,25 +626,18 @@ py_test_modules(
 
 if(NOT WIN32)
   # TODO: fix these unittests failure on Windows
-  py_test_modules(test_layers MODULES test_layers ENVS
+  py_test_modules(test_layers_deprecated MODULES test_layers_deprecated ENVS
                   FLAGS_cudnn_deterministic=1)
 endif()
 
 set_tests_properties(
   test_data_norm_op test_dataloader_keep_order test_dataloader_unkeep_order
   PROPERTIES LABELS "RUN_TYPE=DIST")
 
-if(NOT WIN32 AND NOT APPLE)
-  set_tests_properties(test_multiprocess_dataloader_static
-                       PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
-  set_tests_properties(test_multiprocess_dataloader_static PROPERTIES TIMEOUT
-                                                                      120)
-endif()
-
 if(NOT WIN32)
   set_tests_properties(test_multiprocess_reader_exception
                        PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE")
-  set_tests_properties(test_layers PROPERTIES TIMEOUT 120)
+  set_tests_properties(test_layers_deprecated PROPERTIES TIMEOUT 120)
 endif()
 
 # setting timeout value as 15S
Original file line number	Diff line number	Diff line change
`@@ -2362,7 +2362,7 @@ def addmm(input, x, y, beta=1.0, alpha=1.0, name=None):`
`2362`	`2362`	`f"The dimension of input should be 2 or 1 but receive input's shape: {input_shape}"`
`2363`	`2363`	`)`
`2364`	`2364`
`2365`		`- if in_dynamic_mode():`
	`2365`	`+ if in_dynamic_or_pir_mode():`
`2366`	`2366`	`return _C_ops.addmm(input, x, y, beta, alpha)`
`2367`	`2367`	`else:`
`2368`	`2368`	`inputs = {'Input': input, "X": x, "Y": y}`