Squashed 'moose-examples/' changes from cd2a2b9..37bf0cc
37bf0cc This might pass with upcoming release 3.1.3. feef205 Merge branch 'master' of github.com:BhallaLab/moose-examples c41af29 import fix to another file. 2d30a30 Output comparision of GPU & CPU (#26) 7295a8f numpy.array changed to np.array 664f843 Maximum timeout is 1m for all script. 0458697 Fixes to one more script. Error due to merge conflicts. 27fddec Updated script. 0694972 Run scripts now launches 8 process in parallel. 15d3aa7 Merge branch 'master' of github.com:BhallaLab/moose-examples 62d6c58 Enabled trap in bash script. Kill running test when user presses ctrl+c. 65fb8a8 Added beta cmake based test flow. 987c3fb Moved CMakeLists.txt to _travis folder. Old bash style build system is sufficient. d4a081f Removed one more duplicate file. 9b13403 Removed duplicate files. 98b5eb0 Fixes to script. Runs fine now. c42aa93 One more fix. 626221e Removed merge conflict. f1b0bc4 Fixed one more script to make it work. 09ca09e Merge branch 'master' o...
Showing
- CMakeLists.txt 87 additions, 0 deletionsCMakeLists.txt
- _travis/matplotlibrc 1 addition, 1 deletion_travis/matplotlibrc
- _travis/run_scripts.sh 13 additions, 2 deletions_travis/run_scripts.sh
- cuda/check_error.py 16 additions, 0 deletionscuda/check_error.py
- cuda/check_script.sh 45 additions, 0 deletionscuda/check_script.sh
- cuda/testScript.py 20 additions, 7 deletionscuda/testScript.py
- genesis/Kholodenko_tosbml.xml 935 additions, 0 deletionsgenesis/Kholodenko_tosbml.xml
- neuroml/allChannelsCell/allChannelsCell.py 3 additions, 3 deletionsneuroml/allChannelsCell/allChannelsCell.py
- paper-2015/rxdSpineSize.py 0 additions, 278 deletionspaper-2015/rxdSpineSize.py
- snippets/RandSpikeStats.py 2 additions, 2 deletionssnippets/RandSpikeStats.py
- snippets/analogStimTable.py 0 additions, 4 deletionssnippets/analogStimTable.py
- snippets/analogStimTable.py~ 0 additions, 95 deletionssnippets/analogStimTable.py~
- snippets/convert_Genesis2Sbml.py 1 addition, 2 deletionssnippets/convert_Genesis2Sbml.py
- snippets/crossComptNeuroMesh.py.png 0 additions, 0 deletionssnippets/crossComptNeuroMesh.py.png
- snippets/crossComptSimpleReac.py 2 additions, 2 deletionssnippets/crossComptSimpleReac.py
- snippets/diffSpinyNeuron.py 0 additions, 2 deletionssnippets/diffSpinyNeuron.py
- snippets/funcInputToPools.py 1 addition, 1 deletionsnippets/funcInputToPools.py
- snippets/function.py~ 0 additions, 200 deletionssnippets/function.py~
- snippets/intfire.py 13 additions, 15 deletionssnippets/intfire.py
- snippets/lif.py 2 additions, 3 deletionssnippets/lif.py
Please register or sign in to comment