revert some formatting changes

rapidsai · Jan 23, 2025 · 5e9594a · 5e9594a
1 parent 4567d5f
commit 5e9594a
Show file tree

Hide file tree

Showing 22 changed files with 119 additions and 136 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -69,7 +69,9 @@ message(VERBOSE "CUGRAPH: CUDA_STATIC_RUNTIME=${CUDA_STATIC_RUNTIME}")
 rapids_cuda_init_runtime(USE_STATIC ${CUDA_STATIC_RUNTIME})
 
 rapids_find_package(
-  CUDAToolkit REQUIRED BUILD_EXPORT_SET cugraph-exports INSTALL_EXPORT_SET cugraph-exports
+  CUDAToolkit REQUIRED
+  BUILD_EXPORT_SET cugraph-exports
+  INSTALL_EXPORT_SET cugraph-exports
 )
 
 if(BUILD_CUGRAPH_MTMG_TESTS)
@@ -638,14 +640,20 @@ cuGraph library is a collection of GPU accelerated graph algorithms that process
 )
 
 rapids_export(
-  INSTALL cugraph EXPORT_SET cugraph-exports GLOBAL_TARGETS cugraph cugraph_c NAMESPACE cugraph::
+  INSTALL cugraph
+  EXPORT_SET cugraph-exports
+  GLOBAL_TARGETS cugraph cugraph_c
+  NAMESPACE cugraph::
   DOCUMENTATION doc_string
 )
 
 # ##################################################################################################
 # * build export ---------------------------------------------------------------
 rapids_export(
-  BUILD cugraph EXPORT_SET cugraph-exports GLOBAL_TARGETS cugraph cugraph_c NAMESPACE cugraph::
+  BUILD cugraph
+  EXPORT_SET cugraph-exports
+  GLOBAL_TARGETS cugraph cugraph_c
+  NAMESPACE cugraph::
   DOCUMENTATION doc_string
 )
 

diff --git a/cpp/cmake/thirdparty/get_nccl.cmake b/cpp/cmake/thirdparty/get_nccl.cmake
@@ -18,7 +18,11 @@ function(find_and_configure_nccl)
     return()
   endif()
 
-  rapids_find_generate_module(NCCL HEADER_NAMES nccl.h LIBRARY_NAMES nccl)
+  rapids_find_generate_module(
+    NCCL
+    HEADER_NAMES nccl.h
+    LIBRARY_NAMES nccl
+  )
 
   # Currently NCCL has no CMake build-system so we require it built and installed on the machine
   # already

diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake
@@ -37,32 +37,16 @@ function(find_and_configure_raft)
   endif()
 
   rapids_cpm_find(
-    raft
-    ${PKG_VERSION}
-    GLOBAL_TARGETS
-    raft::raft
-    raft::raft_logger
-    raft::raft_logger_impl
-    BUILD_EXPORT_SET
-    cugraph-exports
-    INSTALL_EXPORT_SET
-    cugraph-exports
-    COMPONENTS
-    ${RAFT_COMPONENTS}
+    raft ${PKG_VERSION}
+    GLOBAL_TARGETS raft::raft raft::raft_logger raft::raft_logger_impl
+    BUILD_EXPORT_SET cugraph-exports
+    INSTALL_EXPORT_SET cugraph-exports COMPONENTS ${RAFT_COMPONENTS}
     CPM_ARGS
-    EXCLUDE_FROM_ALL
-    TRUE
-    GIT_REPOSITORY
-    https://github.com/${PKG_FORK}/raft.git
-    GIT_TAG
-    ${PKG_PINNED_TAG}
-    SOURCE_SUBDIR
-    cpp
-    OPTIONS
-    "RAFT_COMPILE_LIBRARY ${PKG_COMPILE_RAFT_LIB}"
-    "BUILD_TESTS OFF"
-    "BUILD_PRIMS_BENCH OFF"
-    "BUILD_CAGRA_HNSWLIB OFF"
+    EXCLUDE_FROM_ALL TRUE
+    GIT_REPOSITORY https://github.com/${PKG_FORK}/raft.git
+    GIT_TAG ${PKG_PINNED_TAG} SOURCE_SUBDIR cpp
+    OPTIONS "RAFT_COMPILE_LIBRARY ${PKG_COMPILE_RAFT_LIB}" "BUILD_TESTS OFF"
+            "BUILD_PRIMS_BENCH OFF" "BUILD_CAGRA_HNSWLIB OFF"
   )
 
   if(raft_ADDED)

diff --git a/cpp/libcugraph_etl/CMakeLists.txt b/cpp/libcugraph_etl/CMakeLists.txt
@@ -70,7 +70,9 @@ endif()
 rapids_cuda_init_runtime(USE_STATIC ${CUDA_STATIC_RUNTIME})
 
 rapids_find_package(
-  CUDAToolkit REQUIRED BUILD_EXPORT_SET cugraph_etl-exports INSTALL_EXPORT_SET cugraph_etl-exports
+  CUDAToolkit REQUIRED
+  BUILD_EXPORT_SET cugraph_etl-exports
+  INSTALL_EXPORT_SET cugraph_etl-exports
 )
 
 set(CUGRAPH_ETL_CXX_FLAGS "")
@@ -179,13 +181,19 @@ cuGraph.
 )
 
 rapids_export(
-  INSTALL cugraph_etl EXPORT_SET cugraph_etl-exports GLOBAL_TARGETS cugraph_etl NAMESPACE cugraph::
+  INSTALL cugraph_etl
+  EXPORT_SET cugraph_etl-exports
+  GLOBAL_TARGETS cugraph_etl
+  NAMESPACE cugraph::
   DOCUMENTATION doc_string
 )
 
 # ##################################################################################################
 # * build export ---------------------------------------------------------------
 rapids_export(
-  BUILD cugraph_etl EXPORT_SET cugraph_etl-exports GLOBAL_TARGETS cugraph cugraph_c cugraph_etl
-  NAMESPACE cugraph:: DOCUMENTATION doc_string
+  BUILD cugraph_etl
+  EXPORT_SET cugraph_etl-exports
+  GLOBAL_TARGETS cugraph cugraph_c cugraph_etl
+  NAMESPACE cugraph::
+  DOCUMENTATION doc_string
 )
diff --git a/cpp/libcugraph_etl/cmake/thirdparty/get_cudf.cmake b/cpp/libcugraph_etl/cmake/thirdparty/get_cudf.cmake
@@ -18,24 +18,14 @@ function(find_and_configure_cudf)
   cmake_parse_arguments(PKG "" "${oneValueArgs}" "" ${ARGN})
 
   rapids_cpm_find(
-    cudf
-    ${PKG_VERSION}
-    GLOBAL_TARGETS
-    cudf::cudf
-    BUILD_EXPORT_SET
-    cugraph_etl-exports
-    INSTALL_EXPORT_SET
-    cugraph_etl-exports
+    cudf ${PKG_VERSION}
+    GLOBAL_TARGETS cudf::cudf
+    BUILD_EXPORT_SET cugraph_etl-exports
+    INSTALL_EXPORT_SET cugraph_etl-exports
     CPM_ARGS
-    GIT_REPOSITORY
-    https://github.com/${PKG_FORK}/cudf.git
-    GIT_TAG
-    ${PKG_PINNED_TAG}
-    SOURCE_SUBDIR
-    cpp
-    OPTIONS
-    "BUILD_BENCHMARKS OFF"
-    "BUILD_TESTS OFF"
+    GIT_REPOSITORY https://github.com/${PKG_FORK}/cudf.git
+    GIT_TAG ${PKG_PINNED_TAG} SOURCE_SUBDIR cpp
+    OPTIONS "BUILD_BENCHMARKS OFF" "BUILD_TESTS OFF"
   )
 
   message(VERBOSE "CUGRAPH_ETL: Using CUDF located in ${cudf_SOURCE_DIR}")

diff --git a/cpp/libcugraph_etl/cmake/thirdparty/get_cugraph.cmake b/cpp/libcugraph_etl/cmake/thirdparty/get_cugraph.cmake
@@ -18,23 +18,14 @@ function(find_and_configure_cugraph)
   cmake_parse_arguments(PKG "" "${oneValueArgs}" "" ${ARGN})
 
   rapids_cpm_find(
-    cugraph
-    ${PKG_VERSION}
-    GLOBAL_TARGETS
-    cugraph::cugraph
-    BUILD_EXPORT_SET
-    cugraph_etl-exports
-    INSTALL_EXPORT_SET
-    cugraph_etl-exports
+    cugraph ${PKG_VERSION}
+    GLOBAL_TARGETS cugraph::cugraph
+    BUILD_EXPORT_SET cugraph_etl-exports
+    INSTALL_EXPORT_SET cugraph_etl-exports
     CPM_ARGS
-    GIT_REPOSITORY
-    https://github.com/${PKG_FORK}/cugraph.git
-    GIT_TAG
-    ${PKG_PINNED_TAG}
-    SOURCE_SUBDIR
-    cpp
-    OPTIONS
-    "BUILD_TESTS OFF"
+    GIT_REPOSITORY https://github.com/${PKG_FORK}/cugraph.git
+    GIT_TAG ${PKG_PINNED_TAG} SOURCE_SUBDIR cpp
+    OPTIONS "BUILD_TESTS OFF"
   )
 
   message(VERBOSE "CUGRAPH_ETL: Using CUGRAPH located in ${cugraph_SOURCE_DIR}")

diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
@@ -170,8 +170,11 @@ function(ConfigureTest CMAKE_TEST_NAME)
   )
 
   rapids_test_add(
-    NAME ${CMAKE_TEST_NAME} COMMAND ${CMAKE_TEST_NAME} GPUS ${_CUGRAPH_TEST_GPUS} PERCENT
-    ${_CUGRAPH_TEST_PERCENT} INSTALL_COMPONENT_SET testing
+    NAME ${CMAKE_TEST_NAME}
+    COMMAND ${CMAKE_TEST_NAME}
+    GPUS ${_CUGRAPH_TEST_GPUS}
+    PERCENT ${_CUGRAPH_TEST_PERCENT}
+    INSTALL_COMPONENT_SET testing
   )
   set_tests_properties(${CMAKE_TEST_NAME} PROPERTIES LABELS "CUGRAPH")
 endfunction()
@@ -193,24 +196,12 @@ function(ConfigureTestMG CMAKE_TEST_NAME)
   )
 
   rapids_test_add(
-    NAME
-    ${CMAKE_TEST_NAME}
-    COMMAND
-    ${MPIEXEC_EXECUTABLE}
-    "--noprefix"
-    ${MPIEXEC_NUMPROC_FLAG}
-    ${GPU_COUNT}
-    ${MPIEXEC_PREFLAGS}
-    ${CMAKE_TEST_NAME}
-    ${MPIEXEC_POSTFLAGS}
-    GPUS
-    ${GPU_COUNT}
-    PERCENT
-    100
-    INSTALL_COMPONENT_SET
-    testing_mg
-    INSTALL_TARGET
-    ${CMAKE_TEST_NAME}
+    NAME ${CMAKE_TEST_NAME}
+    COMMAND ${MPIEXEC_EXECUTABLE} "--noprefix" ${MPIEXEC_NUMPROC_FLAG} ${GPU_COUNT}
+            ${MPIEXEC_PREFLAGS} ${CMAKE_TEST_NAME} ${MPIEXEC_POSTFLAGS}
+    GPUS ${GPU_COUNT}
+    PERCENT 100
+    INSTALL_COMPONENT_SET testing_mg INSTALL_TARGET ${CMAKE_TEST_NAME}
   )
   set_tests_properties(${CMAKE_TEST_NAME} PROPERTIES LABELS "CUGRAPH_MG")
 
@@ -248,8 +239,11 @@ function(ConfigureCTest CMAKE_TEST_NAME)
   )
 
   rapids_test_add(
-    NAME ${CMAKE_TEST_NAME} COMMAND ${CMAKE_TEST_NAME} GPUS ${_CUGRAPH_TEST_GPUS} PERCENT
-    ${_CUGRAPH_TEST_PERCENT} INSTALL_COMPONENT_SET testing_c
+    NAME ${CMAKE_TEST_NAME}
+    COMMAND ${CMAKE_TEST_NAME}
+    GPUS ${_CUGRAPH_TEST_GPUS}
+    PERCENT ${_CUGRAPH_TEST_PERCENT}
+    INSTALL_COMPONENT_SET testing_c
   )
   set_tests_properties(${CMAKE_TEST_NAME} PROPERTIES LABELS "CUGRAPH_C")
 
@@ -272,24 +266,12 @@ function(ConfigureCTestMG CMAKE_TEST_NAME)
   )
 
   rapids_test_add(
-    NAME
-    ${CMAKE_TEST_NAME}
-    COMMAND
-    ${MPIEXEC_EXECUTABLE}
-    "--noprefix"
-    ${MPIEXEC_NUMPROC_FLAG}
-    ${GPU_COUNT}
-    ${MPIEXEC_PREFLAGS}
-    ${CMAKE_TEST_NAME}
-    ${MPIEXEC_POSTFLAGS}
-    GPUS
-    ${GPU_COUNT}
-    PERCENT
-    100
-    INSTALL_COMPONENT_SET
-    testing_mg
-    INSTALL_TARGET
-    ${CMAKE_TEST_NAME}
+    NAME ${CMAKE_TEST_NAME}
+    COMMAND ${MPIEXEC_EXECUTABLE} "--noprefix" ${MPIEXEC_NUMPROC_FLAG} ${GPU_COUNT}
+            ${MPIEXEC_PREFLAGS} ${CMAKE_TEST_NAME} ${MPIEXEC_POSTFLAGS}
+    GPUS ${GPU_COUNT}
+    PERCENT 100
+    INSTALL_COMPONENT_SET testing_mg INSTALL_TARGET ${CMAKE_TEST_NAME}
   )
   set_tests_properties(${CMAKE_TEST_NAME} PROPERTIES LABELS "CUGRAPH_C_MG")
 

diff --git a/python/cugraph/cugraph/components/CMakeLists.txt b/python/cugraph/cugraph/components/CMakeLists.txt
@@ -15,6 +15,7 @@
 set(cython_sources connectivity_wrapper.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX
-  components_ ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX components_ ASSOCIATED_TARGETS cugraph
 )
diff --git a/python/cugraph/cugraph/dask/comms/CMakeLists.txt b/python/cugraph/cugraph/dask/comms/CMakeLists.txt
@@ -15,6 +15,7 @@
 set(cython_sources comms_wrapper.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX comms_
-  ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX comms_ ASSOCIATED_TARGETS cugraph
 )
diff --git a/python/cugraph/cugraph/dask/components/CMakeLists.txt b/python/cugraph/cugraph/dask/components/CMakeLists.txt
@@ -15,6 +15,7 @@
 set(cython_sources mg_connectivity_wrapper.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX
-  components_ ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX components_ ASSOCIATED_TARGETS cugraph
 )
diff --git a/python/cugraph/cugraph/dask/structure/CMakeLists.txt b/python/cugraph/cugraph/dask/structure/CMakeLists.txt
@@ -15,6 +15,7 @@
 set(cython_sources replication.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX
-  structure_ ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX structure_ ASSOCIATED_TARGETS cugraph
 )
diff --git a/python/cugraph/cugraph/internals/CMakeLists.txt b/python/cugraph/cugraph/internals/CMakeLists.txt
@@ -15,8 +15,9 @@
 set(cython_sources internals.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX
-  internals_ ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX internals_ ASSOCIATED_TARGETS cugraph
 )
 
 target_include_directories(internals_internals PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
diff --git a/python/cugraph/cugraph/layout/CMakeLists.txt b/python/cugraph/cugraph/layout/CMakeLists.txt
@@ -15,6 +15,7 @@
 set(cython_sources force_atlas2_wrapper.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX layout_
-  ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX layout_ ASSOCIATED_TARGETS cugraph
 )
diff --git a/python/cugraph/cugraph/linear_assignment/CMakeLists.txt b/python/cugraph/cugraph/linear_assignment/CMakeLists.txt
@@ -15,6 +15,8 @@
 set(cython_sources lap_wrapper.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX
-  linear_assignment_ ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX linear_assignment_ ASSOCIATED_TARGETS
+                   cugraph
 )
diff --git a/python/cugraph/cugraph/sampling/CMakeLists.txt b/python/cugraph/cugraph/sampling/CMakeLists.txt
@@ -15,6 +15,7 @@
 set(cython_sources random_walks_wrapper.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX
-  sampling_ ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX sampling_ ASSOCIATED_TARGETS cugraph
 )
diff --git a/python/cugraph/cugraph/structure/CMakeLists.txt b/python/cugraph/cugraph/structure/CMakeLists.txt
@@ -15,6 +15,7 @@
 set(cython_sources graph_primtypes_wrapper.pyx graph_primtypes.pyx utils_wrapper.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX
-  structure_ ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX structure_ ASSOCIATED_TARGETS cugraph
 )
diff --git a/python/cugraph/cugraph/tree/CMakeLists.txt b/python/cugraph/cugraph/tree/CMakeLists.txt
@@ -15,6 +15,7 @@
 set(cython_sources minimum_spanning_tree_wrapper.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX tree_
-  ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX tree_ ASSOCIATED_TARGETS cugraph
 )
diff --git a/python/cugraph/cugraph/utilities/CMakeLists.txt b/python/cugraph/cugraph/utilities/CMakeLists.txt
@@ -15,6 +15,7 @@
 set(cython_sources path_retrieval_wrapper.pyx)
 set(linked_libraries cugraph::cugraph)
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX
-  utilities_ ASSOCIATED_TARGETS cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX utilities_ ASSOCIATED_TARGETS cugraph
 )
diff --git a/python/pylibcugraph/pylibcugraph/CMakeLists.txt b/python/pylibcugraph/pylibcugraph/CMakeLists.txt
@@ -75,6 +75,7 @@ set(cython_sources
 set(linked_libraries cugraph::cugraph;cugraph::cugraph_c)
 
 rapids_cython_create_modules(
-  CXX SOURCE_FILES "${cython_sources}" LINKED_LIBRARIES ${linked_libraries} ASSOCIATED_TARGETS
-  cugraph
+  CXX
+  SOURCE_FILES "${cython_sources}"
+  LINKED_LIBRARIES ${linked_libraries} ASSOCIATED_TARGETS cugraph
 )