code structure update (rename only) (#8410)

This commit is contained in:
pengwa 2021-07-22 23:50:19 +08:00 committed by GitHub
parent 4275055868
commit 892ac9f55a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 24 additions and 31 deletions

View file

@ -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)

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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 <cstdio>

View file

@ -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 <mutex>
#include <unordered_map>
#include <vector>

View file

@ -5,7 +5,7 @@
#include <iostream>
#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 {

View file

@ -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 {

View file

@ -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;

View file

@ -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 {

View file

@ -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;

View file

@ -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 {

View file

@ -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"