Rename cuda_buffer --> cuda

Signed-off-by: Josh Morman <[email protected]>
gnuradio · Oct 25, 2021 · 83cd564 · 83cd564
1 parent 1c21e6b
commit 83cd564
Show file tree

Hide file tree

Showing 27 changed files with 161 additions and 161 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2011-2020 Free Software Foundation, Inc.
 #
 # This file was generated by gr_modtool, a tool from the GNU Radio framework
-# This file is a part of gr-cuda_buffer
+# This file is a part of gr-cuda
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
@@ -10,7 +10,7 @@
 # Project setup
 ########################################################################
 cmake_minimum_required(VERSION 3.8)
-project(gr-cuda_buffer CXX C)
+project(gr-cuda CXX C)
 enable_testing()
 
 # Install to PyBOMBS target prefix if defined
@@ -83,8 +83,8 @@ if(NOT CMAKE_MODULES_DIR)
   set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
 endif(NOT CMAKE_MODULES_DIR)
 
-set(GR_INCLUDE_DIR      include/cuda_buffer)
-set(GR_CMAKE_DIR        ${CMAKE_MODULES_DIR}/cuda_buffer)
+set(GR_INCLUDE_DIR      include/gnuradio/cuda)
+set(GR_CMAKE_DIR        ${CMAKE_MODULES_DIR}/cuda)
 set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
 set(GR_PKG_DOC_DIR      ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
 set(GR_PKG_CONF_DIR     ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d)
@@ -152,7 +152,7 @@ add_custom_target(uninstall
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(include/cuda_buffer)
+add_subdirectory(include/gnuradio/cuda)
 add_subdirectory(lib)
 add_subdirectory(apps)
 add_subdirectory(docs)
@@ -169,6 +169,6 @@ endif(ENABLE_PYTHON)
 # Install cmake search helper for this library
 ########################################################################
 
-install(FILES cmake/Modules/cuda_bufferConfig.cmake
-    DESTINATION ${CMAKE_MODULES_DIR}/cuda_buffer
+install(FILES cmake/Modules/cudaConfig.cmake
+    DESTINATION ${CMAKE_MODULES_DIR}/gnuradio/cuda
 )
diff --git a/MANIFEST.md b/MANIFEST.md
@@ -1,5 +1,5 @@
-title: The CUDA_BUFFER OOT Module
-brief: Short description of gr-cuda_buffer
+title: The CUDA OOT Module
+brief: Short description of gr-cuda
 tags: # Tags are arbitrary, but look at CGRAN what other authors are using
   - sdr
 author:
@@ -12,6 +12,6 @@ gr_supported_version: # Put a comma separated list of supported GR versions here
 #website: <module_website> # If you have a separate project website, put it here
 #icon: <icon_url> # Put a URL to a square image here that will be used as an icon on CGRAN
 ---
-A longer, multi-line description of gr-cuda_buffer.
+A longer, multi-line description of gr-cuda.
 You may use some *basic* Markdown here.
 If left empty, it will try to find a README file instead.
diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
-# gr-cuda_buffer
-gr-cuda_buffer OOT module to accompany the ngsched changes
+# gr-cuda
+gr-cuda OOT module to accompany the ngsched changes
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2011 Free Software Foundation, Inc.
 #
 # This file was generated by gr_modtool, a tool from the GNU Radio framework
-# This file is a part of gr-cuda_buffer
+# This file is a part of gr-cuda
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/cmake/Modules/cudaConfig.cmake b/cmake/Modules/cudaConfig.cmake
@@ -0,0 +1,33 @@
+if(NOT PKG_CONFIG_FOUND)
+    INCLUDE(FindPkgConfig)
+endif()
+PKG_CHECK_MODULES(PC_CUDA cuda)
+
+FIND_PATH(
+    CUDA_INCLUDE_DIRS
+    NAMES cuda/api.h
+    HINTS $ENV{CUDA_DIR}/include
+        ${PC_CUDA_INCLUDEDIR}
+    PATHS ${CMAKE_INSTALL_PREFIX}/include
+          /usr/local/include
+          /usr/include
+)
+
+FIND_LIBRARY(
+    CUDA_LIBRARIES
+    NAMES gnuradio-cuda
+    HINTS $ENV{CUDA_DIR}/lib
+        ${PC_CUDA_LIBDIR}
+    PATHS ${CMAKE_INSTALL_PREFIX}/lib
+          ${CMAKE_INSTALL_PREFIX}/lib64
+          /usr/local/lib
+          /usr/local/lib64
+          /usr/lib
+          /usr/lib64
+          )
+
+#include("${CMAKE_CURRENT_LIST_DIR}/cudaTarget.cmake")
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CUDA DEFAULT_MSG CUDA_LIBRARIES CUDA_INCLUDE_DIRS)
+MARK_AS_ADVANCED(CUDA_LIBRARIES CUDA_INCLUDE_DIRS)
diff --git a/cmake/Modules/cuda_bufferConfig.cmake b/cmake/Modules/cuda_bufferConfig.cmake
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2011 Free Software Foundation, Inc.
 #
 # This file was generated by gr_modtool, a tool from the GNU Radio framework
-# This file is a part of gr-cuda_buffer
+# This file is a part of gr-cuda
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/docs/README.cuda b/docs/README.cuda
@@ -0,0 +1,11 @@
+This is the cuda-write-a-block package meant as a guide to building
+out-of-tree packages. To use the cuda blocks, the Python namespaces
+is in 'cuda', which is imported as:
+
+    import cuda
+
+See the Doxygen documentation for details about the blocks available
+in this package. A quick listing of the details can be found in Python
+after importing by using:
+
+    help(cuda)
diff --git a/docs/README.cuda_buffer b/docs/README.cuda_buffer
diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2011 Free Software Foundation, Inc.
 #
 # This file was generated by gr_modtool, a tool from the GNU Radio framework
-# This file is a part of gr-cuda_buffer
+# This file is a part of gr-cuda
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
@@ -28,7 +28,7 @@ DOXYFILE_ENCODING      = UTF-8
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
-PROJECT_NAME           = "GNU Radio's CUDA_BUFFER Package"
+PROJECT_NAME           = "GNU Radio's CUDA Package"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
@@ -647,8 +647,8 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = "/home/blnxuser/gnuradio/gr-cuda_buffer" \
-                         "/home/blnxuser/gnuradio/gr-cuda_buffer"
+INPUT                  = "/home/blnxuser/gnuradio/gr-cuda" \
+                         "/home/blnxuser/gnuradio/gr-cuda"
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -681,11 +681,11 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = /home/blnxuser/gnuradio/gr-cuda_buffer/docs/doxygen/html \
-                         /home/blnxuser/gnuradio/gr-cuda_buffer/docs/doxygen/xml \
-                         /home/blnxuser/gnuradio/gr-cuda_buffer/docs/doxygen/other/doxypy.py \
-                         /home/blnxuser/gnuradio/gr-cuda_buffer/_CPack_Packages \
-                         /home/blnxuser/gnuradio/gr-cuda_buffer/cmake
+EXCLUDE                = /home/blnxuser/gnuradio/gr-cuda/docs/doxygen/html \
+                         /home/blnxuser/gnuradio/gr-cuda/docs/doxygen/xml \
+                         /home/blnxuser/gnuradio/gr-cuda/docs/doxygen/other/doxypy.py \
+                         /home/blnxuser/gnuradio/gr-cuda/_CPack_Packages \
+                         /home/blnxuser/gnuradio/gr-cuda/cmake
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -781,7 +781,7 @@ INPUT_FILTER           =
 # info on how filters are used. If FILTER_PATTERNS is empty or if
 # non of the patterns match the file name, INPUT_FILTER is applied.
 
-FILTER_PATTERNS        = *.py="/home/blnxuser/gnuradio/gr-cuda_buffer"/doc/doxygen/other/doxypy.py
+FILTER_PATTERNS        = *.py="/home/blnxuser/gnuradio/gr-cuda"/doc/doxygen/other/doxypy.py
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER) will be used to filter the input files when producing source

diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in
@@ -28,7 +28,7 @@ DOXYFILE_ENCODING      = UTF-8
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
-PROJECT_NAME           = "GNU Radio's CUDA_BUFFER Package"
+PROJECT_NAME           = "GNU Radio's CUDA Package"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or

diff --git a/docs/doxygen/doxyxml/__init__.py b/docs/doxygen/doxyxml/__init__.py
@@ -2,7 +2,7 @@
 # Copyright 2010 Free Software Foundation, Inc.
 #
 # This file was generated by gr_modtool, a tool from the GNU Radio framework
-# This file is a part of gr-cuda_buffer
+# This file is a part of gr-cuda
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/docs/doxygen/doxyxml/base.py b/docs/doxygen/doxyxml/base.py
@@ -2,7 +2,7 @@
 # Copyright 2010 Free Software Foundation, Inc.
 #
 # This file was generated by gr_modtool, a tool from the GNU Radio framework
-# This file is a part of gr-cuda_buffer
+# This file is a part of gr-cuda
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/docs/doxygen/doxyxml/doxyindex.py b/docs/doxygen/doxyxml/doxyindex.py
@@ -2,7 +2,7 @@
 # Copyright 2010 Free Software Foundation, Inc.
 #
 # This file was generated by gr_modtool, a tool from the GNU Radio framework
-# This file is a part of gr-cuda_buffer
+# This file is a part of gr-cuda
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/docs/doxygen/doxyxml/text.py b/docs/doxygen/doxyxml/text.py
@@ -2,7 +2,7 @@
 # Copyright 2010 Free Software Foundation, Inc.
 #
 # This file was generated by gr_modtool, a tool from the GNU Radio framework
-# This file is a part of gr-cuda_buffer
+# This file is a part of gr-cuda
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2011 Free Software Foundation, Inc.
 #
 # This file was generated by gr_modtool, a tool from the GNU Radio framework
-# This file is a part of gr-cuda_buffer
+# This file is a part of gr-cuda
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #

diff --git a/include/cuda_buffer/api.h b/include/cuda_buffer/api.h
diff --git a/include/cuda_buffer/CMakeLists.txt → include/gnuradio/cuda/CMakeLists.txt b/include/cuda_buffer/CMakeLists.txt → include/gnuradio/cuda/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2011,2012 Free Software Foundation, Inc.
 #
 # This file was generated by gr_modtool, a tool from the GNU Radio framework
-# This file is a part of gr-cuda_buffer
+# This file is a part of gr-cuda
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
@@ -11,6 +11,6 @@
 ########################################################################
 install(FILES
     api.h
-    cuda_buffer.h
-    DESTINATION include/cuda_buffer
+    cuda.h
+    DESTINATION include/gnuradio/cuda
 )
diff --git a/include/gnuradio/cuda/api.h b/include/gnuradio/cuda/api.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2011 Free Software Foundation, Inc.
+ *
+ * This file was generated by gr_modtool, a tool from the GNU Radio framework
+ * This file is a part of gr-cuda
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+
+#ifndef INCLUDED_CUDA_API_H
+#define INCLUDED_CUDA_API_H
+
+#include <gnuradio/attributes.h>
+
+#ifdef gnuradio_cuda_EXPORTS
+#define CUDA_API __GR_ATTR_EXPORT
+#else
+#define CUDA_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_CUDA_API_H */