Move path_lib from onnxruntime/core/framework to onnxruntime/core/platform. (#3253)

Moved path_lib.h/cc from onnxruntime/core/framework to onnxruntime/core/platform and from the onnxruntime_framework to the onnxruntime_common libraries.
This commit is contained in:
edgchen1 2020-03-18 11:53:46 -07:00 committed by GitHub
parent 61621d4053
commit e03b8a1e2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 18 additions and 14 deletions

View file

@ -16,6 +16,8 @@ set(onnxruntime_common_src_patterns
"${ONNXRUNTIME_ROOT}/core/platform/env.cc"
"${ONNXRUNTIME_ROOT}/core/platform/env_time.h"
"${ONNXRUNTIME_ROOT}/core/platform/env_time.cc"
"${ONNXRUNTIME_ROOT}/core/platform/path_lib.h"
"${ONNXRUNTIME_ROOT}/core/platform/path_lib.cc"
"${ONNXRUNTIME_ROOT}/core/platform/scoped_resource.h"
"${ONNXRUNTIME_ROOT}/core/platform/telemetry.h"
"${ONNXRUNTIME_ROOT}/core/platform/telemetry.cc"

View file

@ -602,7 +602,7 @@ endif()
file(GLOB onnxruntime_perf_test_src CONFIGURE_DEPENDS
${onnxruntime_perf_test_src_patterns}
)
add_executable(onnxruntime_perf_test ${onnxruntime_perf_test_src} ${ONNXRUNTIME_ROOT}/core/framework/path_lib.cc)
add_executable(onnxruntime_perf_test ${onnxruntime_perf_test_src} ${ONNXRUNTIME_ROOT}/core/platform/path_lib.cc)
if(MSVC)
target_compile_options(onnxruntime_perf_test PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:SHELL:--compiler-options /utf-8>" "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/utf-8>")
endif()

View file

@ -7,9 +7,9 @@
#include "core/common/const_pointer_container.h"
#include "core/framework/allocator.h"
#include "core/framework/tensor.h"
#include "core/framework/path_lib.h"
#include "core/framework/tensor_allocator.h"
#include "core/framework/session_options.h"
#include "core/platform/path_lib.h"
namespace onnxruntime {
class ExecutionProviders;

View file

@ -3,7 +3,7 @@
#include "tensor_external_data_info.h"
#include "core/common/common.h"
#include "path_lib.h"
#include "core/platform/path_lib.h"
#ifdef _WIN32
#include <Windows.h>

View file

@ -17,7 +17,7 @@
#include "core/framework/allocator.h"
#include "core/framework/callback.h"
#include "core/framework/data_types.h"
#include "core/framework/path_lib.h"
#include "core/platform/path_lib.h"
#include "core/session/ort_apis.h"
using namespace ONNX_NAMESPACE;

View file

@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#include "path_lib.h"
#include "core/platform/path_lib.h"
#include "core/common/status.h"
#include "core/common/common.h"
#include <assert.h>

View file

@ -12,8 +12,8 @@
#include "core/common/common.h"
#include "core/platform/env.h"
#include "core/platform/ort_mutex.h"
#include "core/platform/path_lib.h"
#include "core/session/onnxruntime_cxx_api.h"
#include "core/framework/path_lib.h"
#include "core/framework/allocator.h"
#include "re2/re2.h"
#include <sstream>

View file

@ -7,8 +7,8 @@
#include <unordered_map>
#include <core/common/common.h>
#include <core/common/status.h>
#include <core/platform/path_lib.h>
#include <core/session/onnxruntime_cxx_api.h>
#include <core/framework/path_lib.h>
#include "heap_buffer.h"
namespace ONNX_NAMESPACE {

View file

@ -17,7 +17,7 @@
#include "sync_api.h"
#include "providers.h"
#include <google/protobuf/stubs/common.h>
#include "core/framework/path_lib.h"
#include "core/platform/path_lib.h"
#include "core/session/onnxruntime_cxx_api.h"
#include "core/optimizer/graph_transformer_level.h"
#include "core/framework/session_options.h"

View file

@ -3,7 +3,7 @@
#include <benchmark/benchmark.h>
#include <core/graph/model.h>
#include <core/framework/path_lib.h>
#include <core/platform/path_lib.h>
#include <core/session/onnxruntime_c_api.h>
#include <core/session/onnxruntime_cxx_api.h>
#include <core/session/ort_env.h>

View file

@ -11,7 +11,7 @@
#include <core/platform/env.h>
#include <core/framework/tensorprotoutils.h>
#include "test_allocator.h"
#include <core/framework/path_lib.h>
#include <core/platform/path_lib.h>
#ifdef _WIN32
#include <Windows.h>
#else

View file

@ -15,7 +15,7 @@
#endif
#include <core/graph/constants.h>
#include <core/framework/path_lib.h>
#include <core/platform/path_lib.h>
#include <core/optimizer/graph_transformer_level.h>
#include "test_configuration.h"

View file

@ -1,7 +1,9 @@
#include "test_utils.h"
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#include "core/platform/path_lib.h"
#include "gtest/gtest.h"
#include "core/framework/path_lib.h"
#include <string>
#define PATH_EXPECT(X, Y) \

View file

@ -10,7 +10,7 @@
#include "core/framework/op_kernel.h"
#include "core/framework/session_state.h"
#include "core/framework/utils.h"
#include "core/framework/path_lib.h"
#include "core/platform/path_lib.h"
#include <google/protobuf/io/zero_copy_stream_impl.h>
#include "test/test_environment.h"