Changeset 188

Show
Ignore:
Timestamp:
01/29/08 11:03:59 (10 months ago)
Author:
apdavison
Message:

MAJOR CHANGES: merged multifile branch to trunk. The main changes:

(1) Simulator modules have been moved to a src subdirectory - this is to make distribution/installation of PyNN easier.

(2) Several of the modules have been split into multiple files, in their own subdirectories, e.g.: nest2.py --> nest2/__init__.py, nest2/cells.py and nest2/connectors.py. The reason for this is that the individual files were getting very long and difficult to navigate. It is not required, though. For example, I have kept neuroml.py as a single file because it was not too long. This change has broken a couple of the neuron unittests, and I haven't run the VAbenchmarks` test, but otherwise everything seems to work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/README

    r10 r188  
    1111Fetching the source: 
    1212 
    13 svn co https://neuralensemble.kip.uni-heidelberg.de/svn/PyNN/trunk pyNN   
     13svn co https://neuralensemble.org/svn/PyNN pyNN   
    1414 
    1515** Anonymous checkout is allowed 
    1616 
    17 Commiting Changes: 
     17Committing Changes: 
    1818 
    1919In the svn dir: 
    …… 
    2626**** 
    2727 
    28 http://neuralensemble.kip.uni-heidelberg.de/trac/PyNN 
     28http://neuralensemble.org/PyNN 

  • trunk/nest1.py

    r168 r188  
    180180            'v_init'    : ('u'           , "parameters['v_init']"), 
    181181    } 
    182     nest_name = "iaf_cond_alpha" 
     182    nest_name = "iaf_cond_neuron" 
    183183     
    184184    def __init__(self,parameters): 
    …… 
    18481848 
    18491849# ============================================================================== 
    1850   
    1851   

  • trunk/setup.py

    r81 r188  
    66    name = "PyNN", 
    77    version = "0.4.0alpha", 
    8     package_dir={'pyNN': ''}, 
    9     packages = ['pyNN'], 
     8    package_dir={'pyNN': 'src'}, 
     9    packages = ['pyNN','pyNN.nest2','pyNN.nest1','pyNN.pcsim','pyNN.neuron'], 
    1010    author = "The NeuralEnsemble Community", 
    1111    author_email = "pynn@neuralensemble.org", 

  • trunk/test/nest1tests.py

    r155 r188  
    416416                    for src,tgt in prj.connections(): 
    417417                        weights.append(nest.pynest.getWeight(src,tgt)) 
    418                     assert weights == [1000.0]*len(prj._sources) 
     418                    assert weights == [0.0]*len(prj._sources) # default weight is zero 
    419419     
    420420    def testOneToOne(self): 
    …… 
    454454                    for src, tgt in prj.connections(): 
    455455                        weights.append(nest.pynest.getWeight(src,tgt)) 
    456                     assert weights == [1000.0]*len(prj._sources) 
     456                    assert weights == [0.0]*len(prj._sources), weights 
    457457                     
    458458    def testSaveAndLoad(self): 

  • trunk/test/nrnpython

    r106 r188  
    11#!/bin/bash 
    2 ../hoc/$HOSTTYPE/special -python "$@" 
     2../src/hoc/$HOSTTYPE/special -python "$@" 

  • trunk/test/runtests.py

    r184 r188  
    2020        cmd = 'python ' + cmd + '.py ' + engine 
    2121    elif 'neuron' in engine: 
    22         cmd = '../hoc/i686/special -python ' + cmd + '.py %s' % engine 
     22        cmd = '../src/hoc/i686/special -python ' + cmd + '.py %s' % engine 
    2323    else: 
    2424        print 'Invalid simulation engine "%s". Valid values are "nest1", "nest2", "pcsim", "oldneuron" and "neuron"' % engine 
    …… 
    220220        compare_rasters(script, thresholds_ras[script]*(len(engine_list)-1), engine_list) 
    221221     
     222    if len(scripts_v)+len(scripts_ras) == 0: 
     223        print "Invalid test name(s)."