Skip to content

Commit aa7e258

Browse files
committed
FindO2GPU.cmake: be less verbose
1 parent d9bbbfc commit aa7e258

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

dependencies/FindO2GPU.cmake

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# or submit itself to any jurisdiction.
1111

1212
# NOTE!!!! - Whenever this file is changed, move it over to alidist/resources
13-
# FindO2GPU.cmake Version 11
13+
# FindO2GPU.cmake Version 13
1414

1515
set(CUDA_COMPUTETARGET_DEFAULT_FULL 80-real 86-real 89-real 120-real 75-virtual)
1616
set(HIP_AMDGPUTARGET_DEFAULT_FULL gfx906;gfx908)
@@ -65,7 +65,6 @@ function(detect_gpu_arch backend) # Detect GPU architecture, optionally filterri
6565
else()
6666
set(CUDA_TARGET TESLA)
6767
endif()
68-
message(STATUS "Using optimized CUDA settings for ${CUDA_TARGET} GPU (sm_${CUDA_FIRST_TARGET})")
6968

7069
string(REGEX MATCH "^[ \t\r\n]*gfx[0-9]+" HIP_FIRST_TARGET "${HIP_AMDGPUTARGET}")
7170
string(STRIP "${HIP_FIRST_TARGET}" HIP_FIRST_TARGET)
@@ -87,12 +86,13 @@ function(detect_gpu_arch backend) # Detect GPU architecture, optionally filterri
8786
else()
8887
set(HIP_TARGET VEGA)
8988
endif()
90-
message(STATUS "Using optimized HIP settings for ${HIP_TARGET} GPU (gfx${HIP_FIRST_TARGET})")
9189

9290
if(backend STREQUAL "CUDA") # CUDA filter
91+
message(STATUS "Using optimized CUDA settings for ${CUDA_TARGET} GPU (sm_${CUDA_FIRST_TARGET})")
9392
set(TARGET_ARCH "${CUDA_TARGET}" PARENT_SCOPE)
9493
elseif(backend STREQUAL "HIP") # HIP filter
9594
set(TARGET_ARCH "${HIP_TARGET}" PARENT_SCOPE)
95+
message(STATUS "Using optimized HIP settings for ${HIP_TARGET} GPU (gfx${HIP_FIRST_TARGET})")
9696
elseif(backend STREQUAL "ALL" OR backend STREQUAL "AUTO") # Return all / enabled backends
9797
set(TARGET_ARCH)
9898
if(CUDA_ENABLED OR backend STREQUAL "ALL")
@@ -194,8 +194,6 @@ if(ENABLE_CUDA)
194194
if(THRUST_INCLUDE_DIR STREQUAL "THRUST_INCLUDE_DIR-NOTFOUND")
195195
message(${FAILURE_SEVERITY} "CUDA found but thrust not available, looked under: ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}")
196196
set(CMAKE_CUDA_COMPILER OFF)
197-
else()
198-
message(STATUS "Thrust found in the path: ${THRUST_INCLUDE_DIR}")
199197
endif()
200198
if (NOT CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "12.8")
201199
message(${FAILURE_SEVERITY} "CUDA Version too old: ${CMAKE_CUDA_COMPILER_VERSION}, 12.8 required")
@@ -278,15 +276,14 @@ if(ENABLE_OPENCL)
278276
AND NOT LLVM_SPIRV STREQUAL "LLVM_SPIRV-NOTFOUND"
279277
AND OPENCL_COMPATIBLE_CLANG_FOUND)
280278
set(OPENCL_ENABLED_SPIRV ON)
281-
message(STATUS "Using CLANG ${LLVM_CLANG} and ${LLVM_SPIRV} for SPIR-V compilation")
282279
endif ()
283280
if(OPENCL_COMPATIBLE_CLANG_FOUND AND
284281
(OpenCL_VERSION_STRING VERSION_GREATER_EQUAL 2.2
285282
OR OPENCL_ENABLED_SPIRV))
286283
set(OPENCL_ENABLED ON)
287-
message(STATUS "Found OpenCL 2 (${OpenCL_VERSION_STRING} SPIR-V ${OPENCL_ENABLED_SPIRV} with CLANG ${LLVM_PACKAGE_VERSION})")
284+
message(STATUS "Found OpenCL ${OpenCL_VERSION_STRING} (SPIR-V ${OPENCL_ENABLED_SPIRV} ${LLVM_CLANG} ${LLVM_PACKAGE_VERSION} ${LLVM_SPIRV})")
288285
elseif(NOT ENABLE_OPENCL STREQUAL "AUTO")
289-
message(FATAL_ERROR "OpenCL 2.x not available")
286+
message(FATAL_ERROR "OpenCL >= 2.x not available")
290287
else()
291288
set(OPENCL_ENABLED OFF)
292289
endif()
@@ -347,7 +344,6 @@ if(ENABLE_HIP)
347344
set(CMAKE_HIP_HOST_COMPILER "$ENV{GCC_TOOLCHAIN_ROOT}/bin/gcc")
348345
endif()
349346
enable_language(HIP)
350-
message(STATUS "HIP language enabled: ${CMAKE_HIP_COMPILER}")
351347
endif()
352348
elseif(NOT ENABLE_HIP STREQUAL "AUTO")
353349
message(FATAL_ERROR "HIP requested, but CMAKE_PREFIX_PATH env variable does not contain rocm folder!")
@@ -373,7 +369,7 @@ if(ENABLE_HIP)
373369
if(HIP_AMDGPUTARGET)
374370
set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}")
375371
endif()
376-
message(STATUS "HIP Found (${hip_HIPCC_EXECUTABLE} version ${hip_VERSION}, Architectures ${CMAKE_HIP_ARCHITECTURES})")
372+
message(STATUS "HIP Found (${hip_HIPCC_EXECUTABLE} version ${hip_VERSION}, ${CMAKE_HIP_COMPILER}, Architectures ${CMAKE_HIP_ARCHITECTURES})")
377373
else()
378374
set(HIP_ENABLED OFF)
379375
endif()

0 commit comments

Comments
 (0)