Fix a few issues found by clang-tidy

dmlc · Oct 28, 2021 · f9ba6d9 · f9ba6d9
1 parent 631dd04
commit f9ba6d9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -147,7 +147,7 @@ def BuildCPU() {
       # This step is not necessary, but here we include it, to ensure that DMLC_CORE_USE_CMAKE flag is correctly propagated
       # We want to make sure that we use the configured header build/dmlc/build_config.h instead of include/dmlc/build_config_default.h.
       # See discussion at https://github.com/dmlc/xgboost/issues/5510
-    ${dockerRun} ${container_type} ${docker_binary} tests/ci_build/build_via_cmake.sh -DPLUGIN_DENSE_PARSER=ON
+    ${dockerRun} ${container_type} ${docker_binary} tests/ci_build/build_via_cmake.sh -DUSE_ARROW=ON -DPLUGIN_DENSE_PARSER=ON
     ${dockerRun} ${container_type} ${docker_binary} bash -c "cd build && ctest --extra-verbose"
     """
     // Sanitizer test

diff --git a/include/xgboost/data.h b/include/xgboost/data.h
@@ -190,7 +190,7 @@ struct Entry {
   /*! \brief feature value */
   bst_float fvalue;
   /*! \brief default constructor */
-#if defined(XGBOOST_BUILD_ARROW_SUPPORT)
+#if defined(XGBOOST_BUILD_ARROW_SUPPORT) && !defined(__CUDA__) && !defined(__CUDACC__)
   Entry() {} // NOLINT: Allow empty default constructor for performance reasons
 #else
   Entry() = default;

diff --git a/src/data/adapter.h b/src/data/adapter.h
@@ -22,9 +22,11 @@
 #include "xgboost/span.h"
 
 #include "array_interface.h"
-#include "arrow-cdi.h"
 #include "../c_api/c_api_error.h"
 #include "../common/math.h"
+#if defined(XGBOOST_BUILD_ARROW_SUPPORT)
+#include "arrow-cdi.h"
+#endif
 
 namespace xgboost {
 namespace data {

diff --git a/src/data/arrow-cdi.h b/src/data/arrow-cdi.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #ifdef __cplusplus
 extern "C" {