Merge pull request #11 from iraikov/fix/drivers_type

Fixes for the types of various iterators as used in driver programs

Author: iraikov

include/neuroh5_types.hh

@@ -211,7 +211,9 @@ namespace neuroh5
 
   typedef std::map<rank_t, edge_map_t> rank_edge_map_t;
 
-  typedef rank_edge_map_t::const_iterator rank_edge_map_iter_t;
+  typedef rank_edge_map_t::const_iterator rank_edge_map_const_iter_t;
+
+  typedef rank_edge_map_t::iterator rank_edge_map_iter_t;
 
   typedef map<CELL_IDX_T, set<rank_t> > node_rank_map_t;
 

src/driver/neurograph_reader.cc

@@ -1,10 +1,10 @@
 // -*- mode: c++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 //==============================================================================
-///  @file reader.cc
+///  @file neurograph_reader.cc
 ///
 ///  Driver program for read_graph function.
 ///
-///  Copyright (C) 2016-2020 Project NeuroH5.
+///  Copyright (C) 2016-2024 Project NeuroH5.
 //==============================================================================
 
 
@@ -63,15 +63,15 @@ void print_usage_full(char** argv)
  *****************************************************************************/
 
 void output_projection(string outfilename,
-                       const edge_map_t& projection)
+                       edge_map_t& projection)
 {
   DEBUG("output_projection: outfilename is ",outfilename,"\n");
 
 
   ofstream outfile;
   outfile.open(outfilename.c_str());
 
-  for (edge_map_iter_t iter = projection.cbegin(); iter != projection.cend(); iter++)
+  for (edge_map_iter_t iter = projection.begin(); iter != projection.end(); iter++)
     {
       const NODE_IDX_T& dst = iter->first;
       const edge_tuple_t& tup = iter->second;

src/driver/neurotrees_copy.cc

@@ -303,14 +303,14 @@ int main(int argc, char** argv)
   {
     // Create packed representation of the tree subset arranged per rank
     vector<char> sendbuf; 
-    vector<int> sendcounts, sdispls;
+    vector<size_t> sendcounts, sdispls;
     data::serialize_rank_tree_map (size, rank, tree_rank_map,
                                    sendcounts, sendbuf, sdispls);
     tree_rank_map.clear();
 
     // Send packed representation of the tree subset to the respective ranks
     vector<char> recvbuf; 
-    vector<int> recvcounts, rdispls;
+    vector<size_t> recvcounts, rdispls;
     throw_assert(mpi::alltoallv_vector(all_comm, MPI_CHAR, sendcounts, sdispls, sendbuf,
                                        recvcounts, rdispls, recvbuf) >= 0,
                  "neurotrees_copy: error while sending tree subset to assigned ranks"); 

src/driver/neurotrees_select.cc

@@ -4,7 +4,7 @@
 ///
 ///  Program for selecting tree subsets.
 ///
-///  Copyright (C) 2016-2021 Project Neurotrees.
+///  Copyright (C) 2016-2024 Project NeuroH5.
 //==============================================================================
 
 
@@ -540,14 +540,14 @@ int main(int argc, char** argv)
 
   // Created packed representation of the tree subset arranged per rank
   vector<char> sendbuf; 
-  vector<int> sendcounts, sdispls;
+  vector<size_t> sendcounts, sdispls;
   data::serialize_rank_tree_map (size, rank, tree_subset_rank_map,
                                  sendcounts, sendbuf, sdispls);
   tree_subset_rank_map.clear();
 
   // Send packed representation of the tree subset to the respective ranks
   vector<char> recvbuf; 
-  vector<int> recvcounts, rdispls;
+  vector<size_t> recvcounts, rdispls;
   throw_assert(mpi::alltoallv_vector(all_comm, MPI_CHAR, sendcounts, sdispls, sendbuf,
                                      recvcounts, rdispls, recvbuf) >= 0,
                "neurotrees_select: error while sending tree subset to assigned ranks");