From 3ffc68056714f1d59c600c433a00b3e209040261 Mon Sep 17 00:00:00 2001 From: co63oc Date: Sat, 9 Aug 2025 06:52:47 +0800 Subject: [PATCH] Fix --- .../cpp/inference/api/analysis_predictor_tester.cc | 4 ++-- .../inference/api/analyzer_bert_tester_deprecated.cc | 4 ++-- .../api/analyzer_image_classification_tester.cc | 12 ++++++------ .../api/analyzer_transformer_compare_tester.cc | 6 +++--- .../api/analyzer_transformer_profile_tester.cc | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/deprecated/cpp/inference/api/analysis_predictor_tester.cc b/test/deprecated/cpp/inference/api/analysis_predictor_tester.cc index 38978395b5ac7c..903cb9357cceea 100644 --- a/test/deprecated/cpp/inference/api/analysis_predictor_tester.cc +++ b/test/deprecated/cpp/inference/api/analysis_predictor_tester.cc @@ -317,7 +317,7 @@ TEST(AnalysisPredictor, bf16_gpu_pass_strategy) { config.SetModel(FLAGS_dirname); config.SwitchIrOptim(true); config.EnableUseGpu(100, 0); - config.EnableMkldnnBfloat16(); + config.EnableOnednnBfloat16(); #ifdef PADDLE_WITH_DNNL if (phi::backends::cpu::MayIUse(phi::backends::cpu::cpu_isa_t::avx512_core)) ASSERT_EQ(config.onednn_bfloat16_enabled(), true); @@ -332,7 +332,7 @@ TEST(AnalysisPredictor, bf16_gpu_pass_strategy) { TEST(AnalysisPredictor, bf16_pass_strategy) { std::vector passes; PassStrategy passStrategy(passes); - passStrategy.EnableMkldnnBfloat16(); + passStrategy.EnableOnednnBfloat16(); } TEST(AnalysisPredictor, onednn_fc_pass_strategy) { diff --git a/test/deprecated/cpp/inference/api/analyzer_bert_tester_deprecated.cc b/test/deprecated/cpp/inference/api/analyzer_bert_tester_deprecated.cc index ec10b780a35eeb..e30b8f364c7199 100644 --- a/test/deprecated/cpp/inference/api/analyzer_bert_tester_deprecated.cc +++ b/test/deprecated/cpp/inference/api/analyzer_bert_tester_deprecated.cc @@ -69,7 +69,7 @@ TEST(Analyzer_bert, compare) { CompareNativeAndAnalysisWrapper(); } #ifdef PADDLE_WITH_DNNL -TEST(Analyzer_bert, compare_mkldnn) { +TEST(Analyzer_bert, compare_onednn) { auto use_onednn = true; CompareNativeAndAnalysisWrapper(use_onednn); } @@ -210,7 +210,7 @@ AnalysisConfig SetConfig(bool use_onednn, bool use_bfloat16) { config.EnableONEDNN(); } - if (use_bfloat16) config.EnableMkldnnBfloat16(); + if (use_bfloat16) config.EnableOnednnBfloat16(); return config; } diff --git a/test/deprecated/cpp/inference/api/analyzer_image_classification_tester.cc b/test/deprecated/cpp/inference/api/analyzer_image_classification_tester.cc index 47c53d249e00c6..9915fac72873f3 100644 --- a/test/deprecated/cpp/inference/api/analyzer_image_classification_tester.cc +++ b/test/deprecated/cpp/inference/api/analyzer_image_classification_tester.cc @@ -37,11 +37,11 @@ void SetInput(std::vector> *inputs) { } // Easy for profiling independently. -void profile(bool use_mkldnn = false) { +void profile(bool use_onednn = false) { AnalysisConfig cfg; SetConfig(&cfg); - if (use_mkldnn) { + if (use_onednn) { cfg.EnableONEDNN(); if (FLAGS_disable_onednn_fc) { cfg.DisableOnednnFcPasses(); @@ -59,14 +59,14 @@ void profile(bool use_mkldnn = false) { TEST(Analyzer_resnet50, profile) { profile(); } #ifdef PADDLE_WITH_DNNL -TEST(Analyzer_resnet50, profile_mkldnn) { profile(true /* use_mkldnn */); } +TEST(Analyzer_resnet50, profile_onednn) { profile(true /* use_onednn */); } #endif // Compare result of NativeConfig and AnalysisConfig -void compare(bool use_mkldnn = false) { +void compare(bool use_onednn = false) { AnalysisConfig cfg; SetConfig(&cfg); - if (use_mkldnn) { + if (use_onednn) { cfg.EnableONEDNN(); if (FLAGS_disable_onednn_fc) { cfg.DisableOnednnFcPasses(); @@ -81,7 +81,7 @@ void compare(bool use_mkldnn = false) { TEST(Analyzer_resnet50, compare) { compare(); } #ifdef PADDLE_WITH_DNNL -TEST(Analyzer_resnet50, compare_mkldnn) { compare(true /* use_mkldnn */); } +TEST(Analyzer_resnet50, compare_onednn) { compare(true /* use_onednn */); } #endif // Compare Deterministic result diff --git a/test/deprecated/cpp/inference/api/analyzer_transformer_compare_tester.cc b/test/deprecated/cpp/inference/api/analyzer_transformer_compare_tester.cc index 04885a97ec19ba..a4dec2b4755eb5 100644 --- a/test/deprecated/cpp/inference/api/analyzer_transformer_compare_tester.cc +++ b/test/deprecated/cpp/inference/api/analyzer_transformer_compare_tester.cc @@ -19,10 +19,10 @@ namespace inference { namespace analysis { namespace transformer_tester { -void compare(bool use_mkldnn = false) { +void compare(bool use_onednn = false) { AnalysisConfig cfg; SetConfig(&cfg); - if (!use_mkldnn) { + if (!use_onednn) { cfg.DisableONEDNN(); } @@ -34,7 +34,7 @@ void compare(bool use_mkldnn = false) { TEST(Analyzer_Transformer, compare) { compare(); } #ifdef PADDLE_WITH_DNNL -TEST(Analyzer_Transformer, compare_mkldnn) { compare(true /* use_mkldnn */); } +TEST(Analyzer_Transformer, compare_onednn) { compare(true /* use_onednn */); } #endif } // namespace transformer_tester diff --git a/test/deprecated/cpp/inference/api/analyzer_transformer_profile_tester.cc b/test/deprecated/cpp/inference/api/analyzer_transformer_profile_tester.cc index 83f2f0041f8cce..6b6579beacc836 100644 --- a/test/deprecated/cpp/inference/api/analyzer_transformer_profile_tester.cc +++ b/test/deprecated/cpp/inference/api/analyzer_transformer_profile_tester.cc @@ -19,11 +19,11 @@ namespace inference { namespace analysis { namespace transformer_tester { -void profile(bool use_mkldnn = false) { +void profile(bool use_onednn = false) { AnalysisConfig cfg; SetConfig(&cfg); std::vector> outputs; - if (use_mkldnn) { + if (use_onednn) { cfg.EnableONEDNN(); } @@ -37,7 +37,7 @@ void profile(bool use_mkldnn = false) { TEST(Analyzer_Transformer, profile) { profile(); } #ifdef PADDLE_WITH_DNNL -TEST(Analyzer_Transformer, profile_mkldnn) { profile(true); } +TEST(Analyzer_Transformer, profile_onednn) { profile(true); } #endif } // namespace transformer_tester