update latest standards

Author: kadeslu

.gitmodules

@@ -1,62 +1,51 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.18)
 
-# Silence warnings about empty CUDA_ARCHITECTURES properties on example targets:
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
-  cmake_policy(SET CMP0104 OLD)
-endif()
-
-# Set a name and a version number for your project:
+# Project definition
 project(devdat VERSION 0.0.1 LANGUAGES CXX CUDA)
 
-# Initialize some default paths
-include(GNUInstallDirs)
-
-# Define the minimum C++ standard that is required
+# Set C++ standard
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# Add nlohmann json
-include(FetchContent)
+# Optionally set CUDA architectures (uncomment and set as needed)
+# set(CMAKE_CUDA_ARCHITECTURES 60 70 75 80 86)
+
+# Install directories
+include(GNUInstallDirs)
 
-FetchContent_Declare(json
+# Fetch nlohmann_json (modern FetchContent usage)
+include(FetchContent)
+FetchContent_Declare(
+  json
   GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent
-  GIT_PROGRESS TRUE
+  GIT_TAG v3.0.0
   GIT_SHALLOW TRUE
-  GIT_TAG v3.0.0)
+)
 FetchContent_MakeAvailable(json)
 
-# Compilation options
-# Add an interface target for our header-only library
+# Header-only library target
 add_library(devdat INTERFACE)
 target_include_directories(devdat INTERFACE
-  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include/>
+  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-  $<BUILD_INTERFACE:${json_SOURCE_DIR}/include/>
 )
 
-# compile the tests
+# Alias for downstream usage
+add_library(devdat::devdat ALIAS devdat)
+
+# Testing
 include(CTest)
 if(BUILD_TESTING)
-  if(NOT TARGET Catch2)
-    add_subdirectory(ext/Catch2)
-    include(./ext/Catch2/contrib/Catch.cmake)
-  endif()
   add_subdirectory(tests)
 endif()
 
+# === Installation ===
 
-# Add an alias target for use if this project is included as a subproject in another project
-add_library(devdat::devdat ALIAS devdat)
-
-# Install targets and configuration
 install(
   TARGETS devdat
   EXPORT devdat-config
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 
 install(
@@ -70,9 +59,11 @@ install(
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 
-install(FILES ${json_SOURCE_DIR}/include/nlohmann/json.hpp
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nlohmann/)
+install(
+  FILES ${json_SOURCE_DIR}/include/nlohmann/json.hpp
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nlohmann/
+)
 
-# This prints a summary of found dependencies
+# Feature summary
 include(FeatureSummary)
 feature_summary(WHAT ALL)

CMakeLists.txt

@@ -13,56 +13,49 @@ Building DevDat requires the following software installed:
 * CMake `>= 3.15`
 * Cuda `>=10.1`
 
-# Building DevDat
+# Building and Installing DevDat
 
-The following sequence of commands builds DevDat.
-It assumes that your current working directory is the top-level directory
-of the freshly cloned repository:
+The recommended way to build and install DevDat is with an out-of-source build:
 
-```
-mkdir build
-cd build
-cmake -DCMAKE_BUILD_TYPE=Release ..
-cmake --build .
+```sh
+cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$HOME/local
+cmake --build build --target install
 ```
 
-The build process can be customized with the following CMake variables,
-which can be set by adding `-D<var>={ON, OFF}` to the `cmake` call:
+This will install DevDat to `$HOME/local` by default.  
+If you want to install to a different location, adjust the `CMAKE_INSTALL_PREFIX` accordingly.
 
-* `BUILD_TESTING`: Enable building of the test suite (default: `ON`)
+> **Note:** If you install to a custom location, set `CMAKE_PREFIX_PATH` when using DevDat in other projects:
+>
+> ```sh
+> cmake -S . -B build -DCMAKE_PREFIX_PATH=$HOME/local
+> ```
 
-# Testing DevDat
+# Building and Running the Example
 
-When built according to the above explanation (with `-DBUILD_TESTING=ON`),
-the C++ test suite of `DevDat` can be run using
-`ctest` from the build directory:
+To build the example, first ensure DevDat is installed as above. Then:
 
+```sh
+cmake -S examples -B examples/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$HOME/local
+cmake --build examples/build
 ```
-cd build
-ctest
-```
-# Building the example
 
-The example directory demonstrates how the library can be integrated into a cmake project:
+To run the example:
 
-```
-cd examples
-mkdir build
-cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=~/DevDat/install ..   
-cmake --build .
+```sh
+./examples/build/devdat_examples
 ```
 
-Note that we have assumed here that the library was built beforehand locally by running the following commands in the top-level directory of the repository:
+# Running Tests
 
-```
-mkdir build
+If you enabled tests (`-DBUILD_TESTING=ON`):
+
+```sh
+cmake -S . -B build -DBUILD_TESTING=ON
+cmake --build build
 cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./../install ..    
-make install -j9
+ctest
 ```
-
-
 # Documentation
 
 ToDo

README.md

@@ -1,33 +1,29 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.18)
 
-# Silence warnings about empty CUDA_ARCHITECTURES properties on example targets:
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
-  cmake_policy(SET CMP0104 OLD)
-endif()
-
-# Set a name and a version number for your project:
 project(Example VERSION 0.0.1 LANGUAGES CXX CUDA)
 
-# Initialize some default paths
-include(GNUInstallDirs)
-
-# Define the minimum C++ standard that is required
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# Include libraries
+# Optionally set CUDA architectures (uncomment and set as needed)
+# set(CMAKE_CUDA_ARCHITECTURES 60 70 75 80 86)
+
+include(GNUInstallDirs)
+
 find_package(devdat CONFIG REQUIRED)
 
-add_executable(devdat_examples src/devdat_t.cu src/random.cu main.cpp)
+add_executable(devdat_examples
+    src/devdat_t.cu
+    src/random.cu
+    main.cpp
+)
+
 target_link_libraries(devdat_examples PRIVATE devdat::devdat)
 
-target_include_directories(devdat_examples PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}>
-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include/>
+target_include_directories(devdat_examples PRIVATE
+    ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
 )
 
-# This prints a summary of found dependencies
 include(FeatureSummary)
 feature_summary(WHAT ALL)

examples/CMakeLists.txt

@@ -21,7 +21,7 @@ class repeated_range
 
     typedef typename thrust::iterator_difference<Iterator>::type difference_type;
 
-    struct repeat_functor : public thrust::unary_function<difference_type,difference_type>
+    struct repeat_functor
     {
         difference_type repeats;
 
@@ -72,7 +72,7 @@ class tiled_range
 
     typedef typename thrust::iterator_difference<Iterator>::type difference_type;
 
-    struct tile_functor : public thrust::unary_function<difference_type,difference_type>
+    struct tile_functor
     {
         difference_type tile_size;
 
@@ -196,7 +196,7 @@ void print_range_in_string(Iterator first, Iterator last, std::string &s)
 
 // convert a linear index to a row index
 template <typename T>
-struct linear_index_to_row_index : public thrust::unary_function<T,T>
+struct linear_index_to_row_index
 {
     T C; // number of columns
 

ext/Catch2

@@ -1,10 +1,25 @@
+include(FetchContent)
+
+FetchContent_Declare(
+    Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+    GIT_TAG        v2.13.8
+)
+FetchContent_MakeAvailable(Catch2)
+
 add_executable(devdat_tests tests.cpp devdat_t.cu)
-target_link_libraries(devdat_tests PUBLIC devdat Catch2::Catch2)
 
-target_include_directories(devdat_tests PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}>
-    $<BUILD_INTERFACE:${json_SOURCE_DIR}/include/>
+target_include_directories(devdat_tests
+    PRIVATE
+        ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
+        ${json_SOURCE_DIR}/include
+)
+
+target_link_libraries(devdat_tests
+    PRIVATE
+    devdat
+    Catch2::Catch2
 )
 
-# allow user to run tests with `make test` or `ctest`
-catch_discover_tests(devdat_tests)
+include(${catch2_SOURCE_DIR}/contrib/Catch.cmake)
+catch_discover_tests(devdat_tests)