[hamradio-commits] [gnss-sdr] 246/251: Moving cudahelpers headers so other blocks can use it more easily.
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Wed Sep 2 00:22:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit 08212169709bdb2b8d64a50da813958ff37ed8d1
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Tue Aug 25 20:49:37 2015 +0200
Moving cudahelpers headers so other blocks can use it more easily.
---
README.md | 2 +-
src/algorithms/{tracking => }/libs/cudahelpers/exception.h | 0
src/algorithms/{tracking => }/libs/cudahelpers/helper_cuda.h | 0
src/algorithms/{tracking => }/libs/cudahelpers/helper_cuda_drvapi.h | 0
src/algorithms/{tracking => }/libs/cudahelpers/helper_cuda_gl.h | 0
src/algorithms/{tracking => }/libs/cudahelpers/helper_functions.h | 0
src/algorithms/{tracking => }/libs/cudahelpers/helper_image.h | 0
src/algorithms/{tracking => }/libs/cudahelpers/helper_math.h | 0
src/algorithms/{tracking => }/libs/cudahelpers/helper_string.h | 0
src/algorithms/{tracking => }/libs/cudahelpers/helper_timer.h | 0
src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt | 5 +++--
src/algorithms/tracking/libs/CMakeLists.txt | 4 ++--
12 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 757b432..bb52497 100644
--- a/README.md
+++ b/README.md
@@ -347,7 +347,7 @@ $ sudo make install
###### Build CUDA support (OPTIONAL):
-In order to enable the building of blocks that use CUDA, NVIDIA's parallel programming model that enables graphics processing unit (GPU) acceleration for data-parallel computations, first you need to install the CUDA Toolkit from [NVIDIA Developers Download page](https://developer.nvidia.com/cuda-downloads "CUDA Downloads"). Then, build GNSS-SDR doing:
+In order to enable the building of blocks that use CUDA, NVIDIA's parallel programming model that enables graphics processing unit (GPU) acceleration for data-parallel computations, first you need to install the CUDA Toolkit from [NVIDIA Developers Download page](https://developer.nvidia.com/cuda-downloads "CUDA Downloads"). Make sure that the SDK samples build well. Then, build GNSS-SDR by doing:
~~~~~~
$ cmake -DENABLE_CUDA=ON ../
diff --git a/src/algorithms/tracking/libs/cudahelpers/exception.h b/src/algorithms/libs/cudahelpers/exception.h
similarity index 100%
rename from src/algorithms/tracking/libs/cudahelpers/exception.h
rename to src/algorithms/libs/cudahelpers/exception.h
diff --git a/src/algorithms/tracking/libs/cudahelpers/helper_cuda.h b/src/algorithms/libs/cudahelpers/helper_cuda.h
similarity index 100%
rename from src/algorithms/tracking/libs/cudahelpers/helper_cuda.h
rename to src/algorithms/libs/cudahelpers/helper_cuda.h
diff --git a/src/algorithms/tracking/libs/cudahelpers/helper_cuda_drvapi.h b/src/algorithms/libs/cudahelpers/helper_cuda_drvapi.h
similarity index 100%
rename from src/algorithms/tracking/libs/cudahelpers/helper_cuda_drvapi.h
rename to src/algorithms/libs/cudahelpers/helper_cuda_drvapi.h
diff --git a/src/algorithms/tracking/libs/cudahelpers/helper_cuda_gl.h b/src/algorithms/libs/cudahelpers/helper_cuda_gl.h
similarity index 100%
rename from src/algorithms/tracking/libs/cudahelpers/helper_cuda_gl.h
rename to src/algorithms/libs/cudahelpers/helper_cuda_gl.h
diff --git a/src/algorithms/tracking/libs/cudahelpers/helper_functions.h b/src/algorithms/libs/cudahelpers/helper_functions.h
similarity index 100%
rename from src/algorithms/tracking/libs/cudahelpers/helper_functions.h
rename to src/algorithms/libs/cudahelpers/helper_functions.h
diff --git a/src/algorithms/tracking/libs/cudahelpers/helper_image.h b/src/algorithms/libs/cudahelpers/helper_image.h
similarity index 100%
rename from src/algorithms/tracking/libs/cudahelpers/helper_image.h
rename to src/algorithms/libs/cudahelpers/helper_image.h
diff --git a/src/algorithms/tracking/libs/cudahelpers/helper_math.h b/src/algorithms/libs/cudahelpers/helper_math.h
similarity index 100%
rename from src/algorithms/tracking/libs/cudahelpers/helper_math.h
rename to src/algorithms/libs/cudahelpers/helper_math.h
diff --git a/src/algorithms/tracking/libs/cudahelpers/helper_string.h b/src/algorithms/libs/cudahelpers/helper_string.h
similarity index 100%
rename from src/algorithms/tracking/libs/cudahelpers/helper_string.h
rename to src/algorithms/libs/cudahelpers/helper_string.h
diff --git a/src/algorithms/tracking/libs/cudahelpers/helper_timer.h b/src/algorithms/libs/cudahelpers/helper_timer.h
similarity index 100%
rename from src/algorithms/tracking/libs/cudahelpers/helper_timer.h
rename to src/algorithms/libs/cudahelpers/helper_timer.h
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index 8bfeb30..4f7763d 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -19,8 +19,9 @@
if(ENABLE_CUDA)
set(OPT_TRACKING_BLOCKS ${OPT_TRACKING_BLOCKS} gps_l1_ca_dll_pll_tracking_gpu_cc.cc)
- set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS}
- ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs/cudahelpers)
+ set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES}
+ ${CUDA_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/src/algorithms/libs/cudahelpers)
set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} ${CUDA_LIBRARIES})
endif(ENABLE_CUDA)
diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index 493aa28..ad2ca6d 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -24,13 +24,13 @@ if(ENABLE_CUDA)
set(CUDA_PROPAGATE_HOST_FLAGS OFF)
CUDA_INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/cudahelpers
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/cudahelpers
)
set(LIB_TYPE STATIC) #set the lib type
CUDA_ADD_LIBRARY(CUDA_CORRELATOR_LIB ${LIB_TYPE} cuda_multicorrelator.h cuda_multicorrelator.cu)
set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} CUDA_CORRELATOR_LIB)
- set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS})
+ set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/cudahelpers)
endif(ENABLE_CUDA)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list