fix

alibaba · Sep 19, 2024 · f900f43 · f900f43
1 parent 9ed0fab
commit f900f43
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/examples/analytical_apps/pagerank/pagerank_vc.h b/examples/analytical_apps/pagerank/pagerank_vc.h
@@ -55,7 +55,7 @@ class PageRankVC
 #endif
       typename fragment_t::template both_vertex_array_t<int> degree(
           frag.Vertices(), 0);
-#ifdef TRACKING_MEMORY_ALLOCATIONS
+#ifdef TRACKING_MEMORY
       // allocate degree array for both src and dst vertices
       MemoryTracker::GetInstance().allocate(frag.Vertices().size() *
                                             sizeof(int));
@@ -91,7 +91,7 @@ class PageRankVC
 
       messages.GatherMasterVertices<fragment_t, int, NumericSum<int>>(
           frag, degree, ctx.master_degree);
-#ifdef TRACKING_MEMORY_ALLOCATIONS
+#ifdef TRACKING_MEMORY
       // deallocate degree array for both src and dst vertices
       MemoryTracker::GetInstance().deallocate(frag.Vertices().size() *
                                               sizeof(int));

diff --git a/examples/analytical_apps/pagerank/pagerank_vc_context.h b/examples/analytical_apps/pagerank/pagerank_vc_context.h
@@ -34,7 +34,7 @@ class PageRankVCContext : public VertexDataContext<FRAG_T, double> {
     next_result.Init(fragment.Vertices());
     master_degree.Init(fragment.MasterVertices());
 
-#ifdef TRACKING_MEMORY_ALLOCATIONS
+#ifdef TRACKING_MEMORY
     MemoryTracker::GetInstance().allocate(fragment.Vertices().size() *
                                           sizeof(double));
     MemoryTracker::GetInstance().allocate(fragment.Vertices().size() *

diff --git a/examples/analytical_apps/run_app_vc.h b/examples/analytical_apps/run_app_vc.h
@@ -41,15 +41,15 @@ void CreateAndQueryVC(const CommSpec& comm_spec, const std::string& out_prefix,
       ImmutableVertexcutFragment<int64_t, grape::EmptyType, grape::EmptyType>;
   std::shared_ptr<FRAG_T> fragment = LoadVertexcutGraph<FRAG_T>(
       FLAGS_efile, FLAGS_vertex_num, comm_spec, graph_spec);
-#ifdef TRACKING_MEMORY_ALLOCATIONS
+#ifdef TRACKING_MEMORY
   VLOG(1) << "[worker-" << comm_spec.worker_id() << "] after loading graph: "
           << MemoryTracker::GetInstance().GetMemoryUsageInfo();
 #endif
   using AppType = APP_T<FRAG_T>;
   auto app = std::make_shared<AppType>();
   DoQuery<FRAG_T, AppType, Args...>(fragment, app, comm_spec, spec, out_prefix,
                                     args...);
-#ifdef TRACKING_MEMORY_ALLOCATIONS
+#ifdef TRACKING_MEMORY
   VLOG(1) << "[worker-" << comm_spec.worker_id() << "] after query: "
           << MemoryTracker::GetInstance().GetMemoryUsageInfo();
 #endif

diff --git a/grape/fragment/basic_vc_ds_fragment_loader.h b/grape/fragment/basic_vc_ds_fragment_loader.h
@@ -174,7 +174,6 @@ class BasicVCDSFragmentLoader {
             thread_local_cache_size);
 #endif
         while (got_edges_.Get(cur)) {
-          size_t cur_size = cur.size();
           foreach_rval(cur, [&edges_cache, this](oid_t src, oid_t dst,
                                                  edata_t data) {
             int bucket_id = bucketer_->get_bucket_id(src, dst);
@@ -190,7 +189,7 @@ class BasicVCDSFragmentLoader {
 #ifdef TRACKING_MEMORY
           // deallocate edge shuffle-in buffer
           MemoryTracker::GetInstance().deallocate(
-              (sizeof(oid_t) + sizeof(oid_t) + sizeof(edata_t)) * cur_size);
+              (sizeof(oid_t) + sizeof(oid_t) + sizeof(edata_t)) * cur.size());
 #endif
         }
         for (int i = 0; i < bucket_num_ * bucket_num_; ++i) {