Merge branch 'fix_place33' into fix_place41

Author: co63oc

cmake/generic.cmake

@@ -474,7 +474,6 @@ function(cc_test_run TARGET_NAME)
       TEST ${TARGET_NAME}
       PROPERTY
         ENVIRONMENT
-        FLAGS_cpu_deterministic=true
         FLAGS_init_allocated_mem=true
         FLAGS_cudnn_deterministic=true
         LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${PADDLE_BINARY_DIR}/python/paddle/libs:${PADDLE_BINARY_DIR}/python/paddle/base
@@ -717,8 +716,6 @@ function(nv_test TARGET_NAME)
     add_dependencies(${TARGET_NAME} ${nv_test_DEPS} paddle_gtest_main)
     common_link(${TARGET_NAME})
     add_test(${TARGET_NAME} ${TARGET_NAME})
-    set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
-                                              FLAGS_cpu_deterministic=true)
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
                                               FLAGS_init_allocated_mem=true)
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
@@ -827,8 +824,6 @@ function(hip_test TARGET_NAME)
       glog)
     common_link(${TARGET_NAME})
     add_test(${TARGET_NAME} ${TARGET_NAME})
-    set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
-                                              FLAGS_cpu_deterministic=true)
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
                                               FLAGS_init_allocated_mem=true)
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
@@ -932,8 +927,6 @@ function(xpu_test TARGET_NAME)
       glog)
     common_link(${TARGET_NAME})
     add_test(${TARGET_NAME} ${TARGET_NAME})
-    set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
-                                              FLAGS_cpu_deterministic=true)
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
                                               FLAGS_init_allocated_mem=true)
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
@@ -1160,8 +1153,8 @@ function(py_test TARGET_NAME)
         NAME ${TARGET_NAME}
         COMMAND
           ${CMAKE_COMMAND} -E env FLAGS_init_allocated_mem=true
-          FLAGS_cudnn_deterministic=true FLAGS_cpu_deterministic=true
-          PYTHONPATH=${PADDLE_BINARY_DIR}/python ${py_test_ENVS}
+          FLAGS_cudnn_deterministic=true PYTHONPATH=${PADDLE_BINARY_DIR}/python
+          ${py_test_ENVS}
           COVERAGE_FILE=${PADDLE_BINARY_DIR}/python-coverage.data
           ${PYTHON_EXECUTABLE} -m coverage run --branch -p ${py_test_SRCS}
           ${py_test_ARGS}
@@ -1171,9 +1164,8 @@ function(py_test TARGET_NAME)
         NAME ${TARGET_NAME}
         COMMAND
           ${CMAKE_COMMAND} -E env FLAGS_init_allocated_mem=true
-          FLAGS_cudnn_deterministic=true FLAGS_cpu_deterministic=true
-          ${py_test_ENVS} ${PYTHON_EXECUTABLE} -u ${py_test_SRCS}
-          ${py_test_ARGS}
+          FLAGS_cudnn_deterministic=true ${py_test_ENVS} ${PYTHON_EXECUTABLE} -u
+          ${py_test_SRCS} ${py_test_ARGS}
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
     endif()
 

paddle/fluid/framework/compiled_program.cc

@@ -1,34 +1,13 @@
-if(WITH_PSCORE)
-  set(DISTRIBUTE_COMPILE_FLAGS
-      "-Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor"
-  )
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-    set(DISTRIBUTE_COMPILE_FLAGS "${DISTRIBUTE_COMPILE_FLAGS} -faligned-new")
-  endif()
-  set_source_files_properties(
-    reduce_op_handle.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
-endif()
-
 set(op_handle_srcs
     nan_inf_utils_detail.cc
-    all_reduce_op_handle.cc
-    fused_all_reduce_op_handle.cc
-    reduce_op_handle.cc
-    broadcast_op_handle.cc
-    fused_broadcast_op_handle.cc
     var_handle.cc
     op_handle_base.cc
     scale_loss_grad_op_handle.cc
     share_tensor_buffer_functor.cc
     computation_op_handle.cc
     share_tensor_buffer_op_handle.cc
-    variable_visitor.cc
     eager_deletion_op_handle.cc)
 
-if(WITH_DGC)
-  set(op_handle_srcs ${op_handle_srcs} sparse_all_reduce_op_handle.cc)
-endif()
-
 set(op_handle_deps
     pass
     operator
@@ -77,8 +56,6 @@ set(IR_PASS_DEPS
     multi_batch_merge_pass
     fuse_relu_depthwise_conv_pass
     lock_free_optimize_pass
-    add_reader_dependency_pass
-    modify_op_lock_and_record_event_pass
     coalesce_grad_tensor_pass
     fuse_adam_op_pass
     fuse_sgd_op_pass