Resolve merge conflicts

rapidsai · Jan 24, 2024 · 276a7d9 · 276a7d9
1 parent 3436482
commit 276a7d9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cpp/include/raft/sparse/distance/detail/coo_spmv_strategies/hash_strategy.cuh b/cpp/include/raft/sparse/distance/detail/coo_spmv_strategies/hash_strategy.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2021-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,11 +43,11 @@ namespace detail {
 template <typename value_idx, typename value_t, int tpb>
 class hash_strategy : public coo_spmv_strategy<value_idx, value_t, tpb> {
  public:
-  using insert_type =
-    typename cuco::static_map<value_idx, value_t, cuda::thread_scope_block>::device_mutable_view;
+  using insert_type = typename cuco::legacy::
+    static_map<value_idx, value_t, cuda::thread_scope_block>::device_mutable_view;
   using smem_type = typename insert_type::slot_type*;
   using find_type =
-    typename cuco::static_map<value_idx, value_t, cuda::thread_scope_block>::device_view;
+    typename cuco::legacy::static_map<value_idx, value_t, cuda::thread_scope_block>::device_view;
 
   hash_strategy(const distances_config_t<value_idx, value_t>& config_,
                 float capacity_threshold_ = 0.5,