removed debug

Aapo Kyrola · Aapo Kyrola · commit e176e341124c · 2014-04-11T14:21:59.000-07:00
diff --git a/src/engine/dynamic_graphs/graphchi_dynamicgraph_engine.hpp b/src/engine/dynamic_graphs/graphchi_dynamicgraph_engine.hpp
@@ -361,7 +361,6 @@ namespace graphchi {
                     created_edge<EdgeDataType> * edge = buffer_for_window[ebi];
                     if (edge->dst >= window_st && edge->dst <= window_en) {
                         if (vertices[edge->dst - window_st].scheduled) {
-                            assert(edge->data < 1e20);
                             if (vertices[edge->dst-window_st].scheduled)
                                 vertices[edge->dst - window_st].add_inedge(edge->src, &edge->data, false);
                             ncreated++;
diff --git a/src/engine/graphchi_engine.hpp b/src/engine/graphchi_engine.hpp
@@ -412,13 +412,12 @@ namespace graphchi {
             do {
                 omp_set_num_threads(exec_threads);
                 
-                    
         #pragma omp parallel sections 
                     {
         #pragma omp section
                         {
-        #pragma omp parallel for schedule(dynamic)
-                            for(int idx=0; idx <= (int)sub_interval_len; idx++) {
+        #pragma omp parallel for
+                        for(int idx=0; idx <= (int)sub_interval_len; idx++) {
                                 vid_t vid = sub_interval_st + (randomization ? random_order[idx] : idx);
                                 svertex_t & v = vertices[vid - sub_interval_st];
                                 
@@ -466,6 +465,7 @@ namespace graphchi {
         virtual void exec_updates_inmemory_mode(GraphChiProgram<VertexDataType, EdgeDataType, svertex_t> &userprogram,
                                         std::vector<svertex_t> &vertices) {
             work = nupdates = 0;
+            
             for(iter=0; iter<niters; iter++) {
                 logstream(LOG_INFO) << "In-memory mode: Iteration " << iter << " starts. (" << chicontext.runtime() << " secs)" << std::endl;
                 chicontext.iteration = iter;
@@ -506,7 +506,12 @@ namespace graphchi {
                     }
                 }
                 
+                m.start_time("inmem-exec");
+                
                 exec_updates(userprogram, vertices);
+                
+                m.stop_time("inmem-exec");
+                
                 load_after_updates(vertices);
                 
                 userprogram.after_exec_interval(0, (int)num_vertices(), chicontext);
