Merge remote-tracking branch 'upstream/develop' into Cleanup__mkldnn_…

…inplace_pass

.flake8

@@ -37,9 +37,3 @@ per-file-ignores =
     .cmake-format.py: F821
     python/paddle/fluid/tests/unittests/dygraph_to_static/test_loop.py: F821
     python/paddle/fluid/tests/unittests/dygraph_to_static/test_closure_analysis.py: F821
-    # These files will be fixed in the future
-    python/paddle/fluid/tests/unittests/fft/test_fft_with_static_graph.py: F811
-    python/paddle/fluid/tests/unittests/test_activation_nn_grad.py: F811
-    python/paddle/fluid/tests/unittests/test_lstm_cudnn_op.py: F811
-    python/paddle/fluid/tests/unittests/test_matmul_v2_op.py: F811
-    python/paddle/fluid/tests/unittests/test_rrelu_op.py: F811

paddle/fluid/framework/ir/CMakeLists.txt

@@ -95,9 +95,8 @@ pass_library(quant_conv2d_dequant_fuse_pass inference)
 pass_library(shuffle_channel_detect_pass inference)
 pass_library(delete_quant_dequant_op_pass inference)
 pass_library(delete_quant_dequant_filter_op_pass inference)
+pass_library(trt_delete_weight_dequant_linear_op_pass inference)
 pass_library(delete_weight_dequant_linear_op_pass inference)
-pass_library(delete_weight_dequant_linear_op_encoder_pass inference)
-pass_library(delete_weight_dequant_linear_op_decoder_pass inference)
 pass_library(delete_quant_dequant_linear_op_pass inference)
 pass_library(delete_dropout_op_pass inference)
 pass_library(delete_c_identity_op_pass inference)
@@ -140,7 +139,7 @@ if(WITH_TENSORRT)
   pass_library(preln_layernorm_x_fuse_pass inference)
 endif()
 
-if(WITH_TENSORRT AND NOT WIN32)
+if(WITH_TENSORRT)
   pass_library(trt_embedding_eltwise_layernorm_fuse_pass inference)
   pass_library(preln_embedding_eltwise_layernorm_fuse_pass inference)
 endif()
@@ -346,6 +345,10 @@ cc_test(
   test_delete_dropout_pass_cc
   SRCS delete_dropout_op_pass_test.cc
   DEPS delete_dropout_op_pass)
+cc_test(
+  test_delete_dequant_weight_linear_op_pass
+  SRCS delete_weight_dequant_linear_op_pass_tester.cc
+  DEPS delete_weight_dequant_linear_op_pass)
 if(WITH_GPU OR WITH_ROCM)
   cc_test(
     test_embedding_eltwise_layernorm_fuse_pass