# HG changeset patch # User Shinji KONO # Date 1486870511 -32400 # Node ID 609bf62768b9c42f96cabdfa5aec021409254d48 # Parent 8bbc0012e1a4b5419487dee03a3a636b51cc36ef add -DUSE_CUDA=1 flag to cmake diff -r 8bbc0012e1a4 -r 609bf62768b9 src/parallel_execution/CMakeLists.txt --- a/src/parallel_execution/CMakeLists.txt Sun Feb 12 09:12:21 2017 +0900 +++ b/src/parallel_execution/CMakeLists.txt Sun Feb 12 12:35:11 2017 +0900 @@ -1,11 +1,19 @@ cmake_minimum_required(VERSION 2.8) +set(USE_CUDA,0) + # -DUSE_CUDA # add_definitions("-Wall -g -O") add_definitions("-Wall -g") set(CMAKE_C_COMPILER $ENV{CBC_COMPILER}) - + +if (${USE_CUDA}) + set(NVCCFLAG "-std=c++11" "-g" "-O0" ) + set(CUDA_LINK_FLAGS "-framework CUDA -lc++ -Wl,-search_paths_first -Wl,-headerpad_max_install_names /Developer/NVIDIA/CUDA-8.0/lib/libcudart_static.a -Wl,-rpath,/usr/local/cuda/lib") + find_package(CUDA REQUIRED) +endif() + macro( GearsCommand ) set( _OPTIONS_ARGS ) set( _ONE_VALUE_ARGS TARGET ) @@ -21,6 +29,13 @@ DEPENDS ${i} COMMAND "perl" "generate_stub.pl" "-o" ${j} ${i} ) + elseif (${i} MATCHES "\\.cu") + string(REGEX REPLACE "(.*).cbc" "c/\\1.ptx" j ${i}) + add_custom_command ( + OUTPUT ${j} + DEPENDS ${i} + COMMAND nvcc ${NVCCFLAG} -c -ptx -o ${j} ${i} + ) else() set(j ${i}) endif() @@ -43,6 +58,15 @@ main.cbc RedBlackTree.cbc compare.c SingleLinkedStack.cbc CPUWorker.cbc time.cbc twice.cbc TaskManagerImpl.cbc SingleLinkedQueue.cbc SynchronizedQueue.cbc SemaphoreImpl.cbc ) +if (${USE_CUDA}) + GearsCommand( + TARGET + GPUtwice + SOURCES + main.cbc RedBlackTree.cbc compare.c SingleLinkedStack.cbc CPUWorker.cbc time.cbc twice.cbc TaskManagerImpl.cbc SingleLinkedQueue.cbc SynchronizedQueue.cbc SemaphoreImpl.cbc GPUWorker.cbc GPUtwice.cu + ) +endif() + GearsCommand( TARGET queue_test diff -r 8bbc0012e1a4 -r 609bf62768b9 src/parallel_execution/GPUtwice.cu --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/parallel_execution/GPUtwice.cu Sun Feb 12 12:35:11 2017 +0900 @@ -0,0 +1,8 @@ +extern "C" { + __global__ void multiply(float* A, float* B, float* C) { +// printf("%d %d\n",i[0],i[1]); + int index = blockIdx.x * blockDim.x + threadIdx.x; + C[index] = A[index] * B[0]; + } + +} diff -r 8bbc0012e1a4 -r 609bf62768b9 src/test/helper_cuda.h --- a/src/test/helper_cuda.h Sun Feb 12 09:12:21 2017 +0900 +++ b/src/test/helper_cuda.h Sun Feb 12 12:35:11 2017 +0900 @@ -292,7 +292,7 @@ #ifdef __cuda_cuda_h__ // CUDA Driver API errors -static const char *_cudaGetErrorEnum(CUresult error) +const char *_cudaGetErrorEnum(CUresult error) { switch (error) { diff -r 8bbc0012e1a4 -r 609bf62768b9 src/test/multiply.cu --- a/src/test/multiply.cu Sun Feb 12 09:12:21 2017 +0900 +++ b/src/test/multiply.cu Sun Feb 12 12:35:11 2017 +0900 @@ -1,5 +1,5 @@ extern "C" { - __global__ void multiply(float* A, float* B, float* C,int* i) { + __global__ void multiply(float* A, float* B, float* C) { // printf("%d %d\n",i[0],i[1]); int index = blockIdx.x * blockDim.x + threadIdx.x; C[index] = A[index] * B[0]; diff -r 8bbc0012e1a4 -r 609bf62768b9 src/test/twice.cc --- a/src/test/twice.cc Sun Feb 12 09:12:21 2017 +0900 +++ b/src/test/twice.cc Sun Feb 12 12:35:11 2017 +0900 @@ -112,13 +112,13 @@ for (int i=0;i