Move cudax example project to CCCL project examples. (#2462)

NVIDIA · Oct 1, 2024 · 57b9899 · 57b9899
1 parent 808f9c2
commit 57b9899
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 14 deletions.
diff --git a/ci/matrix.yaml b/ci/matrix.yaml
@@ -49,8 +49,9 @@ workflows:
     # Python jobs:
     - {jobs: ['test'], project: 'pycuda', ctk: ['12.5']}
     # cccl-infra:
-    - {jobs: ['infra'], project: 'cccl', ctk: '11.1', cxx: ['gcc6', 'clang9']}
-    - {jobs: ['infra'], project: 'cccl', ctk: 'curr', cxx: ['gcc',  'clang']}
+    - {jobs: ['infra'], project: 'cccl', ctk: '11.1', cxx: ['gcc6',  'clang9']}
+    - {jobs: ['infra'], project: 'cccl', ctk: '12.0', cxx: ['gcc12', 'clang14']}
+    - {jobs: ['infra'], project: 'cccl', ctk: 'curr', cxx: ['gcc',   'clang']}
 
   nightly:
     # Increased test coverage compared to nightlies:

diff --git a/cudax/CMakeLists.txt b/cudax/CMakeLists.txt
@@ -20,7 +20,6 @@ endif()
 
 option(cudax_ENABLE_HEADER_TESTING "Test that CUDA Experimental's public headers compile." ON)
 option(cudax_ENABLE_TESTING "Build CUDA Experimental's tests." ON)
-option(cudax_ENABLE_SAMPLES "Build CUDA Experimental's samples." ON)
 
 include(cmake/cudaxBuildCompilerTargets.cmake)
 include(cmake/cudaxBuildTargetList.cmake)
@@ -37,13 +36,3 @@ if (cudax_ENABLE_TESTING)
   enable_testing() # Must be in root directory
   add_subdirectory(test)
 endif()
-
-if (cudax_ENABLE_SAMPLES)
-  include(ExternalProject)
-  ExternalProject_Add(cudax_samples
-    PREFIX samples
-    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/samples"
-    BUILD_ALWAYS ON
-    INSTALL_COMMAND cmake -E echo "Skipping install step.")
-  add_dependencies(cudax.all cudax_samples)
-endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -34,8 +34,20 @@ set(cmake_cpm_opts
 
 cccl_add_compile_test(test_name
   cccl.example
-  example_project
+  basic
   "default"
   ${cmake_opts}
   ${cmake_cpm_opts}
 )
+
+find_package(CUDAToolkit REQUIRED)
+
+if (CUDAToolkit_VERSION_MAJOR VERSION_GREATER_EQUAL 12)
+  cccl_add_compile_test(test_name
+    cccl.example
+    cudax
+    "default"
+    ${cmake_opts}
+    ${cmake_cpm_opts}
+  )
+endif()
diff --git a/examples/example_project/CMakeLists.txt → examples/basic/CMakeLists.txt b/examples/example_project/CMakeLists.txt → examples/basic/CMakeLists.txt
diff --git a/examples/example_project/README.md → examples/basic/README.md b/examples/example_project/README.md → examples/basic/README.md
diff --git a/cudax/samples/cmake/CPM.cmake → examples/basic/cmake/CPM.cmake b/cudax/samples/cmake/CPM.cmake → examples/basic/cmake/CPM.cmake
diff --git a/examples/example_project/example.cu → examples/basic/example.cu b/examples/example_project/example.cu → examples/basic/example.cu
diff --git a/cudax/samples/CMakeLists.txt → examples/cudax/CMakeLists.txt b/cudax/samples/CMakeLists.txt → examples/cudax/CMakeLists.txt
diff --git a/examples/cudax/README.md b/examples/cudax/README.md
@@ -0,0 +1,5 @@
+
+# Overview
+
+This example extends the `example_project` by additionally enabling the CUDA Experimental library, `cudax`.
+See the `example_project`'s README for additional information.
diff --git a/examples/example_project/cmake/CPM.cmake → examples/cudax/cmake/CPM.cmake b/examples/example_project/cmake/CPM.cmake → examples/cudax/cmake/CPM.cmake
diff --git a/cudax/samples/vector_add/vector.cuh → examples/cudax/vector_add/vector.cuh b/cudax/samples/vector_add/vector.cuh → examples/cudax/vector_add/vector.cuh
diff --git a/cudax/samples/vector_add/vector_add.cu → examples/cudax/vector_add/vector_add.cu b/cudax/samples/vector_add/vector_add.cu → examples/cudax/vector_add/vector_add.cu