FIX: distributed knn double sqrt bug (#2733)

* FIX: distributed knn double sqrt bug * fixed * Update cpp/oneapi/dal/algo/knn/backend/gpu/infer_kernel_impl_dpc.hpp * Update cpp/oneapi/dal/algo/knn/backend/gpu/infer_kernel_impl_dpc.hpp
oneapi-src · Apr 30, 2024 · 8e7fc7a · 8e7fc7a
1 parent 693898e
commit 8e7fc7a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/cpp/oneapi/dal/algo/knn/backend/gpu/infer_kernel_impl_dpc.hpp b/cpp/oneapi/dal/algo/knn/backend/gpu/infer_kernel_impl_dpc.hpp
@@ -286,12 +286,12 @@ class knn_callback {
 
         const auto& [first, last] = bnds;
         ONEDAL_ASSERT(last > first);
-        auto& queue = this->queue_;
 
         bk::event_vector ndeps{ deps.cbegin(), deps.cend() };
-        auto sq_event = copy_with_sqrt(queue, inp_dts, inp_dts, deps);
-        if (this->compute_sqrt_)
-            ndeps.push_back(sq_event);
+        if (this->compute_sqrt_) {
+            auto sqrt_event = copy_with_sqrt(this->queue_, inp_dts, inp_dts, deps);
+            ndeps.push_back(sqrt_event);
+        }
 
         auto out_rps = this->responses_.get_slice(first, last);
         ONEDAL_ASSERT((last - first) == out_rps.get_count());
@@ -310,12 +310,12 @@ class knn_callback {
 
         const auto& [first, last] = bnds;
         ONEDAL_ASSERT(last > first);
-        auto& queue = this->queue_;
 
         bk::event_vector ndeps{ deps.cbegin(), deps.cend() };
-        auto sq_event = copy_with_sqrt(queue, inp_dts, inp_dts, deps);
-        if (this->compute_sqrt_)
-            ndeps.push_back(sq_event);
+        if (this->compute_sqrt_) {
+            auto sqrt_event = copy_with_sqrt(this->queue_, inp_dts, inp_dts, deps);
+            ndeps.push_back(sqrt_event);
+        }
 
         auto out_rps = this->responses_.get_slice(first, last);
         ONEDAL_ASSERT((last - first) == out_rps.get_count());

diff --git a/cpp/oneapi/dal/algo/knn/backend/gpu/infer_kernel_impl_dpc_distr.hpp b/cpp/oneapi/dal/algo/knn/backend/gpu/infer_kernel_impl_dpc_distr.hpp
@@ -347,16 +347,10 @@ class knn_callback_distr {
 
         const auto& [first, last] = bnds;
         ONEDAL_ASSERT(last > first);
-        auto& queue = this->queue_;
-
-        bk::event_vector ndeps{ deps.cbegin(), deps.cend() };
-        auto sq_event = copy_with_sqrt(queue, inp_dts, inp_dts, deps);
-        if (this->compute_sqrt_)
-            ndeps.push_back(sq_event);
 
         auto out_rps = this->responses_.get_slice(first, last);
         ONEDAL_ASSERT((last - first) == out_rps.get_count());
-        return (*(this->distance_voting_))(tmp_rps, inp_dts, out_rps, ndeps);
+        return (*(this->distance_voting_))(tmp_rps, inp_dts, out_rps, deps);
     }
 
     template <typename T = Task, typename = detail::enable_if_regression_t<T>>
@@ -371,16 +365,10 @@ class knn_callback_distr {
 
         const auto& [first, last] = bnds;
         ONEDAL_ASSERT(last > first);
-        auto& queue = this->queue_;
-
-        bk::event_vector ndeps{ deps.cbegin(), deps.cend() };
-        auto sq_event = copy_with_sqrt(queue, inp_dts, inp_dts, deps);
-        if (this->compute_sqrt_)
-            ndeps.push_back(sq_event);
 
         auto out_rps = this->responses_.get_slice(first, last);
         ONEDAL_ASSERT((last - first) == out_rps.get_count());
-        return (*(this->distance_regression_))(tmp_rps, inp_dts, out_rps, ndeps);
+        return (*(this->distance_regression_))(tmp_rps, inp_dts, out_rps, deps);
     }
 
     sycl::event output_responses(const std::pair<idx_t, idx_t>& bnds,