refactor cuda ops, remove contrib folder (microsoft#707)

Co-authored-by: Lei Cao <[email protected]@onnxruntime-a10.bxgbzpva45kedp3rhbsbit4phb.jx.internal.cloudapp.net>
xadupre · May 3, 2024 · dfdf52e · dfdf52e
1 parent 8645a84
commit dfdf52e
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -363,12 +363,10 @@ if(OCOS_ENABLE_MATH)
   list(APPEND TARGET_SRC ${TARGET_SRC_MATH} ${TARGET_SRC_DLIB} ${TARGET_SRC_INVERSE})
 endif()
 
-file(GLOB TARGET_SRC_CONTRIB "operators/contrib/*.cc" "operators/contrib/*.h*")
 if (OCOS_USE_CUDA)
-  file(GLOB TARGET_SRC_CONTRIB_CUDA "operators/contrib/cuda/*.*")
-  list(APPEND TARGET_SRC_CONTRIB ${TARGET_SRC_CONTRIB_CUDA})
+  file(GLOB_RECURSE TARGET_SRC_CUDA "operators/cuda/*.*")
+  list(APPEND TARGET_SRC ${TARGET_SRC_CUDA})
 endif()
-list(APPEND TARGET_SRC ${TARGET_SRC_CONTRIB})
 
 # enable the opencv dependency if we have ops that require it
 if(OCOS_ENABLE_CV2 OR OCOS_ENABLE_VISION)

diff --git a/operators/contrib/contrib.cc → operators/cuda/cuda_ops.cc b/operators/contrib/contrib.cc → operators/cuda/cuda_ops.cc
diff --git a/operators/contrib/cuda/cuda_type.h → operators/cuda/cuda_type.h b/operators/contrib/cuda/cuda_type.h → operators/cuda/cuda_type.h
diff --git a/operators/contrib/cuda/device_prop.cuh → operators/cuda/device_prop.cuh b/operators/contrib/cuda/device_prop.cuh → operators/cuda/device_prop.cuh
diff --git a/operators/contrib/cuda/fast_gelu.h → operators/cuda/fast_gelu.h b/operators/contrib/cuda/fast_gelu.h → operators/cuda/fast_gelu.h
diff --git a/operators/contrib/cuda/fast_gelu_impl.cu → operators/cuda/fast_gelu_impl.cu b/operators/contrib/cuda/fast_gelu_impl.cu → operators/cuda/fast_gelu_impl.cu
diff --git a/operators/contrib/cuda/fast_gelu_impl.cuh → operators/cuda/fast_gelu_impl.cuh b/operators/contrib/cuda/fast_gelu_impl.cuh → operators/cuda/fast_gelu_impl.cuh
diff --git a/operators/contrib/cuda/utils.cuh → operators/cuda/utils.cuh b/operators/contrib/cuda/utils.cuh → operators/cuda/utils.cuh
diff --git a/test/static_test/test_cuda_eager.cc b/test/static_test/test_cuda_eager.cc
@@ -9,7 +9,7 @@
 
 #ifdef USE_CUDA
 #include "math/cuda/negpos_def.h"
-#include "contrib/cuda/fast_gelu.h"
+#include "cuda/fast_gelu.h"
 #include <cuda.h>
 #include <cuda_runtime.h>