diff --git a/paddle/fluid/inference/anakin/op_teller.cc b/paddle/fluid/inference/anakin/op_teller.cc index 67b771226c4999a361a818e32e8caedd81723c03..6b2dedafcf9b3d7b423c314c1851f4dc19ee2e18 100644 --- a/paddle/fluid/inference/anakin/op_teller.cc +++ b/paddle/fluid/inference/anakin/op_teller.cc @@ -62,6 +62,12 @@ struct SimpleOpTypeSetTeller : public Teller { bool OpTeller::Tell(const std::string& op_type, const framework::OpDesc& desc) { for (auto& teller : tellers_) { + if (op_type == "pool2d" || op_type == "conv2d" || + op_type == "depthwise_conv2d" || op_type == "conv2d_transpose") { + std::vector paddings = + boost::get>(desc.GetAttr("paddings")); + if (paddings.size() > 2) return false; + } if ((*teller)(op_type, desc)) return true; } return false; diff --git a/paddle/fluid/inference/api/analysis_predictor.cc b/paddle/fluid/inference/api/analysis_predictor.cc index e00ba4d8408f276cb196e015e7e34007e03220e3..7a628769727a74fa114ca0bf2f3c903036ec90c8 100644 --- a/paddle/fluid/inference/api/analysis_predictor.cc +++ b/paddle/fluid/inference/api/analysis_predictor.cc @@ -123,7 +123,7 @@ bool AnalysisPredictor::PrepareScope( status_is_cloned_ = true; } else { if (config_.use_gpu_) { - paddle::framework::InitDevices(false, {config_.device_id_}); + paddle::framework::InitDevices(false); } else { paddle::framework::InitDevices(false, {}); } @@ -500,8 +500,6 @@ std::unique_ptr CreatePaddlePredictor< std::string flag = "--fraction_of_gpu_memory_to_use=" + std::to_string(fraction_of_gpu_memory); flags.push_back(flag); - flags.push_back("--selected_gpus=" + - std::to_string(config.gpu_device_id())); VLOG(3) << "set flag: " << flag; framework::InitGflags(flags); } diff --git a/paddle/fluid/inference/tensorrt/op_teller.cc b/paddle/fluid/inference/tensorrt/op_teller.cc index 292f5e1d4b928e81bb1a3020ae212791ac60d45b..fce8daa1d614691863cc8b7046333b289b8426be 100644 --- a/paddle/fluid/inference/tensorrt/op_teller.cc +++ b/paddle/fluid/inference/tensorrt/op_teller.cc @@ -57,6 +57,12 @@ struct SimpleOpTypeSetTeller : public Teller { bool OpTeller::Tell(const std::string& op_type, const framework::OpDesc& desc) { for (auto& teller : tellers_) { + if (op_type == "pool2d" || op_type == "conv2d" || + op_type == "depthwise_conv2d" || op_type == "conv2d_transpose") { + std::vector paddings = + boost::get>(desc.GetAttr("paddings")); + if (paddings.size() > 2) return false; + } if ((*teller)(op_type, desc)) return true; } return false;