saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-29 20:14:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove onnxruntime_util dependency on onnxruntime_framework (#10512)

Browse source 
There's a circular dependency between onnxruntime_util and onnxruntime_framework.
Remove onnxruntime_util's dependency on onnxruntime_framework.
This commit is contained in:
Edward Chen 2022-02-10 19:17:08 -08:00 committed by GitHub
parent a27aabad34
commit f92e47e95b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 88 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/onnxruntime.cmake
View file

@ -7,7 +7,7 @@ if(UNIX)
set(OUTPUT_STYLE xcode)
else()
set(OUTPUT_STYLE gcc)
endif()
endif()
else()
set(SYMBOL_FILE ${CMAKE_CURRENT_BINARY_DIR}/onnxruntime_dll.def)
set(OUTPUT_STYLE vc)
@ -157,6 +157,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android" AND onnxruntime_BUILD_JAVA)
endforeach()
endif()
# This list is a reversed topological ordering of library dependencies.
# Earlier entries may depend on later ones. Later ones should not depend on earlier ones.
set(onnxruntime_INTERNAL_LIBRARIES
onnxruntime_session
${onnxruntime_libs}
@ -174,10 +176,10 @@ set(onnxruntime_INTERNAL_LIBRARIES
${onnxruntime_winml}
onnxruntime_optimizer
onnxruntime_providers
onnxruntime_util
${onnxruntime_tvm_libs}
onnxruntime_framework
onnxruntime_graph
onnxruntime_util
${ONNXRUNTIME_MLAS_LIBS}
onnxruntime_common
onnxruntime_flatbuffers

6
cmake/onnxruntime_framework.cmake
View file

@ -53,7 +53,7 @@ if (onnxruntime_ENABLE_TRAINING OR onnxruntime_ENABLE_TRAINING_OPS)
onnxruntime_add_include_to_target(onnxruntime_framework Python::Module)
target_include_directories(onnxruntime_framework PRIVATE ${PROJECT_SOURCE_DIR}/external/dlpack/include)
endif()
if (onnxruntime_USE_NCCL OR onnxruntime_USE_MPI)
if (onnxruntime_USE_NCCL OR onnxruntime_USE_MPI)
target_include_directories(onnxruntime_framework PUBLIC ${MPI_CXX_INCLUDE_DIRS})
endif()
endif()
@ -95,4 +95,8 @@ if (onnxruntime_DEBUG_NODE_INPUTS_OUTPUTS_ENABLE_DUMP_TO_SQLDB)
target_compile_definitions(onnxruntime_framework PRIVATE DEBUG_NODE_INPUTS_OUTPUTS_ENABLE_DUMP_TO_SQLDB)
endif()
if (WIN32)
target_compile_definitions(onnxruntime_framework PRIVATE _SCL_SECURE_NO_WARNINGS)
endif()
install(DIRECTORY ${PROJECT_SOURCE_DIR}/../include/onnxruntime/core/framework DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnxruntime/core)

6
cmake/onnxruntime_util.cmake
View file

@ -4,17 +4,12 @@
file(GLOB_RECURSE onnxruntime_util_srcs CONFIGURE_DEPENDS
"${ONNXRUNTIME_ROOT}/core/util/*.h"
"${ONNXRUNTIME_ROOT}/core/util/*.cc"
"${ONNXRUNTIME_ROOT}/core/profile/*.h"
"${ONNXRUNTIME_ROOT}/core/profile/*.cc"
)
source_group(TREE ${ONNXRUNTIME_ROOT}/core FILES ${onnxruntime_util_srcs})
onnxruntime_add_static_library(onnxruntime_util ${onnxruntime_util_srcs})
target_include_directories(onnxruntime_util PRIVATE ${ONNXRUNTIME_ROOT} PUBLIC ${eigen_INCLUDE_DIRS})
if (onnxruntime_USE_CUDA)
target_include_directories(onnxruntime_util PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
endif()
onnxruntime_add_include_to_target(onnxruntime_util onnxruntime_common onnxruntime_framework onnx onnx_proto ${PROTOBUF_LIB})
if(UNIX)
target_compile_options(onnxruntime_util PUBLIC "-Wno-error=comment")
@ -24,5 +19,4 @@ set_target_properties(onnxruntime_util PROPERTIES FOLDER "ONNXRuntime")
add_dependencies(onnxruntime_util ${onnxruntime_EXTERNAL_DEPENDENCIES})
if (WIN32)
target_compile_definitions(onnxruntime_util PRIVATE _SCL_SECURE_NO_WARNINGS)
target_compile_definitions(onnxruntime_framework PRIVATE _SCL_SECURE_NO_WARNINGS)
endif()

4
onnxruntime/contrib_ops/cpu/element_wise_ops.cc
View file

@ -1,7 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#include "element_wise_ops.h"
#include "contrib_ops/cpu/element_wise_ops.h"
#include "core/framework/math.h"
#include "core/providers/cpu/math/element_wise_ops.h"
namespace onnxruntime {

23
onnxruntime/core/framework/math.h Normal file
View file

@ -0,0 +1,23 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#pragma once
#include <gsl/gsl>
#include "core/framework/tensor.h"
#include "core/util/math_cpuonly.h"
namespace onnxruntime {
template <typename T>
auto EigenMap(Tensor& t) -> EigenVectorMap<T> {
return EigenVectorMap<T>(t.template MutableData<T>(), gsl::narrow<ptrdiff_t>(t.Shape().Size()));
}
template <typename T>
auto EigenMap(const Tensor& t) -> ConstEigenVectorMap<T> {
return ConstEigenVectorMap<T>(t.template Data<T>(), gsl::narrow<ptrdiff_t>(t.Shape().Size()));
}
} // namespace onnxruntime

4
onnxruntime/core/framework/orttraining_partial_executor.cc
View file

@ -22,7 +22,7 @@
#ifdef ENABLE_NVTX_PROFILE
// This header is for profile using Nvidia's visual profilier.
#include "core/providers/cuda/nvtx_profile.h"
#include "core/profile/context.h"
#include "core/providers/cuda/nvtx_profile_context.h"
#endif
// #define TRACE_EXECUTION
@ -292,7 +292,7 @@ Status PartialExecutor::Execute(const SessionState& session_state, const std::ve
}
}
#ifdef DEBUG_NODE_INPUTS_OUTPUTS
dump_context.program_counter = program_counter;
dump_context.program_counter = program_counter;
utils::DumpNodeInputs(dump_context, op_kernel_context, p_op_kernel->Node(), session_state);
#endif

4
onnxruntime/core/framework/sequential_executor.cc
View file

@ -21,8 +21,8 @@
#ifdef ENABLE_NVTX_PROFILE
// This header is for profile using Nvidia's visual profilier.
#include "core/providers/cuda/nvtx_profile.h"
#include "core/profile/context.h"
#include "core/providers/cuda/nvtx_profile.h"
#include "core/providers/cuda/nvtx_profile_context.h"
#endif
// #define TRACE_EXECUTION

4
onnxruntime/core/providers/cpu/math/element_wise_ops.cc
View file

@ -1,8 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#include "core/framework/data_types_internal.h"
#include "core/providers/cpu/math/element_wise_ops.h"
#include "core/framework/data_types_internal.h"
#include "core/framework/math.h"
#include "core/providers/cpu/tensor/utils.h"
#include "core/providers/op_kernel_type_control.h"
#include <unsupported/Eigen/SpecialFunctions>

2
onnxruntime/core/providers/cpu/math/sign.cc
View file

@ -8,10 +8,10 @@
#include "core/common/common.h"
#include "core/framework/data_types.h"
#include "core/framework/element_type_lists.h"
#include "core/framework/math.h"
#include "core/framework/op_kernel.h"
#include "core/providers/op_kernel_type_control.h"
#include "core/util/math.h"
#include "core/util/math_cpuonly.h"
using namespace ::onnxruntime::common;
using namespace ONNX_NAMESPACE;

5
onnxruntime/core/providers/cpu/math/softmax_shared.cc
View file

@ -18,9 +18,12 @@
* limitations under the License.
*/
#include "core/providers/cpu/math/softmax_shared.h"
#include <algorithm>
#include <cmath>
#include "core/providers/cpu/math/softmax_shared.h"
#include <gsl/gsl>
#include "core/util/math.h"
#include "core/util/math_cpuonly.h"
#include "core/mlas/inc/mlas.h"

2
onnxruntime/core/providers/cpu/nn/shrink.cc
View file

@ -4,9 +4,9 @@
#include "core/providers/cpu/nn/shrink.h"
#include "core/framework/element_type_lists.h"
#include "core/framework/math.h"
#include "core/framework/utils.h"
#include "core/providers/op_kernel_type_control.h"
#include "core/util/math_cpuonly.h"
#include "core/util/math.h"
namespace onnxruntime {

1
onnxruntime/core/providers/cpu/rnn/rnn_helpers.h
View file

@ -10,6 +10,7 @@
#include "core/common/common.h"
#include "core/common/logging/logging.h"
#include "core/framework/allocator.h"
#include "core/framework/tensor.h"
#include "core/util/math.h"
#include "core/util/math_cpuonly.h"
#include "core/util/qmath.h"

2
onnxruntime/core/providers/cpu/tensor/isinf.cc
View file

@ -5,10 +5,10 @@
#include "core/common/common.h"
#include "core/framework/data_types_internal.h"
#include "core/framework/math.h"
#include "core/framework/op_kernel.h"
#include "core/framework/tensor.h"
#include "core/providers/op_kernel_type_control.h"
#include "core/util/math_cpuonly.h"
namespace onnxruntime {
// https://github.com/onnx/onnx/blob/master/docs/Operators.md#IsInf

5
onnxruntime/core/providers/cpu/tensor/isnan.cc
View file

@ -1,9 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#include "isnan.h"
#include "core/util/math_cpuonly.h"
#include "core/providers/cpu/tensor/isnan.h"
#include "core/common/common.h"
#include "core/framework/math.h"
#include "core/framework/tensor.h"
#include "Eigen/src/Core/arch/Default/Half.h"

0
onnxruntime/core/profile/context.h → onnxruntime/core/providers/cuda/nvtx_profile_context.h
View file

2
onnxruntime/core/util/distance.h
View file

@ -3,7 +3,7 @@
#pragma once
#include <cmath>
#include "math_cpuonly.h"
#include "core/util/math_cpuonly.h"
namespace onnxruntime {

6
onnxruntime/core/util/math.h
View file

@ -16,9 +16,10 @@
#pragma once
#include <cassert>
#ifndef SHARED_PROVIDER
#include "core/common/common.h"
#include "core/framework/tensor.h"
#endif
#ifndef CBLAS_ENUM_DEFINED_H
@ -89,8 +90,7 @@ void RowwiseSum(int N, int D, const T* x, T* y,
// Sum of vector x, and writes the result to a single value y.
template <typename T, class Provider>
void Sum(int N, const T* x, T* y, Provider* provider,
Tensor* scratch_ptr = nullptr);
void Sum(int N, const T* x, T* y, Provider* provider);
template <typename T, class Provider>
void Scale(int N, float alpha, const T* x, T* y, Provider* provider);

14
onnxruntime/core/util/math_cpu.cc
View file

@ -15,9 +15,11 @@
*/
// Modifications Copyright (c) Microsoft.
#include <algorithm>
#include "core/util/math.h"
#include "core/util/math_cpuonly.h"
#include "core/util/math.h"
#include <algorithm>
#include <gsl/gsl>
#include "core/mlas/inc/mlas.h"
#if defined(__GNUC__)
#pragma GCC diagnostic push
@ -859,10 +861,10 @@ SPECIALIZED_ROWWISESUM(int64_t)
SPECIALIZED_ROWWISESUM(double)
#undef SPECIALIZED_ROWWISESUM
#define SPECIALIZED_SUM(T) \
template <> \
void Sum<T, CPUMathUtil>(int N, const T* x, T* y, CPUMathUtil* /* unused */, Tensor* /* unused */) { \
*y = ConstEigenVectorMap<T>(x, N).sum(); \
#define SPECIALIZED_SUM(T) \
template <> \
void Sum<T, CPUMathUtil>(int N, const T* x, T* y, CPUMathUtil* /* unused */) { \
*y = ConstEigenVectorMap<T>(x, N).sum(); \
}
SPECIALIZED_SUM(float);

12
onnxruntime/core/util/math_cpuonly.h
View file

@ -62,9 +62,6 @@
#pragma warning(pop)
#endif
#ifndef SHARED_PROVIDER
#include "core/framework/tensor.h"
#endif
namespace onnxruntime {
// common Eigen types that we will often use
@ -109,15 +106,6 @@ template <typename T>
using ConstEigenMatrixMapRowMajorOuterStride =
Eigen::Map<const Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>, 0, Eigen::OuterStride<>>;
template <typename T>
auto EigenMap(Tensor& t) -> EigenVectorMap<T> {
return EigenVectorMap<T>(t.template MutableData<T>(), gsl::narrow<ptrdiff_t>(t.Shape().Size()));
}
template <typename T>
auto EigenMap(const Tensor& t) -> ConstEigenVectorMap<T> {
return ConstEigenVectorMap<T>(t.template Data<T>(), gsl::narrow<ptrdiff_t>(t.Shape().Size()));
}
class CPUMathUtil {
public:
/*CPUMathUtil contains some help method like generate a

6
onnxruntime/core/util/thread_utils.cc
View file

@ -1,4 +1,8 @@
#include "thread_utils.h"
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#include "core/util/thread_utils.h"
#include <algorithm>
#ifdef _WIN32

3
onnxruntime/test/common/tensor_op_test_utils.h
View file

@ -6,11 +6,14 @@
#include <random>
#include <type_traits>
#include <gsl/gsl>
#include "gtest/gtest.h"
#include "core/common/common.h"
#include "core/common/optional.h"
#include "core/common/type_utils.h"
#include "core/framework/tensor.h"
#include "core/util/math.h"
namespace onnxruntime {

3
orttraining/orttraining/core/graph/gradient_builder_base.h
View file

@ -5,8 +5,9 @@
#include <vector>
#include <string>
#include "core/util/math.h"
#include "core/framework/float16.h"
#include "core/graph/graph.h"
#include "core/util/math.h"
#include "orttraining/core/graph/graph_augmenter.h"
#include "orttraining/core/graph/gradient_config.h"
#include "orttraining/core/graph/recompute_graph_utils.h"

2
orttraining/orttraining/core/session/training_session.cc
View file

@ -36,7 +36,7 @@
#ifdef ENABLE_NVTX_PROFILE
#include <set>
#include <thread>
#include "core/profile/context.h"
#include "core/providers/cuda/nvtx_profile_context.h"
#endif
namespace onnxruntime {

2
orttraining/orttraining/models/runner/training_runner.cc
View file

@ -13,7 +13,7 @@
#include "core/platform/env.h"
#include "core/platform/path_lib.h"
#ifdef ENABLE_NVTX_PROFILE
#include "core/profile/context.h"
#include "core/providers/cuda/nvtx_profile_context.h"
#endif
#include "core/session/environment.h"
#include "orttraining/core/framework/checkpointing.h"

2
orttraining/orttraining/training_ops/cpu/math/scale.cc
View file

@ -2,8 +2,8 @@
// Licensed under the MIT License.
#include "orttraining/training_ops/cpu/math/scale.h"
#include "core/framework/math.h"
#include "core/providers/common.h"
#include "core/util/math_cpuonly.h"
namespace onnxruntime {
namespace contrib {

2
orttraining/orttraining/training_ops/cpu/nn/dropout_7.cc
View file

@ -2,7 +2,7 @@
// Licensed under the MIT License.
#include "orttraining/training_ops/cpu/nn/dropout_7.h"
#include "core/util/math_cpuonly.h"
#include "core/framework/math.h"
namespace onnxruntime {

2
orttraining/orttraining/training_ops/cpu/op_gradients.cc
View file

@ -143,7 +143,7 @@ Status SoftmaxGrad<T>::Compute(OpKernelContext* context) const {
math::Exp<float, CPUMathUtil>(nd, Ydata, eYdata, nullptr);
for (size_t i = 0; i < N; ++i) {
float sdY;
math::Sum<float, CPUMathUtil>(d, dYdata + i * d, &sdY, nullptr, nullptr);
math::Sum<float, CPUMathUtil>(d, dYdata + i * d, &sdY, nullptr);
math::Axpy<float, CPUMathUtil>(d, -sdY, eYdata + i * d, dXdata + i * d, nullptr);
}
} else {

2
orttraining/orttraining/training_ops/cuda/communication/nccl_service.cc
View file

@ -5,7 +5,7 @@
#include "orttraining/training_ops/cuda/communication/nccl_service.h"
#include "core/common/common.h"
#include "core/profile/context.h"
#include "core/providers/cuda/nvtx_profile_context.h"
#include "core/providers/cuda/cuda_check_memory.h"
#include "core/providers/cuda/cuda_common.h"
#include "orttraining/core/framework/communication/mpi/mpi_context.h"

2
orttraining/orttraining/training_ops/cuda/communication/recv.cc
View file

@ -7,7 +7,7 @@
#include "orttraining/training_ops/communication_common.h"
#include "orttraining/training_ops/cuda/communication/nccl_service.h"
#include "core/providers/cuda/nvtx_profile.h"
#include "core/profile/context.h"
#include "core/providers/cuda/nvtx_profile_context.h"
#include "core/providers/cuda/cuda_check_memory.h"
#include "core/providers/cuda/cuda_common.h"
#include <mpi.h>

4
orttraining/orttraining/training_ops/cuda/communication/send.cc
View file

@ -6,8 +6,8 @@
#include "orttraining/training_ops/cuda/communication/send.h"
#include "orttraining/training_ops/communication_common.h"
#include "orttraining/training_ops/cuda/communication/nccl_service.h"
#include "core/providers/cuda/nvtx_profile.h"
#include "core/profile/context.h"
#include "core/providers/cuda/nvtx_profile.h"
#include "core/providers/cuda/nvtx_profile_context.h"
#include "core/providers/cuda/cuda_check_memory.h"
#include "core/providers/cuda/cuda_common.h"
#include <mpi.h>

4
orttraining/orttraining/training_ops/cuda/controlflow/record.cc
View file

@ -6,8 +6,8 @@
// Include event mechanism shared by CPU and GPU implementations.
#include "orttraining/training_ops/cpu/controlflow/event_pool.h"
#include "orttraining/training_ops/cpu/controlflow/record.h"
#include "core/providers/cuda/nvtx_profile.h"
#include "core/profile/context.h"
#include "core/providers/cuda/nvtx_profile.h"
#include "core/providers/cuda/nvtx_profile_context.h"
namespace onnxruntime {
namespace cuda {

4
orttraining/orttraining/training_ops/cuda/controlflow/wait.cc
View file

@ -6,8 +6,8 @@
// Include event mechanism shared by CPU and GPU implementations.
#include "orttraining/training_ops/cpu/controlflow/event_pool.h"
#include "orttraining/training_ops/cpu/controlflow/wait.h"
#include "core/providers/cuda/nvtx_profile.h"
#include "core/profile/context.h"
#include "core/providers/cuda/nvtx_profile.h"
#include "core/providers/cuda/nvtx_profile_context.h"
namespace onnxruntime {
namespace cuda {