Add cpp test cases for Arrow support

dmlc · Jun 17, 2020 · dbefba8 · dbefba8
1 parent 6d8e09b
commit dbefba8
Show file tree

Hide file tree

Showing 4 changed files with 707 additions and 11 deletions.
diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
@@ -116,3 +116,18 @@ macro(enable_nvtx target)
   target_link_libraries(${target} PRIVATE "${NVTX_LIBRARY}")
   target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1)
 endmacro()
+
+macro(enable_arrow target)
+  find_package(Arrow REQUIRED)
+  find_package(ArrowPython REQUIRED)
+  find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
+  target_include_directories(${target}  PRIVATE
+                              ${ARROW_INCLUDE_DIR}
+                              ${ARROW_PYTHON_INCLUDE_DIR}
+                              ${Python3_INCLUDE_DIRS})
+  target_link_libraries(${target} PRIVATE 
+                        ${ARROW_SHARED_LIB}
+                        ${ARROW_PYTHON_SHARED_LIB}
+                        ${Python3_LIBRARIES})
+  target_compile_definitions(${target}  PRIVATE -DXGBOOST_BUILD_ARROW_SUPPORT=1)
+endmacro()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -52,17 +52,7 @@ else (USE_CUDA)
 endif (USE_CUDA)
 
 if (USE_ARROW)
-  find_package(Arrow REQUIRED)
-  list(APPEND SRC_LIBS ${ARROW_SHARED_LIB})
-  find_package(ArrowPython REQUIRED)
-  list(APPEND SRC_LIBS ${ARROW_PYTHON_SHARED_LIB})
-  find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
-  list(APPEND SRC_LIBS ${Python3_LIBRARIES})
-  target_include_directories(objxgboost PRIVATE
-                              ${ARROW_INCLUDE_DIR}
-                              ${ARROW_PYTHON_INCLUDE_DIR}
-                              ${Python3_INCLUDE_DIRS})
-  target_compile_definitions(objxgboost PRIVATE -DXGBOOST_BUILD_ARROW_SUPPORT=1)
+  enable_arrow(objxgboost)
 endif (USE_ARROW)
 
 target_include_directories(objxgboost

diff --git a/tests/cpp/CMakeLists.txt b/tests/cpp/CMakeLists.txt
@@ -53,6 +53,10 @@ if (USE_CUDA)
     CUDA_STANDARD_REQUIRED ON)
 endif (USE_CUDA)
 
+if (USE_ARROW)
+  enable_arrow(testxgboost)
+endif (USE_ARROW)
+
 if (MSVC)
   target_compile_options(testxgboost PRIVATE
     $<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/utf-8>