updated cuda

RainChao · Mar 1, 2020 · 6fddc21 · 6fddc21
1 parent 605b51e
commit 6fddc21
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 1,020 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -472,24 +472,24 @@ if(${TF_ENABLE_CUDA})
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_UTEST_DIR}/cuda)
 
-add_executable(cuda-basics ${TF_UTEST_DIR}/cuda/basics.cu)
+add_executable(cuda_basics ${TF_UTEST_DIR}/cuda/cuda_basics.cu)
 target_link_libraries(
-  cuda-basics ${PROJECT_NAME} Threads::Threads tf::default_settings
-)
-target_include_directories(cuda-basics PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
-add_test(cuda-basics.builder ${TF_UTEST_DIR}/cuda/cuda-basics -tc=Builder)
-add_test(cuda-basics.set.i8  ${TF_UTEST_DIR}/cuda/cuda-basics -tc=Set.i8)
-add_test(cuda-basics.set.i16 ${TF_UTEST_DIR}/cuda/cuda-basics -tc=Set.i16)
-add_test(cuda-basics.set.i32 ${TF_UTEST_DIR}/cuda/cuda-basics -tc=Set.i32)
-add_test(cuda-basics.bset.i8  ${TF_UTEST_DIR}/cuda/cuda-basics -tc=BSet.i8)
-add_test(cuda-basics.bset.i16 ${TF_UTEST_DIR}/cuda/cuda-basics -tc=BSet.i16)
-add_test(cuda-basics.bset.i32 ${TF_UTEST_DIR}/cuda/cuda-basics -tc=BSet.i32)
-add_test(cuda-basics.add.i8  ${TF_UTEST_DIR}/cuda/cuda-basics -tc=Add.i8)
-add_test(cuda-basics.add.i16 ${TF_UTEST_DIR}/cuda/cuda-basics -tc=Add.i16)
-add_test(cuda-basics.add.i32 ${TF_UTEST_DIR}/cuda/cuda-basics -tc=Add.i32)
-add_test(cuda-basics.barrier.i8 ${TF_UTEST_DIR}/cuda/cuda-basics -tc=Barrier.i8)
-add_test(cuda-basics.barrier.i16 ${TF_UTEST_DIR}/cuda/cuda-basics -tc=Barrier.i16)
-add_test(cuda-basics.barrier.i32 ${TF_UTEST_DIR}/cuda/cuda-basics -tc=Barrier.i32)
+  cuda_basics ${PROJECT_NAME} Threads::Threads tf::default_settings
+)
+target_include_directories(cuda_basics PRIVATE ${TF_3RD_PARTY_DIR}/doctest)
+add_test(cuda_basics.builder ${TF_UTEST_DIR}/cuda/cuda_basics -tc=Builder)
+add_test(cuda_basics.set.i8  ${TF_UTEST_DIR}/cuda/cuda_basics -tc=Set.i8)
+add_test(cuda_basics.set.i16 ${TF_UTEST_DIR}/cuda/cuda_basics -tc=Set.i16)
+add_test(cuda_basics.set.i32 ${TF_UTEST_DIR}/cuda/cuda_basics -tc=Set.i32)
+add_test(cuda_basics.bset.i8  ${TF_UTEST_DIR}/cuda/cuda_basics -tc=BSet.i8)
+add_test(cuda_basics.bset.i16 ${TF_UTEST_DIR}/cuda/cuda_basics -tc=BSet.i16)
+add_test(cuda_basics.bset.i32 ${TF_UTEST_DIR}/cuda/cuda_basics -tc=BSet.i32)
+add_test(cuda_basics.add.i8  ${TF_UTEST_DIR}/cuda/cuda_basics -tc=Add.i8)
+add_test(cuda_basics.add.i16 ${TF_UTEST_DIR}/cuda/cuda_basics -tc=Add.i16)
+add_test(cuda_basics.add.i32 ${TF_UTEST_DIR}/cuda/cuda_basics -tc=Add.i32)
+add_test(cuda_basics.barrier.i8 ${TF_UTEST_DIR}/cuda/cuda_basics -tc=Barrier.i8)
+add_test(cuda_basics.barrier.i16 ${TF_UTEST_DIR}/cuda/cuda_basics -tc=Barrier.i16)
+add_test(cuda_basics.barrier.i32 ${TF_UTEST_DIR}/cuda/cuda_basics -tc=Barrier.i32)
 
 endif(${TF_ENABLE_CUDA})
 

diff --git a/taskflow/core/graph.hpp b/taskflow/core/graph.hpp
@@ -9,7 +9,7 @@
 
 #if defined(__CUDA__) || defined(__CUDACC__)
 #define TF_ENABLE_CUDA
-#include "../cuda/flow_builder.hpp"
+#include "../cuda/cuda_flow_builder.hpp"
 #endif
 
 namespace tf {

diff --git a/taskflow/core/taskflow.hpp b/taskflow/core/taskflow.hpp
@@ -206,7 +206,7 @@ inline void Taskflow::_dump(
 
 #ifdef TF_ENABLE_CUDA
     case Node::CUDAFLOW_WORK:
-      os << "shape=folder fillcolor=gray style=filled";
+      os << "shape=folder fillcolor=cyan style=filled";
     break;
 #endif
 

diff --git a/taskflow/cuda/device.hpp b/taskflow/cuda/device.hpp
diff --git a/taskflow/cuda/error.hpp b/taskflow/cuda/error.hpp
diff --git a/taskflow/cuda/flow_builder.hpp b/taskflow/cuda/flow_builder.hpp