another round of PR comments

rapidsai · Sep 13, 2023 · b6db05e · b6db05e
1 parent 9e553fb
commit b6db05e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/cpp/include/cugraph/mtmg/detail/per_device_edgelist.hpp b/cpp/include/cugraph/mtmg/detail/per_device_edgelist.hpp
@@ -53,9 +53,10 @@ namespace detail {
 template <typename vertex_t, typename weight_t, typename edge_t, typename edge_type_t>
 class per_device_edgelist_t {
  public:
+  per_device_edgelist_t()                                        = delete;
   per_device_edgelist_t(per_device_edgelist_t const&)            = delete;
   per_device_edgelist_t& operator=(per_device_edgelist_t const&) = delete;
-  per_device_edgelist_t& operator=(per_device_edgelist_t&&)      = default;
+  per_device_edgelist_t& operator=(per_device_edgelist_t&&)      = delete;
 
   per_device_edgelist_t(cugraph::mtmg::handle_t const& handle,
                         size_t device_buffer_size,
@@ -83,7 +84,7 @@ class per_device_edgelist_t {
 
   per_device_edgelist_t(per_device_edgelist_t&& other)
     : device_buffer_size_{other.device_buffer_size_},
-      current_pos_{0},
+      current_pos_{other.current_pos_},
       src_{std::move(other.src_)},
       dst_{std::move(other.dst_)},
       wgt_{std::move(other.wgt_)},
@@ -260,13 +261,13 @@ class per_device_edgelist_t {
   mutable std::mutex lock_{};
 
   size_t current_pos_{0};
-  size_t device_buffer_size_;
+  size_t device_buffer_size_{0};
 
-  std::vector<rmm::device_uvector<vertex_t>> src_;
-  std::vector<rmm::device_uvector<vertex_t>> dst_;
-  std::optional<std::vector<rmm::device_uvector<weight_t>>> wgt_;
-  std::optional<std::vector<rmm::device_uvector<edge_t>>> edge_id_;
-  std::optional<std::vector<rmm::device_uvector<edge_type_t>>> edge_type_;
+  std::vector<rmm::device_uvector<vertex_t>> src_{};
+  std::vector<rmm::device_uvector<vertex_t>> dst_{};
+  std::optional<std::vector<rmm::device_uvector<weight_t>>> wgt_{};
+  std::optional<std::vector<rmm::device_uvector<edge_t>>> edge_id_{};
+  std::optional<std::vector<rmm::device_uvector<edge_type_t>>> edge_type_{};
 };
 
 }  // namespace detail

diff --git a/cpp/include/cugraph/mtmg/per_thread_edgelist.hpp b/cpp/include/cugraph/mtmg/per_thread_edgelist.hpp
@@ -163,11 +163,11 @@ class per_thread_edgelist_t {
  private:
   detail::per_device_edgelist_t<vertex_t, weight_t, edge_t, edge_type_t>& edgelist_;
   size_t current_pos_{0};
-  std::vector<vertex_t> src_;
-  std::vector<vertex_t> dst_;
-  std::optional<std::vector<weight_t>> wgt_;
-  std::optional<std::vector<edge_t>> edge_id_;
-  std::optional<std::vector<edge_type_t>> edge_type_;
+  std::vector<vertex_t> src_{};
+  std::vector<vertex_t> dst_{};
+  std::optional<std::vector<weight_t>> wgt_{};
+  std::optional<std::vector<edge_t>> edge_id_{};
+  std::optional<std::vector<edge_type_t>> edge_type_{};
 };
 
 }  // namespace mtmg