Merge branch 'fixes-model-build' into release/1.0.0-notebook-fix

Author: filippomc

netpyne_ui/mod_utils.py

@@ -26,7 +26,7 @@ def is_loaded_mechanisms():
         return True
 
 
-def loadModMechFiles(compileMod, modFolder):
+def loadModMechFiles(compileMod, modFolder, forceRecompile=False):
     # Create Symbolic link
 
     if compileMod:
@@ -35,7 +35,9 @@ def loadModMechFiles(compileMod, modFolder):
             modPath = os.path.join(str(modFolder), "x86_64")
 
             if os.path.exists(modPath):
-                shutil.rmtree(modPath)
+                if forceRecompile:
+                    shutil.rmtree(modPath)
+                return
 
             os.chdir(modFolder)
             subprocess.call(["nrnivmodl"])

netpyne_ui/netpyne_geppetto.py

@@ -550,7 +550,7 @@ def importModel(self, modelParameters):
             #   Shouldn't be specific to Import
             sim.clearAll()
         try:
-            loadModMechFiles(modelParameters['compileMod'], modelParameters['modFolder'])
+            loadModMechFiles(modelParameters['compileMod'], modelParameters['modFolder'], modelParameters.get("forceRecompile", True))
         except Exception:
             message = "Error while importing/compiling mods"
             logging.exception(message)

webapp/redux/middleware/middleware.js

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