Changeset 966 for trunk

Timestamp:

05/25/11 19:48:33 (12 months ago)

Author:

emuller

Message:

Moved python lib9ml nineml examples to be importable -> Adjusted PyNN nineml_neuron.py example accordingly

Location:

trunk

Files:

• examples/nineml_neuron.py (modified) (2 diffs)
• src/neuron/nineml.py (modified) (1 diff)

trunk/examples/nineml_neuron.py

@@ -5 +5 @@
 
 import sys
-from os.path import abspath, realpath, join
 import nineml
-root = abspath(join(realpath(nineml.__path__[0]), "../../.."))
-sys.path.append(join(root, "lib9ml/python/examples/AL"))
-sys.path.append(join(root, "code_generation/nmodl"))                
-leaky_iaf = __import__("leaky_iaf")
-coba_synapse = __import__("coba_synapse")
 import pyNN.neuron as sim
 from pyNN.neuron.nineml import nineml_cell_type
@@ -20 +14 @@
 init_logging(None, debug=True)
 sim.setup(timestep=0.1, min_delay=0.1, max_delay=2.0)
+
+
+# Get come models to work with
+from nineml.examples.AL import leaky_iaf
+from nineml.examples.AL import coba_synapse
 
 celltype_cls = nineml_cell_type("if_cond_exp",

trunk/src/neuron/nineml.py

@@ -95 +95 @@
     logger.debug("Writing NineML component to %s" % xml_file)
     nineml_component.write(xml_file)
+
+    # TODO: This way of importing is a cludge.
+    # To fix it, where should general nmodl code-generation live? Under nineml.code_generation ?
+    from os.path import abspath, realpath, join
+    import nineml, sys
+    root = abspath(join(realpath(nineml.__path__[0]), "../../.."))
+    sys.path.append(join(root, "code_generation/nmodl"))                
     nineml2nmodl = __import__("9ml2nmodl")
+
     nineml2nmodl.write_nmodl(xml_file, weight_variables) # weight variables should really come from xml file
     p = subprocess.check_call(["nrnivmodl"])