From 8c4500ff6d9858b34ca5df9f29b96707f4e30023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E6=99=93=E4=BC=9F?= <39303645+Shixiaowei02@users.noreply.github.com> Date: Mon, 11 Jan 2021 17:59:13 +0800 Subject: [PATCH] fix header file paths of gflags, commit 2, test=develop (#30272) --- paddle/fluid/inference/api/demo_ci/vis_demo.cc | 2 +- paddle/fluid/inference/api/demo_ci/windows_mobilenet.cc | 2 +- paddle/fluid/inference/tests/api/lite_mul_model_test.cc | 2 +- paddle/fluid/inference/tests/api/lite_resnet50_test.cc | 3 +-- paddle/fluid/inference/tests/api/paddle_infer_api_test.cc | 2 +- paddle/fluid/inference/tests/api/trt_cascade_rcnn_test.cc | 2 +- .../trt_dynamic_shape_ernie_fp16_serialize_deserialize_test.cc | 2 +- .../api/trt_dynamic_shape_ernie_serialize_deserialize_test.cc | 2 +- .../api/trt_dynamic_shape_ernie_serialize_deserialize_test.h | 2 +- .../fluid/inference/tests/api/trt_dynamic_shape_ernie_test.cc | 2 +- paddle/fluid/inference/tests/api/trt_dynamic_shape_test.cc | 2 +- .../tests/api/trt_dynamic_shape_transformer_prune_test.cc | 2 +- paddle/fluid/inference/tests/api/trt_fc_prelu_test.cc | 2 +- .../inference/tests/api/trt_instance_norm_converter_test.cc | 2 +- paddle/fluid/inference/tests/api/trt_mobilenet_test.cc | 2 +- 15 files changed, 15 insertions(+), 16 deletions(-) diff --git a/paddle/fluid/inference/api/demo_ci/vis_demo.cc b/paddle/fluid/inference/api/demo_ci/vis_demo.cc index ad88574148..9dc1f56b69 100644 --- a/paddle/fluid/inference/api/demo_ci/vis_demo.cc +++ b/paddle/fluid/inference/api/demo_ci/vis_demo.cc @@ -16,8 +16,8 @@ limitations under the License. */ * This file contains demo for mobilenet, se-resnext50 and ocr. */ -#include #include +#include "gflags/gflags.h" #include "utils.h" // NOLINT #ifdef PADDLE_WITH_CUDA diff --git a/paddle/fluid/inference/api/demo_ci/windows_mobilenet.cc b/paddle/fluid/inference/api/demo_ci/windows_mobilenet.cc index 8df9e07d03..58301c3448 100644 --- a/paddle/fluid/inference/api/demo_ci/windows_mobilenet.cc +++ b/paddle/fluid/inference/api/demo_ci/windows_mobilenet.cc @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include #include #include @@ -20,6 +19,7 @@ #include #include #include +#include "gflags/gflags.h" #include "paddle/include/paddle_inference_api.h" diff --git a/paddle/fluid/inference/tests/api/lite_mul_model_test.cc b/paddle/fluid/inference/tests/api/lite_mul_model_test.cc index 0c6b6019c5..205898a6fd 100644 --- a/paddle/fluid/inference/tests/api/lite_mul_model_test.cc +++ b/paddle/fluid/inference/tests/api/lite_mul_model_test.cc @@ -12,12 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include #include #include #include #include // NOLINT #include // NOLINT +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/tester_helper.h" diff --git a/paddle/fluid/inference/tests/api/lite_resnet50_test.cc b/paddle/fluid/inference/tests/api/lite_resnet50_test.cc index a51cb755ed..99c2c2f6f3 100644 --- a/paddle/fluid/inference/tests/api/lite_resnet50_test.cc +++ b/paddle/fluid/inference/tests/api/lite_resnet50_test.cc @@ -12,12 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include #include #include - #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/tester_helper.h" namespace paddle { diff --git a/paddle/fluid/inference/tests/api/paddle_infer_api_test.cc b/paddle/fluid/inference/tests/api/paddle_infer_api_test.cc index fee7c35581..88ebd85c79 100644 --- a/paddle/fluid/inference/tests/api/paddle_infer_api_test.cc +++ b/paddle/fluid/inference/tests/api/paddle_infer_api_test.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. */ #include -#include #include #include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_test_helper.h" diff --git a/paddle/fluid/inference/tests/api/trt_cascade_rcnn_test.cc b/paddle/fluid/inference/tests/api/trt_cascade_rcnn_test.cc index 35be7db560..a1f31c3108 100644 --- a/paddle/fluid/inference/tests/api/trt_cascade_rcnn_test.cc +++ b/paddle/fluid/inference/tests/api/trt_cascade_rcnn_test.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_test_helper.h" diff --git a/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_fp16_serialize_deserialize_test.cc b/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_fp16_serialize_deserialize_test.cc index 5585980c53..a5b9e6825c 100644 --- a/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_fp16_serialize_deserialize_test.cc +++ b/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_fp16_serialize_deserialize_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. */ #include -#include #include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h" diff --git a/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.cc b/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.cc index 1c87764776..084169da34 100644 --- a/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.cc +++ b/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. */ #include -#include #include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h" diff --git a/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h b/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h index 9ada6f7bd4..40955275f5 100644 --- a/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h +++ b/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. */ #pragma once #include -#include #include #include #include @@ -21,6 +20,7 @@ limitations under the License. */ #include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_test_helper.h" diff --git a/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_test.cc b/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_test.cc index 875175d9e8..6d69565716 100644 --- a/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_test.cc +++ b/paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_test.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_test_helper.h" diff --git a/paddle/fluid/inference/tests/api/trt_dynamic_shape_test.cc b/paddle/fluid/inference/tests/api/trt_dynamic_shape_test.cc index 6db2b9acda..552aefac9b 100644 --- a/paddle/fluid/inference/tests/api/trt_dynamic_shape_test.cc +++ b/paddle/fluid/inference/tests/api/trt_dynamic_shape_test.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_test_helper.h" diff --git a/paddle/fluid/inference/tests/api/trt_dynamic_shape_transformer_prune_test.cc b/paddle/fluid/inference/tests/api/trt_dynamic_shape_transformer_prune_test.cc index 965e233b68..f20e40b244 100644 --- a/paddle/fluid/inference/tests/api/trt_dynamic_shape_transformer_prune_test.cc +++ b/paddle/fluid/inference/tests/api/trt_dynamic_shape_transformer_prune_test.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_test_helper.h" diff --git a/paddle/fluid/inference/tests/api/trt_fc_prelu_test.cc b/paddle/fluid/inference/tests/api/trt_fc_prelu_test.cc index 37a443e0f6..c0be194493 100644 --- a/paddle/fluid/inference/tests/api/trt_fc_prelu_test.cc +++ b/paddle/fluid/inference/tests/api/trt_fc_prelu_test.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_test_helper.h" diff --git a/paddle/fluid/inference/tests/api/trt_instance_norm_converter_test.cc b/paddle/fluid/inference/tests/api/trt_instance_norm_converter_test.cc index 759c7b260f..ceb8b99774 100644 --- a/paddle/fluid/inference/tests/api/trt_instance_norm_converter_test.cc +++ b/paddle/fluid/inference/tests/api/trt_instance_norm_converter_test.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_test_helper.h" diff --git a/paddle/fluid/inference/tests/api/trt_mobilenet_test.cc b/paddle/fluid/inference/tests/api/trt_mobilenet_test.cc index 4a84a972ba..425b672731 100644 --- a/paddle/fluid/inference/tests/api/trt_mobilenet_test.cc +++ b/paddle/fluid/inference/tests/api/trt_mobilenet_test.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include #include #include +#include "gflags/gflags.h" #include "paddle/fluid/inference/tests/api/trt_test_helper.h"