Merge pull request #3225 from rapidsai/branch-0.17

[gpuCI] Auto-merge branch-0.17 to branch-0.18 [skip ci]
rapidsai · Dec 1, 2020 · 0d47fb7 · 0d47fb7
2 parents fefe83c + 5697e09
commit 0d47fb7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -91,6 +91,7 @@
 - PR #3162: Removing accidentally checked in debug file
 - PR #3175: Fix gtest pinned cmake version for build from source option
 - PR #3182: Fix a bug in MSE metric calculation
+- PR #3215: Add a missing `__syncthreads()`
 - PR #3185: Add documentation for Distributed TFIDF Transformer
 - PR #3190: Fix Attribute error on ICPA #3183 and PCA input type
 - PR #3208: Fix EXITCODE override in notebook test script

diff --git a/cpp/src/fil/infer.cu b/cpp/src/fil/infer.cu
@@ -247,6 +247,7 @@ struct tree_aggregator_t<NITEMS, GROVE_PER_CLASS_FEW_CLASSES> : finalize_block {
     per_thread[threadIdx.x] = acc;
     __syncthreads();
     acc = multi_sum<6>(per_thread, num_classes, blockDim.x / num_classes);
+    __syncthreads();
     write_best_class_in_block(to_vec(threadIdx.x, acc), num_classes, out,
                               num_rows);
   }

diff --git a/cpp/test/sg/fil_test.cu b/cpp/test/sg/fil_test.cu
@@ -752,8 +752,8 @@ std::vector<FilTestParams> predict_sparse_inputs = {
 TEST_P(PredictSparse16FilTest, Predict) { compare(); }
 
 // Temporarily disabled, see https://github.com/rapidsai/cuml/issues/3205
-// INSTANTIATE_TEST_CASE_P(FilTests, PredictSparse16FilTest,
-//                        testing::ValuesIn(predict_sparse_inputs));
+INSTANTIATE_TEST_CASE_P(FilTests, PredictSparse16FilTest,
+                        testing::ValuesIn(predict_sparse_inputs));
 
 TEST_P(PredictSparse8FilTest, Predict) { compare(); }