Lint

dmlc · Jan 9, 2020 · 191d103 · 191d103
1 parent 3370ba1
commit 191d103
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/data/adapter.h b/src/data/adapter.h
@@ -4,9 +4,11 @@
  */
 #ifndef XGBOOST_DATA_ADAPTER_H_
 #define XGBOOST_DATA_ADAPTER_H_
+#include <dmlc/data.h>
 #include <limits>
 #include <memory>
 #include <string>
+
 namespace xgboost {
 namespace data {
 

diff --git a/src/data/simple_dmatrix.cu b/src/data/simple_dmatrix.cu
@@ -27,7 +27,8 @@ void CountRowOffsets(const AdapterBatchT& batch, common::Span<bst_row_t> offset,
   dh::LaunchN(device_idx, batch.Size(), [=] __device__(size_t idx) {
     auto element = batch.GetElement(idx);
     if (IsValid(element.value, missing)) {
-      atomicAdd(&offset[element.row_idx], 1);
+      atomicAdd(reinterpret_cast<unsigned long long*>(&offset[element.row_idx]),
+                static_cast<unsigned long long>(1));
     }
   });
 
@@ -49,7 +50,9 @@ void CopyDataColumnMajor(AdapterT* adapter, common::Span<Entry> data,
   // Populate column sizes
   dh::LaunchN(device_idx, batch.Size(), [=] __device__(size_t idx) {
     const auto& e = batch.GetElement(idx);
-    atomicAdd(&d_column_sizes[e.column_idx], 1);
+    atomicAdd(
+        reinterpret_cast<unsigned long long*>(&d_column_sizes[e.column_idx]),
+        static_cast<unsigned long long>(1));
   });
 
   thrust::host_vector<size_t> host_column_sizes = column_sizes;

diff --git a/tests/cpp/data/test_simple_dmatrix.cu b/tests/cpp/data/test_simple_dmatrix.cu
@@ -261,8 +261,8 @@ TEST(SimpleCSRSource, FromColumnarSparse) {
     for (auto& batch : dmat.GetBatches<SparsePage>()) {
       for (auto i = 0ull; i < batch.Size(); i++) {
         auto inst = batch[i];
-        for (auto j = 0ull; j < inst.size(); j++) {
-          ASSERT_NE(inst[j].fvalue, 2.0);
+        for (auto e : inst) {
+          ASSERT_NE(e.fvalue, 2.0);
         }
       }
     }