CMake updates, copyright

krasznaa · May 16, 2024 · 84c3f24 · 84c3f24
1 parent 1ffe1d8
commit 84c3f24
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 22 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -31,8 +31,8 @@ jobs:
             container: ghcr.io/acts-project/ubuntu2004:v30
             options: -DTRACCC_USE_ROOT=FALSE
           - name: HIP 
-            container: ghcr.io/acts-project/ubuntu2204_rocm_clang
-            options: -DTRACCC_BUILD_HIP=TRUE
+            container: ghcr.io/acts-project/ubuntu2204_rocm_clang:sha-3a6b0b2
+            options: -DTRACCC_BUILD_HIP=TRUE -DTRACCC_SETUP_ROCTHRUST=TRUE
           - name: CUDA
             container: ghcr.io/acts-project/ubuntu2004_cuda:v30
             options: -DTRACCC_BUILD_CUDA=TRUE

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -119,10 +119,12 @@ set( TRACCC_THRUST_OPTIONS "" CACHE STRING
 mark_as_advanced( TRACCC_THRUST_OPTIONS )
 thrust_create_target( traccc::Thrust ${TRACCC_THRUST_OPTIONS} )
 
+option( TRACCC_SETUP_ROCTHRUST
+   "Set up the rocThrust target(s) explicitly" FALSE )
 option( TRACCC_USE_SYSTEM_ROCTHRUST
    "Pick up an existing installation of rocThrust from the build environment"
    ${TRACCC_USE_SYSTEM_LIBS} )
-if( TRACCC_BUILD_HIP )
+if( TRACCC_SETUP_ROCTHRUST )
    if( TRACCC_USE_SYSTEM_ROCTHRUST )
       find_package( rocThrust REQUIRED )
    else()

diff --git a/cmake/traccc-compiler-options-hip.cmake b/cmake/traccc-compiler-options-hip.cmake
diff --git a/device/alpaka/CMakeLists.txt b/device/alpaka/CMakeLists.txt
@@ -19,7 +19,6 @@ if(alpaka_ACC_GPU_CUDA_ENABLE)
 elseif(alpaka_ACC_GPU_HIP_ENABLE)
   enable_language(HIP)
   find_package( HIPToolkit REQUIRED )
-  include( traccc-compiler-options-hip )
   list(APPEND PRIVATE_LIBRARIES HIP::hiprt vecmem::hip)
 endif()
 

diff --git a/examples/run/alpaka/CMakeLists.txt b/examples/run/alpaka/CMakeLists.txt
@@ -15,7 +15,6 @@ if(alpaka_ACC_GPU_CUDA_ENABLE)
   list (APPEND LIBRARIES vecmem::cuda traccc::cuda)
 elseif(alpaka_ACC_GPU_HIP_ENABLE)
   enable_language(HIP)
-  include( traccc-compiler-options-hip )
   find_package( HIPToolkit REQUIRED )
   list(APPEND LIBRARIES HIP::hiprt vecmem::hip)
  endif()

diff --git a/extern/rocThrust/CMakeLists.txt b/extern/rocThrust/CMakeLists.txt
@@ -18,10 +18,25 @@ message( STATUS "Building rocThrust as part of the TRACCC project" )
 
 # Declare where to get rocThrust from.
 set( TRACCC_ROCTHRUST_SOURCE
-   "GIT_REPOSITORY;https://github.com/ROCm/rocThrust;GIT_TAG;rocm-6.1.0"
+   "GIT_REPOSITORY;https://github.com/ROCm/rocThrust.git;GIT_TAG;rocm-6.1.0"
    CACHE STRING "Source for Thrust, when built as part of this project" )
 mark_as_advanced( TRACCC_ROCTHRUST_SOURCE )
 FetchContent_Declare( rocThrust ${TRACCC_ROCTHRUST_SOURCE} )
 
+#Turn off build testing
+if( DEFINED CACHE{BUILD_TESTING} )
+   set( _buildTestingValue ${BUILD_TESTING} )
+endif()
+set( BUILD_TESTING FALSE CACHE INTERNAL "Forceful setting of BUILD_TESTING" )
+
 # Get it into the current directory.
-FetchContent_MakeAvailable( rocthrust )
+FetchContent_MakeAvailable( rocThrust )
+
+# Reset the BUILD_TESTING variable.
+if( DEFINED _buildTestingValue )
+   set( BUILD_TESTING ${_buildTestingValue} CACHE BOOL "Turn tests on/off"
+      FORCE )
+   unset( _buildTestingValue )
+else()
+   unset( BUILD_TESTING CACHE )
+endif()
diff --git a/tests/alpaka/CMakeLists.txt b/tests/alpaka/CMakeLists.txt
@@ -12,7 +12,6 @@ if(alpaka_ACC_GPU_CUDA_ENABLE)
 elseif(alpaka_ACC_GPU_HIP_ENABLE)
   enable_language(HIP)
   set_source_files_properties(alpaka_basic.cpp PROPERTIES LANGUAGE HIP)
-  include( traccc-compiler-options-hip )
   list(APPEND DEVICE_LIBRARIES vecmem::hip)
 endif()
 
@@ -24,3 +23,9 @@ traccc_add_test( alpaka
    vecmem::core
    ${DEVICE_LIBRARIES}
 )
+
+#Can only do this once target is defined, so need another if here
+if(alpaka_ACC_GPU_HIP_ENABLE)
+  set_target_properties( traccc_test_alpaka PROPERTIES
+     POSITION_INDEPENDENT_CODE TRUE )
+endif()
diff --git a/tests/hip/CMakeLists.txt b/tests/hip/CMakeLists.txt
@@ -1,5 +1,10 @@
+# TRACCC library, part of the ACTS project (R&D line)
+#
+# (c) 2024 CERN for the benefit of the ACTS project
+#
+# Mozilla Public License Version 2.0
+
 enable_language(HIP)
-include( traccc-compiler-options-hip )
 traccc_add_test(
     hip 
     # Define the sources for the test.
@@ -10,3 +15,6 @@ traccc_add_test(
     vecmem::core
     vecmem::hip
 )
+
+set_target_properties( traccc_test_hip PROPERTIES
+   POSITION_INDEPENDENT_CODE TRUE )
diff --git a/tests/hip/test_thrust.hip b/tests/hip/test_thrust.hip
@@ -1,6 +1,6 @@
 /** TRACCC library, part of the ACTS project (R&D line)
  *
- * (c) 2023 CERN for the benefit of the ACTS project
+ * (c) 2024 CERN for the benefit of the ACTS project
  *
  * Mozilla Public License Version 2.0
  */