fixes wip

Author: filippomc

netpyne_ui/mod_utils.py

@@ -26,7 +26,7 @@ def is_loaded_mechanisms():
         return True
 
 
-def compileModMechFiles(compileMod, modFolder):
+def loadModMechFiles(compileMod, modFolder, forceRecompile=False):
     # Create Symbolic link
     if compileMod:
         modPath = os.path.join(str(modFolder), "x86_64")
@@ -39,6 +39,21 @@ def compileModMechFiles(compileMod, modFolder):
         os.chdir('..')
 
         try:
-            neuron.load_mechanisms(str(modFolder))
-        except:
-            raise
+            owd = os.getcwd()
+            modPath = os.path.join(str(modFolder), "x86_64")
+
+            if os.path.exists(modPath):
+                if forceRecompile:
+                    shutil.rmtree(modPath)
+                return
+
+            os.chdir(modFolder)
+            subprocess.call(["nrnivmodl"])
+            os.chdir('..')
+
+            try:
+                neuron.load_mechanisms(str(modFolder))
+            except:
+                raise
+        finally:
+            os.chdir(owd)

netpyne_ui/netpyne_geppetto.py

@@ -509,7 +509,12 @@ def importModel(self, modelParameters):
             # TODO: this must be integrated into the general lifecycle of "model change -> simulate"
             #   Shouldn't be specific to Import
             sim.clearAll()
-
+        try:
+            loadModMechFiles(modelParameters['compileMod'], modelParameters['modFolder'], modelParameters.get("forceRecompile", True))
+        except Exception:
+            message = "Error while importing/compiling mods"
+            logging.exception(message)
+            return utils.getJSONError(message, sys.exc_info())
         try:
             # Get Current dir
             owd = os.getcwd()

webapp/redux/middleware/middleware.js

@@ -392,6 +392,7 @@ export default (store) => (next) => (action) => {
         modFolder: 'mod',
         loadMod: false,
         compileMod: false,
+        forceRecompile: false,
 
         netParamsPath: '.',
         netParamsModuleName: tutName,