Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CI] standardize else() and enfunction() calls in CMake scripts (#9653)

Browse Source
This commit is contained in:
James Lamb 2023-10-11 22:14:19 -05:00 committed by GitHub
parent 084d89216c
commit 2e42f33fc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -269,7 +269,7 @@ endif()
#-- library #-- library
if (BUILD_STATIC_LIB) if (BUILD_STATIC_LIB)
add_library(xgboost STATIC) add_library(xgboost STATIC)
else (BUILD_STATIC_LIB) else()
add_library(xgboost SHARED) add_library(xgboost SHARED)
endif() endif()
target_link_libraries(xgboost PRIVATE objxgboost) target_link_libraries(xgboost PRIVATE objxgboost)
@ -365,10 +365,10 @@ if (BUILD_STATIC_LIB)
else() else()
set(INSTALL_TARGETS xgboost objxgboost dmlc) set(INSTALL_TARGETS xgboost objxgboost dmlc)
endif() endif()
else (BUILD_STATIC_LIB) else()
if (BUILD_DEPRECATED_CLI) if (BUILD_DEPRECATED_CLI)
set(INSTALL_TARGETS xgboost runxgboost) set(INSTALL_TARGETS xgboost runxgboost)
else(BUILD_DEPRECATED_CLI) else()
set(INSTALL_TARGETS xgboost) set(INSTALL_TARGETS xgboost)
endif() endif()
endif() endif()

2
cmake/Doc.cmake
View File

@ -13,4 +13,4 @@ function (run_doxygen)
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Generate C APIs documentation." COMMENT "Generate C APIs documentation."
VERBATIM) VERBATIM)
endfunction (run_doxygen) endfunction()

2
cmake/FindPrefetchIntrinsics.cmake
View File

@ -19,4 +19,4 @@ function (find_prefetch_intrinsics)
" XGBOOST_BUILTIN_PREFETCH_PRESENT) " XGBOOST_BUILTIN_PREFETCH_PRESENT)
set(XGBOOST_MM_PREFETCH_PRESENT ${XGBOOST_MM_PREFETCH_PRESENT} PARENT_SCOPE) set(XGBOOST_MM_PREFETCH_PRESENT ${XGBOOST_MM_PREFETCH_PRESENT} PARENT_SCOPE)
set(XGBOOST_BUILTIN_PREFETCH_PRESENT ${XGBOOST_BUILTIN_PREFETCH_PRESENT} PARENT_SCOPE) set(XGBOOST_BUILTIN_PREFETCH_PRESENT ${XGBOOST_BUILTIN_PREFETCH_PRESENT} PARENT_SCOPE)
endfunction (find_prefetch_intrinsics) endfunction()

22
cmake/Utils.cmake
View File

@ -11,7 +11,7 @@ function(auto_source_group SOURCES)
source_group("${GROUP}" FILES "${FILE}") source_group("${GROUP}" FILES "${FILE}")
endforeach() endforeach()
endfunction(auto_source_group) endfunction()
# Force static runtime for MSVC # Force static runtime for MSVC
function(msvc_use_static_runtime) function(msvc_use_static_runtime)
@ -50,7 +50,7 @@ function(msvc_use_static_runtime)
endif() endif()
endforeach() endforeach()
endif() endif()
endfunction(msvc_use_static_runtime) endfunction()
# Set output directory of target, ignoring debug or release # Set output directory of target, ignoring debug or release
function(set_output_directory target dir) function(set_output_directory target dir)
@ -70,7 +70,7 @@ function(set_output_directory target dir)
ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${dir} ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${dir}
ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${dir} ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${dir}
ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${dir}) ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${dir})
endfunction(set_output_directory) endfunction()
# Set a default build type to release if none was specified # Set a default build type to release if none was specified
function(set_default_configuration_release) function(set_default_configuration_release)
@ -80,7 +80,7 @@ function(set_default_configuration_release)
message(STATUS "Setting build type to 'Release' as none was specified.") message(STATUS "Setting build type to 'Release' as none was specified.")
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE ) set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE )
endif() endif()
endfunction(set_default_configuration_release) endfunction()
# Generate nvcc compiler flags given a list of architectures # Generate nvcc compiler flags given a list of architectures
# Also generates PTX for the most recent architecture for forwards compatibility # Also generates PTX for the most recent architecture for forwards compatibility
@ -122,7 +122,7 @@ function(format_gencode_flags flags out)
set(${out} "${${out}}" PARENT_SCOPE) set(${out} "${${out}}" PARENT_SCOPE)
message(STATUS "CUDA GEN_CODE: ${GEN_CODE}") message(STATUS "CUDA GEN_CODE: ${GEN_CODE}")
endif() endif()
endfunction(format_gencode_flags flags) endfunction()
# Set CUDA related flags to target. Must be used after code `format_gencode_flags`. # Set CUDA related flags to target. Must be used after code `format_gencode_flags`.
function(xgboost_set_cuda_flags target) function(xgboost_set_cuda_flags target)
@ -154,7 +154,7 @@ function(xgboost_set_cuda_flags target)
if (USE_DEVICE_DEBUG) if (USE_DEVICE_DEBUG)
target_compile_options(${target} PRIVATE target_compile_options(${target} PRIVATE
$<$<AND:$<CONFIG:DEBUG>,$<COMPILE_LANGUAGE:CUDA>>:-G;-src-in-ptx>) $<$<AND:$<CONFIG:DEBUG>,$<COMPILE_LANGUAGE:CUDA>>:-G;-src-in-ptx>)
else (USE_DEVICE_DEBUG) else()
target_compile_options(${target} PRIVATE target_compile_options(${target} PRIVATE
$<$<COMPILE_LANGUAGE:CUDA>:-lineinfo>) $<$<COMPILE_LANGUAGE:CUDA>:-lineinfo>)
endif() endif()
@ -179,7 +179,7 @@ function(xgboost_set_cuda_flags target)
CUDA_STANDARD_REQUIRED ON CUDA_STANDARD_REQUIRED ON
CUDA_SEPARABLE_COMPILATION OFF CUDA_SEPARABLE_COMPILATION OFF
CUDA_RUNTIME_LIBRARY Static) CUDA_RUNTIME_LIBRARY Static)
endfunction(xgboost_set_cuda_flags) endfunction()
macro(xgboost_link_nccl target) macro(xgboost_link_nccl target)
if (BUILD_STATIC_LIB) if (BUILD_STATIC_LIB)
@ -191,7 +191,7 @@ macro(xgboost_link_nccl target)
target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NCCL=1) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NCCL=1)
target_link_libraries(${target} PRIVATE ${NCCL_LIBRARY}) target_link_libraries(${target} PRIVATE ${NCCL_LIBRARY})
endif() endif()
endmacro(xgboost_link_nccl) endmacro()
# compile options # compile options
macro(xgboost_target_properties target) macro(xgboost_target_properties target)
@ -233,7 +233,7 @@ macro(xgboost_target_properties target)
if (WIN32 AND MINGW) if (WIN32 AND MINGW)
target_compile_options(${target} PUBLIC -static-libstdc++) target_compile_options(${target} PUBLIC -static-libstdc++)
endif() endif()
endmacro(xgboost_target_properties) endmacro()
# Custom definitions used in xgboost. # Custom definitions used in xgboost.
macro(xgboost_target_defs target) macro(xgboost_target_defs target)
@ -260,7 +260,7 @@ macro(xgboost_target_defs target)
if (PLUGIN_RMM) if (PLUGIN_RMM)
target_compile_definitions(objxgboost PUBLIC -DXGBOOST_USE_RMM=1) target_compile_definitions(objxgboost PUBLIC -DXGBOOST_USE_RMM=1)
endif() endif()
endmacro(xgboost_target_defs) endmacro()
# handles dependencies # handles dependencies
macro(xgboost_target_link_libraries target) macro(xgboost_target_link_libraries target)
@ -298,4 +298,4 @@ macro(xgboost_target_link_libraries target)
if (MINGW) if (MINGW)
target_link_libraries(${target} PRIVATE wsock32 ws2_32) target_link_libraries(${target} PRIVATE wsock32 ws2_32)
endif() endif()
endmacro(xgboost_target_link_libraries) endmacro()

2
cmake/Version.cmake
View File

@ -3,4 +3,4 @@ function (write_version)
configure_file( configure_file(
${xgboost_SOURCE_DIR}/cmake/version_config.h.in ${xgboost_SOURCE_DIR}/cmake/version_config.h.in
${xgboost_SOURCE_DIR}/include/xgboost/version_config.h @ONLY) ${xgboost_SOURCE_DIR}/include/xgboost/version_config.h @ONLY)
endfunction (write_version) endfunction()

2
cmake/modules/FindLibR.cmake
View File

@ -66,7 +66,7 @@ function(create_rlib_for_msvc)
execute_process(COMMAND ${DLLTOOL_EXE} execute_process(COMMAND ${DLLTOOL_EXE}
"--input-def" "${CMAKE_CURRENT_BINARY_DIR}/R.def" "--input-def" "${CMAKE_CURRENT_BINARY_DIR}/R.def"
"--output-lib" "${CMAKE_CURRENT_BINARY_DIR}/R.lib") "--output-lib" "${CMAKE_CURRENT_BINARY_DIR}/R.lib")
endfunction(create_rlib_for_msvc) endfunction()
# detection for OSX # detection for OSX

4
tests/cpp/CMakeLists.txt
View File

@ -3,7 +3,7 @@ if (USE_DMLC_GTEST)
message(FATAL_ERROR "USE_DMLC_GTEST=ON but dmlc-core didn't bundle gtest") message(FATAL_ERROR "USE_DMLC_GTEST=ON but dmlc-core didn't bundle gtest")
endif() endif()
set(GTEST_LIBRARIES gtest) set(GTEST_LIBRARIES gtest)
else (USE_DMLC_GTEST) else()
find_package(GTest REQUIRED) find_package(GTest REQUIRED)
endif() endif()
file(GLOB_RECURSE TEST_SOURCES "*.cc") file(GLOB_RECURSE TEST_SOURCES "*.cc")
@ -21,7 +21,7 @@ endif()
if (PLUGIN_FEDERATED) if (PLUGIN_FEDERATED)
target_include_directories(testxgboost PRIVATE ${xgboost_SOURCE_DIR}/plugin/federated) target_include_directories(testxgboost PRIVATE ${xgboost_SOURCE_DIR}/plugin/federated)
target_link_libraries(testxgboost PRIVATE federated_client) target_link_libraries(testxgboost PRIVATE federated_client)
else (PLUGIN_FEDERATED) else()
file(GLOB_RECURSE FEDERATED_TEST_SOURCES "plugin/*_federated_*.*") file(GLOB_RECURSE FEDERATED_TEST_SOURCES "plugin/*_federated_*.*")
list(REMOVE_ITEM TEST_SOURCES ${FEDERATED_TEST_SOURCES}) list(REMOVE_ITEM TEST_SOURCES ${FEDERATED_TEST_SOURCES})
endif() endif()