From eeef644c7e98591ea511891d51fa4959b45cad19 Mon Sep 17 00:00:00 2001 From: liaogang Date: Mon, 26 Dec 2016 16:13:25 +0800 Subject: [PATCH 1/4] Add with_gpu to manually build with/out gpu --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97ae501..9e02c7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,8 @@ include_directories(include) FIND_PACKAGE(CUDA 6.5) MESSAGE(STATUS "cuda found ${CUDA_FOUND}") +option(WITH_GPU "compile warp-ctc with cuda." ${CUDA_FOUND}) + # need to be at least 30 or __shfl_down in reduce wont compile set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -gencode arch=compute_30,code=sm_30 -O2") set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -gencode arch=compute_35,code=sm_35") @@ -53,7 +55,7 @@ ELSE() ENDIF() -IF (CUDA_FOUND) +IF (WITH_GPU) MESSAGE(STATUS "Building shared library with GPU support") From d46a25778a04ec4f86debab2fa7c62c4fb0108d9 Mon Sep 17 00:00:00 2001 From: liaogang Date: Tue, 27 Dec 2016 11:08:30 +0800 Subject: [PATCH 2/4] Add WITH_OMP --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e02c7f..e320ea6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,11 @@ FIND_PACKAGE(CUDA 6.5) MESSAGE(STATUS "cuda found ${CUDA_FOUND}") option(WITH_GPU "compile warp-ctc with cuda." ${CUDA_FOUND}) +option(WITH_OMP "compile warp-ctc with openmp." ON) + +if(NOT WITH_OMP) + add_definitions(-DCTC_DISABLE_OMP) +endif() # need to be at least 30 or __shfl_down in reduce wont compile set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -gencode arch=compute_30,code=sm_30 -O2") From 77b03e058c1a4f8e914a15d89424d6de2d69f210 Mon Sep 17 00:00:00 2001 From: liaogang Date: Tue, 27 Dec 2016 22:28:18 +0800 Subject: [PATCH 3/4] Revise cmake install for warp-ctc --- CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e320ea6..d82c3d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,9 +77,11 @@ IF (WITH_GPU) TARGET_LINK_LIBRARIES(test_gpu warpctc ${CUDA_curand_LIBRARY}) INSTALL(TARGETS warpctc - RUNTIME DESTINATION "${CMAKE_BINARY_DIR}" - LIBRARY DESTINATION "${CMAKE_BINARY_DIR}" - ARCHIVE DESTINATION "${CMAKE_BINARY_DIR}") + RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" + LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" + ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") + + INSTALL(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include") IF (Torch_FOUND) MESSAGE(STATUS "Building Torch Bindings with GPU support") @@ -119,9 +121,11 @@ ELSE() SET_TARGET_PROPERTIES(test_cpu PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11") INSTALL(TARGETS warpctc - RUNTIME DESTINATION "${CMAKE_BINARY_DIR}" - LIBRARY DESTINATION "${CMAKE_BINARY_DIR}" - ARCHIVE DESTINATION "${CMAKE_BINARY_DIR}") + RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" + LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" + ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") + + INSTALL(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include") IF (Torch_FOUND) MESSAGE(STATUS "Building Torch Bindings with no GPU support") From c9beca9f76d9124266f8e12380a3abf54ba6962f Mon Sep 17 00:00:00 2001 From: liaogang Date: Wed, 4 Jan 2017 12:55:21 +0800 Subject: [PATCH 4/4] Update warp-ctc install --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d82c3d8..4ab50ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,11 +77,11 @@ IF (WITH_GPU) TARGET_LINK_LIBRARIES(test_gpu warpctc ${CUDA_curand_LIBRARY}) INSTALL(TARGETS warpctc - RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" - LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" - ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") + RUNTIME DESTINATION "bin" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib") - INSTALL(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include") + INSTALL(FILES include/ctc.h DESTINATION "include") IF (Torch_FOUND) MESSAGE(STATUS "Building Torch Bindings with GPU support") @@ -121,11 +121,11 @@ ELSE() SET_TARGET_PROPERTIES(test_cpu PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11") INSTALL(TARGETS warpctc - RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" - LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" - ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") + RUNTIME DESTINATION "bin" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib") - INSTALL(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include") + INSTALL(FILES include/ctc.h DESTINATION "include") IF (Torch_FOUND) MESSAGE(STATUS "Building Torch Bindings with no GPU support")