Fix mod files double loading issues

Author: filippomc

netpyne_ui/mod_utils.py

@@ -1,3 +1,4 @@
+import logging
 import shutil
 import subprocess
 import os
@@ -29,24 +30,27 @@ def is_loaded_mechanisms():
 def loadModMechFiles(compileMod, modFolder, forceRecompile=False):
     # Create Symbolic link
 
-    if compileMod:
         try:
+
             owd = os.getcwd()
-            modPath = os.path.join(str(modFolder), "x86_64")
+            if compileMod:
+                
+                compiledModPath = os.path.join(str(modFolder), "x86_64")
 
-            if os.path.exists(modPath):
-                if forceRecompile:
-                    shutil.rmtree(modPath)
-                else:
-                    return
+                if os.path.exists(compiledModPath) and forceRecompile:
+                        logging.info("Forcing mod files to recompile in %s" % modFolder)
+                        shutil.rmtree(compiledModPath)
 
-            os.chdir(modFolder)
-            subprocess.call(["nrnivmodl"])
-            os.chdir('..')
+                if not os.path.exists(compiledModPath):
+                    logging.info("Compiling mod files in %s" % modFolder)
+                    os.chdir(modFolder)
+                    subprocess.call(["nrnivmodl"])
+                    os.chdir('..')
 
             try:
                 neuron.load_mechanisms(str(modFolder))
             except:
+                logging.exception("Error loading mechanisms")
                 raise
         finally:
             os.chdir(owd)

netpyne_ui/netpyne_geppetto.py

@@ -46,7 +46,6 @@
 
 os.chdir(constants.NETPYNE_WORKDIR_PATH)
 
-neuron.nrn_dll_loaded.append(os.path.join(NETPYNE_WORKDIR_PATH, 'mod'))  # Avoids to load workspace modfiles twice
 
 class NetPyNEGeppetto:
 
@@ -581,7 +580,7 @@ def importModel(self, modelParameters):
                 #   Only on import or better before every simulation or network instantiation?
                 sim.initialize()
             return utils.getJSONReply()
-        except Exception:
+        except:
             message = "Error while importing the NetPyNE model"
             logging.exception(message)
             return utils.getJSONError(message, sys.exc_info())

webapp/redux/middleware/middleware.js

@@ -400,7 +400,7 @@ export default (store) => (next) => (action) => {
 
       const params = {
         modFolder: dirname + '/mod',
-        loadMod: false,
+        loadMod: true,
         compileMod: true,
         forceRecompile: false,