Remove dead code (#257)

Nicolas Cornu · web-flow · commit ca97c39e80bb · 2020-02-20T14:22:59.000+01:00
* Remove dead code put in DEBUG what should be

Due to #if 0, if (0 &amp;&amp; ...) and #if 1 ||

* Remove empty function question
diff --git a/coreneuron/apps/main1.cpp b/coreneuron/apps/main1.cpp
@@ -147,15 +147,6 @@ int corenrn_embedded_run(int nthread, int have_gaps, int use_mpi, int use_fast_i
 }
 }
 
-#if 0
-#include <fenv.h>
-#define NRN_FEEXCEPT (FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW)
-int nrn_feenableexcept() {
-  int result = -1;
-  result = feenableexcept(NRN_FEEXCEPT);
-  return result;
-}
-#endif
 namespace coreneuron {
 void call_prcellstate_for_prcellgid(int prcellgid, int compute_gpu, int is_init);
 
diff --git a/coreneuron/io/global_vars.cpp b/coreneuron/io/global_vars.cpp
@@ -133,7 +133,7 @@ void set_globals(const char* path, bool cli_global_seed, int cli_global_seed_val
         }
     }
 
-#if 0
+#if DEBUG
   for (N2V::iterator i = n2v->begin(); i != n2v->end(); ++i) {
     printf("%s %ld %p\n", i->first.c_str(), i->second.first, i->second.second);
   }
diff --git a/coreneuron/io/nrn_checkpoint.cpp b/coreneuron/io/nrn_checkpoint.cpp
@@ -186,10 +186,8 @@ void write_checkpoint(NrnThread* nt, int nb_threads, const char* dir, bool swap_
 static void write_phase2(NrnThread& nt, FileHandlerWrap& fh) {
     std::ostringstream filename;
 
-#if 1 || CHKPNTDEBUG
     NrnThreadChkpnt& ntc = nrnthread_chkpnt[nt.id];
     filename << output_dir << "/" << ntc.file_id << "_2.dat";
-#endif
 
     fh.open(filename.str().c_str(), swap_bytes, std::ios::out);
     fh.checkpoint(2);
diff --git a/coreneuron/io/nrn_setup.cpp b/coreneuron/io/nrn_setup.cpp
@@ -702,9 +702,7 @@ void nrn_setup(const char* filesdat,
     // Note that rank with 0 dataset/cellgroup works fine
     nrn_threads_create(ngroup <= 1 ? 2 : ngroup);
 
-#if 1 || CHKPNTDEBUG  // only required for NrnThreadChkpnt.file_id
     nrnthread_chkpnt = new NrnThreadChkpnt[nrn_nthread];
-#endif
 
     if (nrn_nthread > 1) {
         // NetCvode construction assumed one thread. Need nrn_nthread instances
@@ -849,9 +847,9 @@ void read_phasegap(FileHandler& F, int imult, NrnThread& nt) {
 
     F.checkpoint(chkpntsave);
 
-#if 0
+#if DEBUG
   printf("%d read_phasegap tid=%d type=%d %s ix_vpre=%d nsrc=%d ntar=%d\n",
-    nrnmpi_myid, nt.id, si.type, memb_func[si.type].sym, si.ix_vpre,
+    nrnmpi_myid, nt.id, si.type, corenrn.get_memb_func(si.type).sym, si.ix_vpre,
     si.nsrc, si.ntar);
   for (int i=0; i < si.nsrc; ++i) {
     printf("sid_src %d %d\n", si.sid_src[i], si.v_indices[i]);
@@ -1194,10 +1192,8 @@ void read_phase2(FileHandler& F, int imult, NrnThread& nt) {
         assert(!F.fail());  // actually should assert that it is open
     }
     nrn_assert(imult >= 0);  // avoid imult unused warning
-#if 1 || CHKPNTDEBUG
     NrnThreadChkpnt& ntc = nrnthread_chkpnt[nt.id];
     ntc.file_id = gidgroups_w[nt.id];
-#endif
 
     int n_outputgid, ndiam, nmech, *tml_index, *ml_nodecount;
     if (direct) {
@@ -1598,7 +1594,7 @@ void read_phase2(FileHandler& F, int imult, NrnThread& nt) {
         permute_ptr(nt._v_parent_index, nt.end, p);
         node_permute(nt._v_parent_index, nt.end, p);
 
-#if 0
+#if DEBUG
 for (int i=0; i < nt.end; ++i) {
   printf("parent[%d] = %d\n", i, nt._v_parent_index[i]);
 }
@@ -2190,9 +2186,9 @@ static size_t memb_list_size(NrnThreadMembList* tml) {
     nbyte += corenrn.get_prop_dparam_size()[tml->index] * tml->ml->nodecount * sizeof(Datum);
 #ifdef DEBUG
     int i = tml->index;
-    printf("%s %d psize=%d ppsize=%d cnt=%d nbyte=%ld\n", memb_func[i].sym, i,
-           crnrn.get_prop_param_size()[i],
-           crnrn.get_prop_dparam_size()[i], tml->ml->nodecount, nbyte);
+    printf("%s %d psize=%d ppsize=%d cnt=%d nbyte=%ld\n", corenrn.get_memb_func(i).sym, i,
+           corenrn.get_prop_param_size()[i],
+           corenrn.get_prop_dparam_size()[i], tml->ml->nodecount, nbyte);
 #endif
     return nbyte;
 }
@@ -2217,7 +2213,7 @@ size_t input_presyn_size(void) {
     size_t nbyte =
         sizeof(gid2in) + sizeof(int) * gid2in.size() + sizeof(InputPreSyn*) * gid2in.size();
 #ifdef DEBUG
-    printf(" gid2in table bytes=~%ld size=%d\n", nbyte, gid2in->size());
+    printf(" gid2in table bytes=~%ld size=%d\n", nbyte, gid2in.size());
 #endif
     return nbyte;
 }
diff --git a/coreneuron/mechanism/mech/mod2c_core_thread.hpp b/coreneuron/mechanism/mech/mod2c_core_thread.hpp
@@ -25,16 +25,6 @@ namespace coreneuron {
     int _iml, int _cntml_padded, double *_p, Datum *_ppvar, ThreadDatum *_thread, NrnThread *_nt, \
         double _v
 
-#if 0
-
-typedef int (*DIFUN)(_threadargsproto_);
-typedef int (*NEWTFUN)(_threadargsproto_);
-typedef int (*SPFUN)(struct SparseObj*, double*, _threadargsproto_);
-#define difun(arg) (*arg)(_threadargs_);
-#define newtfun(arg) (*arg)(_threadargs_);
-
-#else
-
 /**
  * \todo: typedefs like DIFUN can be removed
  * \todo: macros for difun, newtfun, eulerfun are not necessary
@@ -55,8 +45,6 @@ extern int nrn_newton_steer(int, _threadargsproto_);
 extern int nrn_euler_steer(int, _threadargsproto_);
 #define eulerfun(arg) nrn_euler_steer(arg, _threadargs_);
 
-#endif
-
 typedef struct Elm {
     unsigned row;        /* Row location */
     unsigned col;        /* Column location */
diff --git a/coreneuron/mechanism/register_mech.cpp b/coreneuron/mechanism/register_mech.cpp
@@ -194,8 +194,8 @@ void nrn_writes_conc(int type, int /* unused */) {
     if (type == -1)
         return;
 
-#if 0
-	printf("%s reordered from %d to %d\n", memb_func[type].sym->name, type, lastion);
+#if DEBUG
+	printf("%s reordered from %d to %d\n", corenrn.get_memb_func(type).sym, type, lastion);
 #endif
     if (nrn_is_ion(type)) {
         ++lastion;
@@ -270,7 +270,7 @@ void hoc_register_dparam_semantics(int type, int ix, const char* name) {
             ion_write_depend(type, etype);
         }
     }
-#if 0
+#if DEBUG
 	printf("dparam semantics %s ix=%d %s %d\n", memb_func[type].sym,
 	  ix, name, memb_func[type].dparam_semantics[ix]);
 #endif
diff --git a/coreneuron/network/multisend.cpp b/coreneuron/network/multisend.cpp
@@ -368,18 +368,10 @@ void nrn_multisend_receive(NrnThread* nt) {
     int ncons = 0;
     int& s = multisend_receive_buffer[current_rbuf]->nsend_;
     int& r = multisend_receive_buffer[current_rbuf]->nrecv_;
-#if 0 && ENQUEUE == 2
-    unsigned long tfind, tsend;
-#endif
 //	w1 = nrn_wtime();
 #if NRN_MULTISEND & 1
     if (use_multisend_) {
         nrn_multisend_advance();
-#if 0 && ENQUEUE == 2
-    // want the overlap with computation, not conserve
-    tfind = enq2_find_time_;
-    tsend = enq2_enqueue_time_ - enq2_find_time_;
-#endif
         nrnmpi_barrier();
         nrn_multisend_advance();
         // with two phase we expect conservation to hold and ncons should
diff --git a/coreneuron/network/multisend_setup.cpp b/coreneuron/network/multisend_setup.cpp
@@ -21,7 +21,7 @@ namespace coreneuron {
 typedef std::map<int, InputPreSyn*> Gid2IPS;
 typedef std::map<int, PreSyn*> Gid2PS;
 
-#if 0
+#if DEBUG
 template <typename T>
 static void celldebug(const char* p, T& map) {
     FILE* f;
@@ -72,7 +72,7 @@ static void alltoalldebug(const char*, int*, int*, int*, int*, int*, int*) {
 }
 #endif
 
-#if 0
+#if DEBUG
 void phase1debug(int* targets_phase1) {
     FILE* f;
     char fname[100];
diff --git a/coreneuron/network/partrans_setup.cpp b/coreneuron/network/partrans_setup.cpp
@@ -144,7 +144,7 @@ void nrn_partrans::gap_mpi_setup(int ngroup) {
         assert(tar2data.find(sgid) != tar2data.end());
     }
 
-#if 0
+#if DEBUG
   printf("%d mpi outsrccnt_, outsrcdspl_, insrccnt, insrcdspl_\n", nrnmpi_myid);
   for (int i = 0; i < nrnmpi_numprocs; ++i) {
     printf("%d : %d %d %d %d\n", nrnmpi_myid, outsrccnt_[i], outsrcdspl_[i],
@@ -210,7 +210,7 @@ void nrn_partrans::gap_mpi_setup(int ngroup) {
         }
     }
 
-#if 0
+#if DEBUG
   // things look ok so far?
   for (int tid=0; tid < ngroup; ++tid) {
     nrn_partrans::SetupInfo& si = setup_info_[tid];
@@ -253,15 +253,6 @@ void nrn_partrans::gap_thread_setup(NrnThread& nt) {
     } else {
         ttd.halfgap_ml = nullptr;
     }
-#if 0
-  int ntar = ttd.halfgap_ml->nodecount;
-  assert(ntar == ttd.ntar);
-  int sz =halfgap_info->sz;
-
-  for (int i=0; i < ntar; ++i) {
-    ttd.insrc_indices[i] += sz;
-  }
-#endif
 }
 
 void nrn_partrans::gap_indices_permute(NrnThread& nt) {
diff --git a/coreneuron/permute/balance.cpp b/coreneuron/permute/balance.cpp
@@ -64,13 +64,6 @@ size_t warp_balance(size_t ncell, VecTNode& nodevec) {
         }
     }
 
-#if 0
-  size_t ncore = nwarp * warpsize;
-  size_t cells_per_type = ncell/(typedispl.size() - 1);
-  size_t ideal_ncycle = total_compart/ncore;
-  size_t avg_cells_per_warp = total_compart/(ncell*nwarp);
-#endif
-
     size_t ideal_compart_per_warp = total_compart / nwarp;
 
     size_t min_cells_per_warp = 0;
diff --git a/coreneuron/permute/cellorder.cpp b/coreneuron/permute/cellorder.cpp
@@ -104,11 +104,6 @@ static void print_quality2(int iwarp, InterleaveInfo& ii, int* p) {
     int* stride = ii.stride + ii.stridedispl[iwarp];
     int ncycle = ii.cellsize[iwarp];
 
-#if 0
-  int nodeend = ii.lastnode[iwarp+1];
-  int nnode = ii.lastnode[ii.nwarp];
-#endif
-
     int inode = nodebegin;
 
     size_t nn = 0;  // number of nodes in warp. '.'
@@ -406,7 +401,6 @@ void mk_cell_indices() {
 }
 #endif  // INTERLEAVE_DEBUG
 
-#if 1
 #define GPU_V(i) nt->_actual_v[i]
 #define GPU_A(i) nt->_actual_a[i]
 #define GPU_B(i) nt->_actual_b[i]
@@ -571,11 +565,6 @@ void solve_interleaved2(int ith) {
 #endif
 
     int ncore = nwarp * warpsize;
-#if 0 && defined(ENABLE_CUDA_INTERFACE)  // not implemented
-    NrnThread* d_nt = (NrnThread*) acc_deviceptr(nt);
-    InterleaveInfo* d_info = (InterleaveInfo*) acc_deviceptr(interleave_info+ith);
-    solve_interleaved2_launcher(d_nt, d_info);
-#else
 #ifdef _OPENACC
 // clang-format off
     #pragma acc parallel loop present(                  \
@@ -608,7 +597,6 @@ void solve_interleaved2(int ith) {
     }
 #ifdef _OPENACC
 #pragma acc wait(nt->stream_id)
-#endif
 #endif
     if (foo == 1) {
         return;
@@ -668,4 +656,3 @@ void solve_interleaved(int ith) {
     }
 }
 }  // namespace coreneuron
-#endif
diff --git a/coreneuron/permute/cellorder1.cpp b/coreneuron/permute/cellorder1.cpp
@@ -156,13 +156,13 @@ static void quality(VecTNode& nodevec, size_t max = 32) {
 
     // print result
     qcnt = 0;
-#if 0
-  for (map<size_t, size_t>::iterator it = qual.begin(); it != qual.end(); ++it) {
-    qcnt += it->second;
-    printf("%6ld %6ld\n", it->first, it->second);
+#if DEBUG
+  for (const auto& q: qual) {
+    qcnt += q.second;
+    printf("%6ld %6ld\n", q.first, q.second);
   }
 #endif
-#if 0
+#if DEBUG
   printf("qual.size=%ld  qual total nodes=%ld  nodevec.size=%ld\n",
     qual.size(), qcnt, nodevec.size());
 #endif
@@ -195,7 +195,7 @@ static void quality(VecTNode& nodevec, size_t max = 32) {
             }
         }
     }
-#if 0
+#if DEBUG
   printf("nrace = %ld (parent in same group of %ld nodes)\n", nrace1, max);
   printf("nrace = %ld (parent used more than once by same group of %ld nodes)\n", nrace2, max);
 #endif
@@ -261,24 +261,6 @@ static void set_groupindex(VecTNode& nodevec) {
     }
 }
 
-#if 0
-#define MSS MSS_ident_stat
-typedef map<size_t, size_t> MSS;
-static bool vsmss_comp(const pair<size_t, MSS*>& a, const pair<size_t, MSS*>& b) {
-  bool result = false;
-  const MSS::iterator& aa = a.second->begin();
-  const MSS::iterator& bb = b.second->begin();
-  if (aa->first < bb->first) {
-    result = true;
-  }else if (aa->first == bb->first) {
-    if (aa->second < bb->second) {
-      result = true;
-    }
-  }
-  return result;
-}
-#endif
-
 // how many identical trees and their levels
 // print when more than one instance of a type
 // reverse the sense of levels (all leaves are level 0) to get a good
@@ -304,34 +286,6 @@ static void ident_statistic(VecTNode& nodevec, size_t ncell) {
         }
         printf("\n");
     }
-
-#if 0
-  typedef map<size_t, MSS> MSMSS;
-  typedef vector<pair<size_t, MSS*> > VSMSS;
-  MSMSS info;
-  for (size_t i=0; i < nodevec.size(); ++i) {
-    TNode* nd = nodevec[i];
-    info[nd->hash][nd->level]++;
-  }
-
-  VSMSS vinfo;
-  for (MSMSS::iterator i = info.begin(); i != info.end(); ++i) {
-    vinfo.push_back(pair<size_t, MSS*>(i->first, &(i->second)));
-  }
-  std::sort(vinfo.begin(), vinfo.end(), vsmss_comp);
-
-  for (VSMSS::iterator i = vinfo.begin(); i < vinfo.end(); ++i) {
-    MSS* ival = i->second;
-    if (ival->size() > 1 || ival->begin()->second > 8) {
-      printf("hash %ld", i->first);
-      for (MSS::iterator j = ival->begin(); j != ival->end(); ++j) {
-        printf(" (%ld, %ld)", j->first, j->second);
-      }
-      printf("\n");
-    }
-  }
-  printf("max level = %ld\n", maxlevel);
-#endif
 }
 #undef MSS
 
@@ -353,8 +307,6 @@ int* node_order(int ncell,
                 int*& cellsize,
                 int*& stridedispl) {
     VecTNode nodevec;
-    if (0)
-        prtree(nodevec);  // avoid unused warning
 
     // nodevec[0:ncell] in increasing size, with identical trees together,
     // and otherwise nodeindex order
@@ -373,7 +325,7 @@ int* node_order(int ncell,
     }
     check(nodevec);
 
-#if 0
+#if DEBUG
   for (int i=0; i < ncell; ++i) {
     TNode& nd = *nodevec[i];
     printf("%d size=%ld hash=%ld ix=%d\n", i, nd.treesize, nd.hash, nd.nodeindex);
@@ -510,7 +462,7 @@ void node_interleave_order(int ncell, VecTNode& nodevec) {
     //  std::sort(nodevec.begin() + ncell, nodevec.end(), contig_comp);
     std::sort(nodevec.begin() + ncell, nodevec.end(), interleave_comp);
 
-#if 0
+#if DEBUG
   for (size_t i=0; i < nodevec.size(); ++i) {
     TNode& nd = *nodevec[i];
     printf("%ld cell=%ld ix=%d\n",  i, nd.cellindex, nd.nodeindex);
@@ -663,7 +615,7 @@ static void admin2(int ncell,
         }
     }
 
-#if 0
+#if DEBUG
 printf("warp rootbegin nodebegin stridedispl\n");
 for (int i = 0; i <= nwarp; ++i){
   printf("%4d %4d %4d %4d\n", i, rootbegin[i], nodebegin[i], stridedispl[i]);
diff --git a/coreneuron/permute/cellorder2.cpp b/coreneuron/permute/cellorder2.cpp
diff --git a/coreneuron/permute/node_permute.cpp b/coreneuron/permute/node_permute.cpp
diff --git a/coreneuron/sim/fadvance_core.cpp b/coreneuron/sim/fadvance_core.cpp
diff --git a/coreneuron/sim/scopmath/sparse_thread.cpp b/coreneuron/sim/scopmath/sparse_thread.cpp
diff --git a/coreneuron/sim/treeset_core.cpp b/coreneuron/sim/treeset_core.cpp
diff --git a/coreneuron/utils/nrntimeout.cpp b/coreneuron/utils/nrntimeout.cpp

Original file line number	Diff line number	Diff line change
`@@ -147,15 +147,6 @@ int corenrn_embedded_run(int nthread, int have_gaps, int use_mpi, int use_fast_i`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`		`-#if 0`
`151`		`-#include <fenv.h>`
`152`		`-#define NRN_FEEXCEPT (FE_DIVBYZERO \| FE_INVALID \| FE_OVERFLOW)`
`153`		`-int nrn_feenableexcept() {`
`154`		`- int result = -1;`
`155`		`- result = feenableexcept(NRN_FEEXCEPT);`
`156`		`- return result;`
`157`		`-}`
`158`		`-#endif`
`159`	`150`	`namespace coreneuron {`
`160`	`151`	`void call_prcellstate_for_prcellgid(int prcellgid, int compute_gpu, int is_init);`
`161`	`152`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ void set_globals(const char* path, bool cli_global_seed, int cli_global_seed_val`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
`136`		`-#if 0`
	`136`	`+#if DEBUG`
`137`	`137`	`for (N2V::iterator i = n2v->begin(); i != n2v->end(); ++i) {`
`138`	`138`	`printf("%s %ld %p\n", i->first.c_str(), i->second.first, i->second.second);`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ void nrn_partrans::gap_mpi_setup(int ngroup) {`
`144`	`144`	`assert(tar2data.find(sgid) != tar2data.end());`
`145`	`145`	`}`
`146`	`146`
`147`		`-#if 0`
	`147`	`+#if DEBUG`
`148`	`148`	`printf("%d mpi outsrccnt_, outsrcdspl_, insrccnt, insrcdspl_\n", nrnmpi_myid);`
`149`	`149`	`for (int i = 0; i < nrnmpi_numprocs; ++i) {`
`150`	`150`	`printf("%d : %d %d %d %d\n", nrnmpi_myid, outsrccnt_[i], outsrcdspl_[i],`
`@@ -210,7 +210,7 @@ void nrn_partrans::gap_mpi_setup(int ngroup) {`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`
`213`		`-#if 0`
	`213`	`+#if DEBUG`
`214`	`214`	`// things look ok so far?`
`215`	`215`	`for (int tid=0; tid < ngroup; ++tid) {`
`216`	`216`	`nrn_partrans::SetupInfo& si = setup_info_[tid];`
`@@ -253,15 +253,6 @@ void nrn_partrans::gap_thread_setup(NrnThread& nt) {`
`253`	`253`	`} else {`
`254`	`254`	`ttd.halfgap_ml = nullptr;`
`255`	`255`	`}`
`256`		`-#if 0`
`257`		`- int ntar = ttd.halfgap_ml->nodecount;`
`258`		`- assert(ntar == ttd.ntar);`
`259`		`- int sz =halfgap_info->sz;`
`260`		`-`
`261`		`- for (int i=0; i < ntar; ++i) {`
`262`		`- ttd.insrc_indices[i] += sz;`
`263`		`- }`
`264`		`-#endif`
`265`	`256`	`}`
`266`	`257`
`267`	`258`	`void nrn_partrans::gap_indices_permute(NrnThread& nt) {`
Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,6 @@ size_t warp_balance(size_t ncell, VecTNode& nodevec) {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-#if 0`
`68`		`- size_t ncore = nwarp * warpsize;`
`69`		`- size_t cells_per_type = ncell/(typedispl.size() - 1);`
`70`		`- size_t ideal_ncycle = total_compart/ncore;`
`71`		`- size_t avg_cells_per_warp = total_compart/(ncell*nwarp);`
`72`		`-#endif`
`73`		`-`
`74`	`67`	`size_t ideal_compart_per_warp = total_compart / nwarp;`
`75`	`68`
`76`	`69`	`size_t min_cells_per_warp = 0;`