From f4a04c04e116ec976265b83a07dc95f467393caa Mon Sep 17 00:00:00 2001 From: Weixing Zhang Date: Fri, 24 Apr 2020 00:12:02 -0700 Subject: [PATCH] move cpu/cuda related files to coresponding cpu/cuda folder (#3668) Co-authored-by: Weixing Zhang --- cmake/onnxruntime_providers.cmake | 10 ---------- .../contrib_ops/{ => cpu}/cpu_contrib_kernels.cc | 2 +- .../contrib_ops/{ => cpu}/cpu_contrib_kernels.h | 0 .../contrib_ops/{ => cuda}/cuda_contrib_kernels.cc | 0 .../contrib_ops/{ => cuda}/cuda_contrib_kernels.h | 0 .../core/providers/acl/acl_execution_provider.cc | 2 +- .../core/providers/cpu/cpu_execution_provider.cc | 6 +++--- .../core/providers/cuda/cuda_execution_provider.cc | 4 ++-- onnxruntime/featurizers_ops/cpu_featurizers_kernels.cc | 2 +- .../training_ops/{ => cpu}/cpu_training_kernels.cc | 2 +- .../training_ops/{ => cpu}/cpu_training_kernels.h | 0 .../training_ops/{ => cuda}/cuda_training_kernels.cc | 0 .../training_ops/{ => cuda}/cuda_training_kernels.h | 0 13 files changed, 9 insertions(+), 19 deletions(-) rename onnxruntime/contrib_ops/{ => cpu}/cpu_contrib_kernels.cc (99%) rename onnxruntime/contrib_ops/{ => cpu}/cpu_contrib_kernels.h (100%) rename onnxruntime/contrib_ops/{ => cuda}/cuda_contrib_kernels.cc (100%) rename onnxruntime/contrib_ops/{ => cuda}/cuda_contrib_kernels.h (100%) rename orttraining/orttraining/training_ops/{ => cpu}/cpu_training_kernels.cc (99%) rename orttraining/orttraining/training_ops/{ => cpu}/cpu_training_kernels.h (100%) rename orttraining/orttraining/training_ops/{ => cuda}/cuda_training_kernels.cc (100%) rename orttraining/orttraining/training_ops/{ => cuda}/cuda_training_kernels.h (100%) diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake index 78ffc8109f..800a302e6f 100644 --- a/cmake/onnxruntime_providers.cmake +++ b/cmake/onnxruntime_providers.cmake @@ -7,15 +7,11 @@ file(GLOB_RECURSE onnxruntime_providers_srcs CONFIGURE_DEPENDS ) file(GLOB_RECURSE onnxruntime_cpu_contrib_ops_srcs CONFIGURE_DEPENDS - "${ONNXRUNTIME_ROOT}/contrib_ops/cpu_contrib_kernels.h" - "${ONNXRUNTIME_ROOT}/contrib_ops/cpu_contrib_kernels.cc" "${ONNXRUNTIME_ROOT}/contrib_ops/cpu/*.h" "${ONNXRUNTIME_ROOT}/contrib_ops/cpu/*.cc" ) file(GLOB_RECURSE onnxruntime_cuda_contrib_ops_cc_srcs CONFIGURE_DEPENDS - "${ONNXRUNTIME_ROOT}/contrib_ops/cuda_contrib_kernels.h" - "${ONNXRUNTIME_ROOT}/contrib_ops/cuda_contrib_kernels.cc" "${ONNXRUNTIME_ROOT}/contrib_ops/cuda/*.h" "${ONNXRUNTIME_ROOT}/contrib_ops/cuda/*.cc" ) @@ -26,8 +22,6 @@ file(GLOB_RECURSE onnxruntime_cuda_contrib_ops_cu_srcs CONFIGURE_DEPENDS ) file(GLOB onnxruntime_cpu_featurizers_cc_srcs CONFIGURE_DEPENDS - "${ONNXRUNTIME_ROOT}/featurizers_ops/cpu_featurizers_kernels.h" - "${ONNXRUNTIME_ROOT}/featurizers_ops/cpu_featurizers_kernels.cc" "${ONNXRUNTIME_ROOT}/featurizers_ops/cpu/*.h" "${ONNXRUNTIME_ROOT}/featurizers_ops/cpu/*.cc" ) @@ -95,8 +89,6 @@ endif() if (onnxruntime_ENABLE_TRAINING) file(GLOB_RECURSE onnxruntime_cpu_training_ops_srcs CONFIGURE_DEPENDS - "${ORTTRAINING_SOURCE_DIR}/training_ops/cpu_training_kernels.h" - "${ORTTRAINING_SOURCE_DIR}/training_ops/cpu_training_kernels.cc" "${ORTTRAINING_SOURCE_DIR}/training_ops/cpu/*.h" "${ORTTRAINING_SOURCE_DIR}/training_ops/cpu/*.cc" ) @@ -174,8 +166,6 @@ if (onnxruntime_USE_CUDA) if (onnxruntime_ENABLE_TRAINING) file(GLOB_RECURSE onnxruntime_cuda_training_ops_cc_srcs CONFIGURE_DEPENDS - "${ORTTRAINING_SOURCE_DIR}/training_ops/cuda_training_kernels.h" - "${ORTTRAINING_SOURCE_DIR}/training_ops/cuda_training_kernels.cc" "${ORTTRAINING_SOURCE_DIR}/training_ops/cuda/*.h" "${ORTTRAINING_SOURCE_DIR}/training_ops/cuda/*.cc" ) diff --git a/onnxruntime/contrib_ops/cpu_contrib_kernels.cc b/onnxruntime/contrib_ops/cpu/cpu_contrib_kernels.cc similarity index 99% rename from onnxruntime/contrib_ops/cpu_contrib_kernels.cc rename to onnxruntime/contrib_ops/cpu/cpu_contrib_kernels.cc index e9c9d9f873..444904aa2c 100644 --- a/onnxruntime/contrib_ops/cpu_contrib_kernels.cc +++ b/onnxruntime/contrib_ops/cpu/cpu_contrib_kernels.cc @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -#include "contrib_ops/cpu_contrib_kernels.h" +#include "contrib_ops/cpu/cpu_contrib_kernels.h" #include "core/graph/constants.h" #include "core/mlas/inc/mlas.h" diff --git a/onnxruntime/contrib_ops/cpu_contrib_kernels.h b/onnxruntime/contrib_ops/cpu/cpu_contrib_kernels.h similarity index 100% rename from onnxruntime/contrib_ops/cpu_contrib_kernels.h rename to onnxruntime/contrib_ops/cpu/cpu_contrib_kernels.h diff --git a/onnxruntime/contrib_ops/cuda_contrib_kernels.cc b/onnxruntime/contrib_ops/cuda/cuda_contrib_kernels.cc similarity index 100% rename from onnxruntime/contrib_ops/cuda_contrib_kernels.cc rename to onnxruntime/contrib_ops/cuda/cuda_contrib_kernels.cc diff --git a/onnxruntime/contrib_ops/cuda_contrib_kernels.h b/onnxruntime/contrib_ops/cuda/cuda_contrib_kernels.h similarity index 100% rename from onnxruntime/contrib_ops/cuda_contrib_kernels.h rename to onnxruntime/contrib_ops/cuda/cuda_contrib_kernels.h diff --git a/onnxruntime/core/providers/acl/acl_execution_provider.cc b/onnxruntime/core/providers/acl/acl_execution_provider.cc index 8319121abf..56ff6a759c 100644 --- a/onnxruntime/core/providers/acl/acl_execution_provider.cc +++ b/onnxruntime/core/providers/acl/acl_execution_provider.cc @@ -7,7 +7,7 @@ #include "core/framework/op_kernel.h" #include "core/framework/kernel_registry.h" #include "core/framework/compute_capability.h" -#include "contrib_ops/cpu_contrib_kernels.h" +#include "contrib_ops/cpu/cpu_contrib_kernels.h" #include "acl_fwd.h" namespace onnxruntime { diff --git a/onnxruntime/core/providers/cpu/cpu_execution_provider.cc b/onnxruntime/core/providers/cpu/cpu_execution_provider.cc index 21c6b9caea..4e71b86f28 100644 --- a/onnxruntime/core/providers/cpu/cpu_execution_provider.cc +++ b/onnxruntime/core/providers/cpu/cpu_execution_provider.cc @@ -6,15 +6,15 @@ #include "core/framework/kernel_registry.h" #ifndef DISABLE_CONTRIB_OPS -#include "contrib_ops/cpu_contrib_kernels.h" +#include "contrib_ops/cpu/cpu_contrib_kernels.h" #endif #ifdef ML_FEATURIZERS -#include "featurizers_ops/cpu_featurizers_kernels.h" +#include "featurizers_ops/cpu/cpu_featurizers_kernels.h" #endif #ifdef ENABLE_TRAINING -#include "orttraining/training_ops/cpu_training_kernels.h" +#include "orttraining/training_ops/cpu/cpu_training_kernels.h" #endif #include "core/framework/compute_capability.h" diff --git a/onnxruntime/core/providers/cuda/cuda_execution_provider.cc b/onnxruntime/core/providers/cuda/cuda_execution_provider.cc index 88c101d429..f859af5b76 100644 --- a/onnxruntime/core/providers/cuda/cuda_execution_provider.cc +++ b/onnxruntime/core/providers/cuda/cuda_execution_provider.cc @@ -12,11 +12,11 @@ #include "core/providers/cuda/gpu_data_transfer.h" #ifndef DISABLE_CONTRIB_OPS -#include "contrib_ops/cuda_contrib_kernels.h" +#include "contrib_ops/cuda/cuda_contrib_kernels.h" #endif #ifdef ENABLE_TRAINING -#include "orttraining/training_ops/cuda_training_kernels.h" +#include "orttraining/training_ops/cuda/cuda_training_kernels.h" #endif using namespace onnxruntime::common; diff --git a/onnxruntime/featurizers_ops/cpu_featurizers_kernels.cc b/onnxruntime/featurizers_ops/cpu_featurizers_kernels.cc index dc247259af..6783a11807 100644 --- a/onnxruntime/featurizers_ops/cpu_featurizers_kernels.cc +++ b/onnxruntime/featurizers_ops/cpu_featurizers_kernels.cc @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -#include "featurizers_ops/cpu_featurizers_kernels.h" +#include "featurizers_ops/cpu/cpu_featurizers_kernels.h" #include "core/graph/constants.h" #include "core/framework/data_types.h" diff --git a/orttraining/orttraining/training_ops/cpu_training_kernels.cc b/orttraining/orttraining/training_ops/cpu/cpu_training_kernels.cc similarity index 99% rename from orttraining/orttraining/training_ops/cpu_training_kernels.cc rename to orttraining/orttraining/training_ops/cpu/cpu_training_kernels.cc index edde3947dc..2ede93e25c 100644 --- a/orttraining/orttraining/training_ops/cpu_training_kernels.cc +++ b/orttraining/orttraining/training_ops/cpu/cpu_training_kernels.cc @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -#include "orttraining/training_ops/cpu_training_kernels.h" +#include "orttraining/training_ops/cpu/cpu_training_kernels.h" #include "core/graph/constants.h" namespace onnxruntime { diff --git a/orttraining/orttraining/training_ops/cpu_training_kernels.h b/orttraining/orttraining/training_ops/cpu/cpu_training_kernels.h similarity index 100% rename from orttraining/orttraining/training_ops/cpu_training_kernels.h rename to orttraining/orttraining/training_ops/cpu/cpu_training_kernels.h diff --git a/orttraining/orttraining/training_ops/cuda_training_kernels.cc b/orttraining/orttraining/training_ops/cuda/cuda_training_kernels.cc similarity index 100% rename from orttraining/orttraining/training_ops/cuda_training_kernels.cc rename to orttraining/orttraining/training_ops/cuda/cuda_training_kernels.cc diff --git a/orttraining/orttraining/training_ops/cuda_training_kernels.h b/orttraining/orttraining/training_ops/cuda/cuda_training_kernels.h similarity index 100% rename from orttraining/orttraining/training_ops/cuda_training_kernels.h rename to orttraining/orttraining/training_ops/cuda/cuda_training_kernels.h