Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CherryPick] Fix issue 60092 #61427

Merged
merged 4 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion paddle/fluid/inference/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ get_property(fluid_modules GLOBAL PROPERTY FLUID_MODULES)
get_property(phi_modules GLOBAL PROPERTY PHI_MODULES)
get_property(ir_targets GLOBAL PROPERTY IR_TARGETS)
get_property(not_infer_modules GLOBAL PROPERTY NOT_INFER_MODULES)
set(utils_modules pretty_log string_helper benchmark utf8proc)
set(utils_modules pretty_log string_helper utf8proc)

if(NOT WITH_GFLAGS)
set(utils_modules ${utils_modules} paddle_flags)
Expand Down
13 changes: 0 additions & 13 deletions paddle/fluid/inference/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
cc_library(
benchmark
SRCS benchmark.cc
DEPS enforce common)
paddle_test(test_benchmark SRCS benchmark_tester.cc DEPS benchmark)
cc_library(
infer_io_utils
SRCS io_utils.cc
Expand All @@ -13,13 +8,5 @@ cc_library(
DEPS proto_desc enforce common)

cc_library(table_printer SRCS table_printer.cc)
paddle_test(test_table_printer SRCS table_printer_tester.cc)

proto_library(shape_range_info_proto SRCS shape_range_info.proto)

if(WITH_ONNXRUNTIME AND WIN32)
# Copy onnxruntime for some c++ test in Windows, since the test will
# be build only in CI, so suppose the generator in Windows is Ninja.
copy_onnx(test_benchmark)
copy_onnx(test_table_printer)
endif()
54 changes: 0 additions & 54 deletions paddle/fluid/inference/utils/benchmark.cc

This file was deleted.

56 changes: 0 additions & 56 deletions paddle/fluid/inference/utils/benchmark.h

This file was deleted.

40 changes: 0 additions & 40 deletions paddle/fluid/inference/utils/benchmark_tester.cc

This file was deleted.

82 changes: 0 additions & 82 deletions paddle/fluid/inference/utils/table_printer_tester.cc

This file was deleted.

2 changes: 0 additions & 2 deletions test/cpp/fluid/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
add_subdirectory(benchmark)
add_subdirectory(framework)

add_subdirectory(inference)

if(WITH_CINN)
add_subdirectory(cinn)
endif()
Expand Down
1 change: 0 additions & 1 deletion test/cpp/fluid/inference/CMakeLists.txt

This file was deleted.

16 changes: 0 additions & 16 deletions test/cpp/fluid/inference/utils/CMakeLists.txt

This file was deleted.

Loading