Skip to content

Commit 1e8f40a

Browse files
authored
[XPU] Stop supporting xpu conv autotune config with paddlelite c api. (#9316)
1 parent e096ef4 commit 1e8f40a

File tree

5 files changed

+10
-17
lines changed

5 files changed

+10
-17
lines changed

lite/api/paddle_api.cc

+6-2
Original file line numberDiff line numberDiff line change
@@ -626,8 +626,12 @@ void CxxConfig::set_xpu_multi_encoder_method(const std::string &precision,
626626
void CxxConfig::set_xpu_conv_autotune(bool autotune,
627627
const std::string &autotune_file) {
628628
#ifdef LITE_WITH_XPU
629-
lite::TargetWrapperXPU::conv_autotune = autotune;
630-
lite::TargetWrapperXPU::conv_autotune_file = autotune_file;
629+
LOG(WARNING)
630+
<< "This function "
631+
"'set_xpu_conv_autotune' is deprecated, "
632+
"if you want to use autotune, please refer to "
633+
"http://agroup.baidu.com/share/md/f9233d84df11452488a1fdd4f859647f";
634+
631635
#else
632636
LOG(WARNING) << "The invoking of the function "
633637
"'set_xpu_conv_autotune' is ignored, please "

lite/api/paddle_api.h

+2
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,8 @@ class LITE_API CxxConfig : public ConfigBase {
472472

473473
void set_xpu_gm_workspace_method(size_t gm_size);
474474

475+
// **DEPRECATED**, use environ variable to enable autotune
476+
// check http://agroup.baidu.com/share/md/f9233d84df11452488a1fdd4f859647f
475477
void set_xpu_conv_autotune(bool autotune = true,
476478
const std::string& autotune_file = "");
477479

lite/backends/xpu/target_wrapper.cc

-3
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ LITE_THREAD_LOCAL std::shared_ptr<void> TargetWrapperXPU::xpu_stream_{nullptr};
165165
LITE_THREAD_LOCAL std::string
166166
TargetWrapperXPU::multi_encoder_precision; // NOLINT
167167
LITE_THREAD_LOCAL bool TargetWrapperXPU::multi_encoder_adaptive_seqlen{false};
168-
// conv autotune config
169-
LITE_THREAD_LOCAL bool TargetWrapperXPU::conv_autotune{false};
170-
LITE_THREAD_LOCAL std::string TargetWrapperXPU::conv_autotune_file;
171168
// l3 cache config
172169
LITE_THREAD_LOCAL bool TargetWrapperXPU::need_l3_mutex{false};
173170
LITE_THREAD_LOCAL size_t TargetWrapperXPU::local_l3_size{

lite/backends/xpu/target_wrapper.h

-11
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,6 @@ class TargetWrapper<TARGET(kXPU)> {
111111
quantizer_.reset(new XPUQuantizer());
112112
}
113113
CHECK(quantizer_.get());
114-
if (conv_autotune) {
115-
tls_raw_ctx_->_xpu1_conv_selector.set_autotune_loop(true);
116-
tls_raw_ctx_->_xpu1_conv_selector.set_inference_mode(true);
117-
}
118-
if (!conv_autotune_file.empty()) {
119-
tls_raw_ctx_->_xpu1_conv_selector.set_autotune_file(
120-
conv_autotune_file.c_str());
121-
}
122114
int devid = -1;
123115
uint64_t max_l3_size = 0;
124116
XPU_CALL(xpu_current_device(&devid));
@@ -173,9 +165,6 @@ class TargetWrapper<TARGET(kXPU)> {
173165
// multi encoder config
174166
static LITE_THREAD_LOCAL std::string multi_encoder_precision; // NOLINT
175167
static LITE_THREAD_LOCAL bool multi_encoder_adaptive_seqlen;
176-
// conv autotune config
177-
static LITE_THREAD_LOCAL bool conv_autotune;
178-
static LITE_THREAD_LOCAL std::string conv_autotune_file; // NOLINT
179168
// l3 cache config
180169
static LITE_THREAD_LOCAL bool need_l3_mutex; // model level l3 size
181170
static LITE_THREAD_LOCAL size_t local_l3_size; // model level l3 size

lite/tests/api/test_resnet50_fp32_baidu_xpu.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <gflags/gflags.h>
1616
#include <gtest/gtest.h>
17+
#include <stdlib.h>
1718
#include <vector>
1819
#include "lite/api/paddle_api.h"
1920
#include "lite/api/paddle_use_kernels.h"
@@ -35,13 +36,13 @@ namespace paddle {
3536
namespace lite {
3637

3738
TEST(resnet50, test_resnet50_fp32_baidu_xpu) {
39+
setenv("XPU_CONV_AUTOTUNE", "5", 1);
3840
lite_api::CxxConfig config;
3941
config.set_model_dir(FLAGS_model_dir);
4042
config.set_valid_places({lite_api::Place{TARGET(kXPU), PRECISION(kFloat)},
4143
lite_api::Place{TARGET(kX86), PRECISION(kFloat)},
4244
lite_api::Place{TARGET(kHost), PRECISION(kFloat)}});
4345
config.set_xpu_l3_cache_method(16773120, false);
44-
config.set_xpu_conv_autotune(true);
4546
auto predictor = lite_api::CreatePaddlePredictor(config);
4647

4748
std::string raw_data_dir = FLAGS_data_dir + std::string("/raw_data");

0 commit comments

Comments
 (0)