From 5697e0971dc84edd343652d45dcb6a9edbb6cb76 Mon Sep 17 00:00:00 2001 From: Andy Adinets Date: Tue, 1 Dec 2020 22:07:27 +0100 Subject: [PATCH] Added a missing __syncthreads()(#3215) Added a missing `__syncthreads()`. - also re-enabled Sparse16 FIL tests - this should fix #3205 and #3206 Authors: - Andy Adinets - John Zedlewski <904524+JohnZed@users.noreply.github.com> - Dante Gama Dessavre Approvers: - Thejaswi Rao - null URL: https://github.com/rapidsai/cuml/pull/3215 --- CHANGELOG.md | 1 + cpp/src/fil/infer.cu | 1 + cpp/test/sg/fil_test.cu | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cfecf87ab..dab3c4c0c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -83,6 +83,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 index dc154ebcb2..1c46c76aeb 100644 --- a/cpp/src/fil/infer.cu +++ b/cpp/src/fil/infer.cu @@ -247,6 +247,7 @@ struct tree_aggregator_t : 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 index ec4e827b94..0d29e18626 100644 --- a/cpp/test/sg/fil_test.cu +++ b/cpp/test/sg/fil_test.cu @@ -752,8 +752,8 @@ std::vector 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(); }