Fix warning by returning true in try_lock and remove byteswap1.dat code (#387)

* Fix warning by return true in try_lock
* byteswap1.dat is removed from neuron; cleanup unnecessary code from coreneuron
Co-authored-by: pramodk <[email protected]>

Author: Nicolas Cornu

coreneuron/apps/main1.cpp

@@ -249,7 +249,7 @@ void nrn_init_and_load_data(int argc,
     use_phase2_ = (corenrn_param.ms_phases == 2) ? 1 : 0;
 
     // reading *.dat files and setting up the data structures, setting mindelay
-    nrn_setup(filesdat.c_str(), is_mapping_needed, nrn_need_byteswap, run_setup_cleanup,
+    nrn_setup(filesdat.c_str(), is_mapping_needed, run_setup_cleanup,
               corenrn_param.datpath.c_str(), restore_path.c_str(), &corenrn_param.mindelay);
 
     // Allgather spike compression and  bin queuing.

coreneuron/io/mk_mech.cpp

@@ -50,24 +50,6 @@ extern int nrn_nobanner_;
 
 // NB: this should go away
 extern const char* nrn_version(int);
-
-bool nrn_need_byteswap;
-// following copied (except for nrn_need_byteswap line) from NEURON ivocvect.cpp
-#define BYTEHEADER   \
-    uint32_t _II__;  \
-    char* _IN__;     \
-    char _OUT__[16]; \
-    bool BYTESWAP_FLAG = false;
-#define BYTESWAP(_X__, _TYPE__)                                 \
-    BYTESWAP_FLAG = nrn_need_byteswap;                          \
-    if (BYTESWAP_FLAG) {                                        \
-        _IN__ = (char*)&(_X__);                                 \
-        for (_II__ = 0; _II__ < sizeof(_TYPE__); _II__++) {     \
-            _OUT__[_II__] = _IN__[sizeof(_TYPE__) - _II__ - 1]; \
-        }                                                       \
-        (_X__) = *((_TYPE__*)&_OUT__);                          \
-    }
-
 std::map<std::string, int> mech2type;
 
 extern "C" {
@@ -99,27 +81,6 @@ void mk_mech(const char* datpath) {
         mk_mech(fs);
         fs.close();
     }
-
-    {
-        std::string fname = std::string(datpath) + "/byteswap1.dat";
-        FILE* f = fopen(fname.c_str(), "r");
-        if (!f) {
-            fprintf(stderr, "Error: couldn't find byteswap1.dat file in the dataset directory \n");
-        }
-        nrn_assert(f);
-        // file consists of int32_t binary 1 . After reading can decide if
-        // binary info in files needs to be byteswapped.
-        int32_t x;
-        nrn_assert(fread(&x, sizeof(int32_t), 1, f) == 1);
-        nrn_need_byteswap = false;
-        if (x != 1) {
-            BYTEHEADER;
-            nrn_need_byteswap = true;
-            BYTESWAP(x, int32_t);
-            nrn_assert(x == 1);
-        }
-        fclose(f);
-    }
 }
 
 // we are embedded in NEURON, get info as stringstream from nrnbbcore_write.cpp
@@ -128,7 +89,6 @@ static void mk_mech() {
     if (already_called) {
         return;
     }
-    nrn_need_byteswap = false;
     std::stringstream ss;
     nrn_assert(nrn2core_mkmech_info_);
     (*nrn2core_mkmech_info_)(ss);

coreneuron/io/nrn_setup.cpp

@@ -399,7 +399,6 @@ void nrn_setup_cleanup() {
 
 void nrn_setup(const char* filesdat,
                bool is_mapping_needed,
-               bool /* byte_swap */,
                bool run_setup_cleanup,
                const char* datpath,
                const char* restore_path,

coreneuron/nrniv/nrniv_decl.h

@@ -57,7 +57,6 @@ extern void mk_netcvode(void);
 extern void nrn_p_construct(void);
 extern void nrn_setup(const char* filesdat,
                       bool is_mapping_needed,
-                      bool byte_swap, // We keep it for backward API compatibility but it is not used
                       bool run_setup_cleanup = true,
                       const char* datapath = "",
                       const char* restore_path = "",
@@ -73,7 +72,6 @@ extern void nrn_set_extra_thread0_vdata(void);
 extern Point_process* nrn_artcell_instantiate(const char* mechname);
 extern int nrnmpi_spike_compress(int nspike, bool gidcompress, int xchng);
 extern bool nrn_use_bin_queue_;
-extern bool nrn_need_byteswap;
 
 extern void nrn_outputevent(unsigned char, double);
 extern void ncs2nrn_integrate(double tstop);

coreneuron/utils/nrnmutdec.h

@@ -156,7 +156,9 @@ class OMP_Mutex {
         void unlock() {}
 
         // Lockable
-        bool try_lock() {}
+        bool try_lock() {
+            return true;
+        }
 };
 #endif