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

move cpu/cuda related files to coresponding cpu/cuda folder (#3668)

Browse source 
Co-authored-by: Weixing Zhang <wezhan@microsoft.com>
This commit is contained in:
Weixing Zhang 2020-04-24 00:12:02 -07:00 committed by GitHub
parent 336624806e
commit f4a04c04e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmake/onnxruntime_providers.cmake
View file

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

2
onnxruntime/contrib_ops/cpu_contrib_kernels.cc → onnxruntime/contrib_ops/cpu/cpu_contrib_kernels.cc
View file

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

0
onnxruntime/contrib_ops/cpu_contrib_kernels.h → onnxruntime/contrib_ops/cpu/cpu_contrib_kernels.h
View file

0
onnxruntime/contrib_ops/cuda_contrib_kernels.cc → onnxruntime/contrib_ops/cuda/cuda_contrib_kernels.cc
View file

0
onnxruntime/contrib_ops/cuda_contrib_kernels.h → onnxruntime/contrib_ops/cuda/cuda_contrib_kernels.h
View file

2
onnxruntime/core/providers/acl/acl_execution_provider.cc
View file

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

6
onnxruntime/core/providers/cpu/cpu_execution_provider.cc
View file

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

4
onnxruntime/core/providers/cuda/cuda_execution_provider.cc
View file

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

2
onnxruntime/featurizers_ops/cpu_featurizers_kernels.cc
View file

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

2
orttraining/orttraining/training_ops/cpu_training_kernels.cc → orttraining/orttraining/training_ops/cpu/cpu_training_kernels.cc
View file

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

0
orttraining/orttraining/training_ops/cpu_training_kernels.h → orttraining/orttraining/training_ops/cpu/cpu_training_kernels.h
View file

0
orttraining/orttraining/training_ops/cuda_training_kernels.cc → orttraining/orttraining/training_ops/cuda/cuda_training_kernels.cc
View file

0
orttraining/orttraining/training_ops/cuda_training_kernels.h → orttraining/orttraining/training_ops/cuda/cuda_training_kernels.h
View file