From 892ac9f55add28d46845f5acca8b10394c6b3748 Mon Sep 17 00:00:00 2001 From: pengwa Date: Thu, 22 Jul 2021 23:50:19 +0800 Subject: [PATCH] code structure update (rename only) (#8410) --- cmake/onnxruntime_framework.cmake | 19 ++++++------------- .../provider_bridge_provider.cc | 2 +- .../core/session/provider_bridge_ort.cc | 2 +- .../python/onnxruntime_pybind_state.cc | 2 +- .../torch/custom_function_register.cc | 4 ++-- .../torch/custom_function_register.h | 2 +- .../orttraining/core/framework}/torch/gil.h | 0 .../core/framework}/torch/refcount_tracker.cc | 2 +- .../core/framework}/torch/refcount_tracker.h | 0 .../core/framework}/torch/torch_proxy.cc | 8 ++++---- .../core/framework}/torch/torch_proxy.h | 0 .../cpu/torch/torch_custom_function_kernel.cc | 4 ++-- .../cpu/torch/torch_custom_function_kernel.h | 2 +- .../torch_custom_function_kernel_base.cc | 4 ++-- .../torch/torch_custom_function_kernel_base.h | 2 +- .../torch/torch_custom_function_kernel.cc | 2 +- 16 files changed, 24 insertions(+), 31 deletions(-) rename {onnxruntime/core/language_interop_ops => orttraining/orttraining/core/framework}/torch/custom_function_register.cc (98%) rename {onnxruntime/core/language_interop_ops => orttraining/orttraining/core/framework}/torch/custom_function_register.h (98%) rename {onnxruntime/core/language_interop_ops => orttraining/orttraining/core/framework}/torch/gil.h (100%) rename {onnxruntime/core/language_interop_ops => orttraining/orttraining/core/framework}/torch/refcount_tracker.cc (97%) rename {onnxruntime/core/language_interop_ops => orttraining/orttraining/core/framework}/torch/refcount_tracker.h (100%) rename {onnxruntime/core/language_interop_ops => orttraining/orttraining/core/framework}/torch/torch_proxy.cc (98%) rename {onnxruntime/core/language_interop_ops => orttraining/orttraining/core/framework}/torch/torch_proxy.h (100%) diff --git a/cmake/onnxruntime_framework.cmake b/cmake/onnxruntime_framework.cmake index bafef176bf..416f2f1633 100644 --- a/cmake/onnxruntime_framework.cmake +++ b/cmake/onnxruntime_framework.cmake @@ -8,19 +8,12 @@ file(GLOB_RECURSE onnxruntime_framework_srcs CONFIGURE_DEPENDS ) if (onnxruntime_ENABLE_TRAINING_TORCH_INTEROP) - # todo: move those training related files into orttraining/core/framework/torch folder. - list(APPEND onnxruntime_framework_srcs - "${ORTTRAINING_SOURCE_DIR}/core/framework/torch/dlpack_python.cc" - "${ORTTRAINING_SOURCE_DIR}/core/framework/torch/dlpack_python.h" - "${ORTTRAINING_SOURCE_DIR}/core/framework/torch/python_common.h" - "${ONNXRUNTIME_ROOT}/core/language_interop_ops/torch/custom_function_register.cc" - "${ONNXRUNTIME_ROOT}/core/language_interop_ops/torch/custom_function_register.h" - "${ONNXRUNTIME_ROOT}/core/language_interop_ops/torch/gil.h" - "${ONNXRUNTIME_ROOT}/core/language_interop_ops/torch/refcount_tracker.cc" - "${ONNXRUNTIME_ROOT}/core/language_interop_ops/torch/refcount_tracker.h" - "${ONNXRUNTIME_ROOT}/core/language_interop_ops/torch/torch_proxy.cc" - "${ONNXRUNTIME_ROOT}/core/language_interop_ops/torch/torch_proxy.h" - ) +file(GLOB_RECURSE onnxruntime_training_framework_torch_srcs CONFIGURE_DEPENDS + "${ORTTRAINING_SOURCE_DIR}/core/framework/torch/*.h" + "${ORTTRAINING_SOURCE_DIR}/core/framework/torch/*.cc" +) + + list(APPEND onnxruntime_framework_srcs ${onnxruntime_training_framework_torch_srcs}) endif() if (onnxruntime_MINIMAL_BUILD) diff --git a/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc b/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc index 6e8e146964..f6c49a8314 100644 --- a/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc +++ b/onnxruntime/core/providers/shared_library/provider_bridge_provider.cc @@ -38,7 +38,7 @@ #ifdef ENABLE_TRAINING_TORCH_INTEROP #include "orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.h" -#include "core/language_interop_ops/torch/refcount_tracker.h" +#include "orttraining/core/framework/torch/refcount_tracker.h" #endif #endif diff --git a/onnxruntime/core/session/provider_bridge_ort.cc b/onnxruntime/core/session/provider_bridge_ort.cc index 40896343a0..d4bb319216 100644 --- a/onnxruntime/core/session/provider_bridge_ort.cc +++ b/onnxruntime/core/session/provider_bridge_ort.cc @@ -29,7 +29,7 @@ #ifdef ENABLE_TRAINING #ifdef ENABLE_TRAINING_TORCH_INTEROP #include "orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.h" -#include "core/language_interop_ops/torch/refcount_tracker.h" +#include "orttraining/core/framework/torch/refcount_tracker.h" #endif #endif diff --git a/onnxruntime/python/onnxruntime_pybind_state.cc b/onnxruntime/python/onnxruntime_pybind_state.cc index d95b4de352..d4b32bb21f 100644 --- a/onnxruntime/python/onnxruntime_pybind_state.cc +++ b/onnxruntime/python/onnxruntime_pybind_state.cc @@ -32,7 +32,7 @@ #include "orttraining/training_ops/cpu/aten_ops/aten_op_executor.h" #ifdef ENABLE_TRAINING_TORCH_INTEROP -#include "core/language_interop_ops/torch/custom_function_register.h" +#include "orttraining/core/framework/torch/custom_function_register.h" #endif #endif diff --git a/onnxruntime/core/language_interop_ops/torch/custom_function_register.cc b/orttraining/orttraining/core/framework/torch/custom_function_register.cc similarity index 98% rename from onnxruntime/core/language_interop_ops/torch/custom_function_register.cc rename to orttraining/orttraining/core/framework/torch/custom_function_register.cc index 72af6a2356..6681b32d66 100644 --- a/onnxruntime/core/language_interop_ops/torch/custom_function_register.cc +++ b/orttraining/orttraining/core/framework/torch/custom_function_register.cc @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -#include "core/language_interop_ops/torch/custom_function_register.h" +#include "orttraining/core/framework/torch/custom_function_register.h" #include "core/common/common.h" -#include "core/language_interop_ops/torch/refcount_tracker.h" +#include "orttraining/core/framework/torch/refcount_tracker.h" #include "core/platform/env.h" #include diff --git a/onnxruntime/core/language_interop_ops/torch/custom_function_register.h b/orttraining/orttraining/core/framework/torch/custom_function_register.h similarity index 98% rename from onnxruntime/core/language_interop_ops/torch/custom_function_register.h rename to orttraining/orttraining/core/framework/torch/custom_function_register.h index 107b312bc9..48164548c9 100644 --- a/onnxruntime/core/language_interop_ops/torch/custom_function_register.h +++ b/orttraining/orttraining/core/framework/torch/custom_function_register.h @@ -4,7 +4,7 @@ #pragma once #include "orttraining/core/framework/torch/python_common.h" -#include "core/language_interop_ops/torch/torch_proxy.h" +#include "orttraining/core/framework/torch/torch_proxy.h" #include #include #include diff --git a/onnxruntime/core/language_interop_ops/torch/gil.h b/orttraining/orttraining/core/framework/torch/gil.h similarity index 100% rename from onnxruntime/core/language_interop_ops/torch/gil.h rename to orttraining/orttraining/core/framework/torch/gil.h diff --git a/onnxruntime/core/language_interop_ops/torch/refcount_tracker.cc b/orttraining/orttraining/core/framework/torch/refcount_tracker.cc similarity index 97% rename from onnxruntime/core/language_interop_ops/torch/refcount_tracker.cc rename to orttraining/orttraining/core/framework/torch/refcount_tracker.cc index 3c30881f3a..9feea6bdf0 100644 --- a/onnxruntime/core/language_interop_ops/torch/refcount_tracker.cc +++ b/orttraining/orttraining/core/framework/torch/refcount_tracker.cc @@ -5,7 +5,7 @@ #include #include "core/common/logging/logging.h" -#include "core/language_interop_ops/torch/refcount_tracker.h" +#include "orttraining/core/framework/torch/refcount_tracker.h" #include "core/platform/env.h" namespace onnxruntime { diff --git a/onnxruntime/core/language_interop_ops/torch/refcount_tracker.h b/orttraining/orttraining/core/framework/torch/refcount_tracker.h similarity index 100% rename from onnxruntime/core/language_interop_ops/torch/refcount_tracker.h rename to orttraining/orttraining/core/framework/torch/refcount_tracker.h diff --git a/onnxruntime/core/language_interop_ops/torch/torch_proxy.cc b/orttraining/orttraining/core/framework/torch/torch_proxy.cc similarity index 98% rename from onnxruntime/core/language_interop_ops/torch/torch_proxy.cc rename to orttraining/orttraining/core/framework/torch/torch_proxy.cc index f5c59e71b1..ad72227a02 100644 --- a/onnxruntime/core/language_interop_ops/torch/torch_proxy.cc +++ b/orttraining/orttraining/core/framework/torch/torch_proxy.cc @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -#include "core/language_interop_ops/torch/torch_proxy.h" +#include "orttraining/core/framework/torch/torch_proxy.h" #include "orttraining/core/framework/torch/python_common.h" #include "orttraining/core/framework/torch/dlpack_python.h" #include "core/framework/tensorprotoutils.h" -#include "core/language_interop_ops/torch/custom_function_register.h" -#include "core/language_interop_ops/torch/refcount_tracker.h" -#include "core/language_interop_ops/torch/gil.h" +#include "orttraining/core/framework/torch/custom_function_register.h" +#include "orttraining/core/framework/torch/refcount_tracker.h" +#include "orttraining/core/framework/torch/gil.h" #include "core/platform/env.h" namespace onnxruntime { diff --git a/onnxruntime/core/language_interop_ops/torch/torch_proxy.h b/orttraining/orttraining/core/framework/torch/torch_proxy.h similarity index 100% rename from onnxruntime/core/language_interop_ops/torch/torch_proxy.h rename to orttraining/orttraining/core/framework/torch/torch_proxy.h diff --git a/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel.cc b/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel.cc index b093c22e96..97606ce4f9 100644 --- a/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel.cc +++ b/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel.cc @@ -3,8 +3,8 @@ #ifdef ENABLE_TRAINING_TORCH_INTEROP #include "orttraining/training_ops/cpu/torch/torch_custom_function_kernel.h" -#include "core/language_interop_ops/torch/custom_function_register.h" -#include "core/language_interop_ops/torch/refcount_tracker.h" +#include "orttraining/core/framework/torch/custom_function_register.h" +#include "orttraining/core/framework/torch/refcount_tracker.h" using namespace onnxruntime::language_interop_ops::torch; diff --git a/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel.h b/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel.h index c24bdf6c20..f58cd3ecba 100644 --- a/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel.h +++ b/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel.h @@ -9,7 +9,7 @@ #endif #ifdef ENABLE_TRAINING_TORCH_INTEROP -#include "core/language_interop_ops/torch/custom_function_register.h" +#include "orttraining/core/framework/torch/custom_function_register.h" #include "orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.h" namespace onnxruntime { diff --git a/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.cc b/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.cc index cf38d1fcb5..93eded4ca3 100644 --- a/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.cc +++ b/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.cc @@ -6,8 +6,8 @@ #ifndef SHARED_PROVIDER #include "core/framework/op_kernel_context_internal.h" #endif -#include "core/language_interop_ops/torch/custom_function_register.h" -#include "core/language_interop_ops/torch/torch_proxy.h" +#include "orttraining/core/framework/torch/custom_function_register.h" +#include "orttraining/core/framework/torch/torch_proxy.h" #include "orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.h" using namespace onnxruntime::language_interop_ops::torch; diff --git a/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.h b/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.h index b9e2d18deb..bee2ecfd76 100644 --- a/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.h +++ b/orttraining/orttraining/training_ops/cpu/torch/torch_custom_function_kernel_base.h @@ -13,7 +13,7 @@ #include "core/framework/op_kernel.h" #endif -#include "core/language_interop_ops/torch/torch_proxy.h" +#include "orttraining/core/framework/torch/torch_proxy.h" namespace onnxruntime { namespace contrib { diff --git a/orttraining/orttraining/training_ops/cuda/torch/torch_custom_function_kernel.cc b/orttraining/orttraining/training_ops/cuda/torch/torch_custom_function_kernel.cc index e49b62ef6e..79b71c9acc 100644 --- a/orttraining/orttraining/training_ops/cuda/torch/torch_custom_function_kernel.cc +++ b/orttraining/orttraining/training_ops/cuda/torch/torch_custom_function_kernel.cc @@ -4,7 +4,7 @@ #ifdef ENABLE_TRAINING_TORCH_INTEROP #include "core/providers/shared_library/provider_api.h" -#include "core/language_interop_ops/torch/refcount_tracker.h" +#include "orttraining/core/framework/torch/refcount_tracker.h" #include "orttraining/training_ops/cuda/torch/torch_custom_function_kernel.h" #include "core/framework/ml_value.h"