From fb2a44f6423ac5d4f8af9105af82f00c99ae3a46 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 27 Mar 2019 10:28:13 -0700 Subject: [PATCH] Remove header_files_test.cc --- cmake/onnxruntime_unittests.cmake | 13 +--- .../test/framework/header_files_test.cc | 76 ------------------- 2 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 onnxruntime/test/framework/header_files_test.cc diff --git a/cmake/onnxruntime_unittests.cmake b/cmake/onnxruntime_unittests.cmake index 0b4dc37a33..98f70f5bab 100644 --- a/cmake/onnxruntime_unittests.cmake +++ b/cmake/onnxruntime_unittests.cmake @@ -63,11 +63,6 @@ function(AddTest) ) endfunction(AddTest) -#Check whether C++17 header file is present -include(CheckIncludeFiles) -check_include_files("filesystem" HAS_FILESYSTEM_H LANGUAGE CXX) -check_include_files("experimental/filesystem" HAS_EXPERIMENTAL_FILESYSTEM_H LANGUAGE CXX) - #Do not add '${TEST_SRC_DIR}/util/include' to your include directories directly #Use onnxruntime_add_include_to_target or target_link_libraries, so that compile definitions #can propagate correctly. @@ -162,8 +157,6 @@ set(onnxruntime_test_framework_libs if(WIN32) list(APPEND onnxruntime_test_framework_libs Advapi32) -elseif(HAS_FILESYSTEM_H OR HAS_EXPERIMENTAL_FILESYSTEM_H) - list(APPEND onnxruntime_test_framework_libs stdc++fs) endif() @@ -216,10 +209,6 @@ if(onnxruntime_USE_TENSORRT) list(APPEND onnxruntime_test_providers_libs onnxruntime_providers_tensorrt) endif() -if( NOT WIN32 AND (HAS_FILESYSTEM_H OR HAS_EXPERIMENTAL_FILESYSTEM_H)) - list(APPEND onnxruntime_test_providers_libs stdc++fs) -endif() - if(WIN32) if (onnxruntime_USE_TVM) list(APPEND disabled_warnings ${DISABLED_WARNINGS_FOR_TVM}) @@ -427,7 +416,7 @@ install(TARGETS onnx_test_runner LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -if(onnxruntime_BUILD_BENCHMARKS AND (HAS_FILESYSTEM_H OR HAS_EXPERIMENTAL_FILESYSTEM_H)) +if(onnxruntime_BUILD_BENCHMARKS) add_executable(onnxruntime_benchmark ${TEST_SRC_DIR}/onnx/microbenchmark/main.cc ${TEST_SRC_DIR}/onnx/microbenchmark/modeltest.cc ${TEST_SRC_DIR}/onnx/microbenchmark/model_init.cc) target_include_directories(onnxruntime_benchmark PRIVATE ${ONNXRUNTIME_ROOT} ${onnxruntime_graph_header} benchmark) onnxruntime_add_include_to_target(onnxruntime_benchmark gsl) diff --git a/onnxruntime/test/framework/header_files_test.cc b/onnxruntime/test/framework/header_files_test.cc deleted file mode 100644 index dde3a9eb3f..0000000000 --- a/onnxruntime/test/framework/header_files_test.cc +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#if defined(__MACH__) -#else - -#include -#include -#include -#include -#include - -#include - -using namespace std::experimental::filesystem::v1; - -namespace onnxruntime { -namespace test { - -std::set RetrieveAllHeaders(const path& include_folder_root) { - std::set headers; - std::vector paths{include_folder_root}; - while (!paths.empty()) { - path node_data_root_path = paths.back(); - paths.pop_back(); - for (directory_iterator file_entry(node_data_root_path), end; file_entry != end; ++file_entry) { - if (is_directory(*file_entry)) { - paths.push_back(file_entry->path()); - continue; - } - - if (!file_entry->path().has_extension()) continue; - if (file_entry->path().extension() != ".h") continue; - headers.insert(file_entry->path()); - } - } - return headers; -} - -std::vector RetrieveHeaderDependencies(const path& header, const path& include_folder_root) { - std::vector header_dependencies; - std::ifstream header_stream(header); - const std::size_t pos_off = 10; // length of "#include \"" - if (!header_stream.good()) return header_dependencies; - std::string line; - while (std::getline(header_stream, line)) { - line.erase(line.find_last_not_of(" \r\n\t") + 1); - std::size_t pos = line.find("#include \"core/"); - if (pos != std::string::npos) { - header_dependencies.push_back(include_folder_root / line.substr(pos + pos_off, line.length() - pos - pos_off - 1)); - } else { - pos = line.find("#include headers(RetrieveAllHeaders(include_folder_path)); - - for (auto header_iterator = headers.begin(); header_iterator != headers.end(); header_iterator++) { - std::vector header_dependencies(RetrieveHeaderDependencies(*header_iterator, include_folder_path)); - for (auto dependency_iterator = header_dependencies.begin(); dependency_iterator != header_dependencies.end(); dependency_iterator++) { - EXPECT_TRUE(headers.find(*dependency_iterator) != headers.end()) << *header_iterator << " depends on " << *dependency_iterator << " that is not in include folder"; - } - } -} - -} // namespace test -} // namespace onnxruntime - -#endif