Skip to content
Snippets Groups Projects
  1. Feb 28, 2018
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 0c33b2c333..49d5b3ef6b · 6d651b60
      Dilawar Singh authored
      49d5b3ef6b Merge pull request #255 from dilawar/master
      f498d7c6a4 Merge branch 'master' of github.com:dilawar/moose-core
      c09dd9936f Cut down on unneccessary looping. It is logically equivalent to original block.
      aab34e125d Merge branch 'master' into master
      3568083113 replace has_key with python3 compatible statement.
      026d0a39b1 updated pre-commit config.
      b811def3bd Merge branch 'master' of github.com:BhallaLab/moose-core
      5bc1e1410a Merge pull request #254 from upibhalla/master
      b08b888f56 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      945fb6b961 Added funcDt to rdesigneur arguments, set sensible defaults
      760f554966 Update Function.cpp
      8e9bcb58ac Merge pull request #253 from upibhalla/master
      2f8dc9fcfe Merge branch 'master' of https://github.com/BhallaLab/moose-core
      b55e1a74ea Update to Synapse to permit set/get access to addSpike. Cascaded onto all SynHandlers. Update to rdesigneur to permit fullscreen display of Moogli.
      6eca687a68 Added deploy section in travis. Deploy on PyPi. Needs to add script t… (#251)
      c8f9101621 Fixed cmake error on osx when not compiled in debug mode. Affect only >=cmake-3.6
      f6ab07d0ef Update README.md
      0d3f850fe5 Update README.md
      cc94e3bd61 Set VERSION_MOOSE only
      948406bc17 Marked as release candidate 3.2.0rc1.
      b675c4d1bf Fixed build failure due to newline in output variable.
      bf8d39351e Add git hash to version.
      d95e58650f Python wheel for pymoose (#250)
      edbb4ce966 Fixing VERSION; MOOSE_VERSION; project name is moose-core.
      e245ef6a4d call project moose-core.
      9061927ca7 Build GSL with fPIC.
      230466ff32 updated dockerfile. Added missing gsl library.
      69bc228b34 rename to pymoose.
      41ef965e75 Heredocs are not supported in docker.
      f370b4aa19 Docker file has the script inline.
      b8b9679943 Time to merge into master branch.
      9c7241f1bd Wheels are built. Now use manylinux docker file to build them.
      c439f55046 Build in manylinux environment.
      108f71809d Wheel is created.
      d08ddf290f removed file.
      9d654b4cba no need to link with PYTHON_LIBS.
      
      git-subtree-dir: moose-core
      git-subtree-split: 49d5b3ef6b585ff1c64734f447ac08cd67d9996a
      6d651b60
  2. Nov 20, 2017
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from e5ba823ba..33d4803ee · 6f7697fb
      Dilawar Singh authored
      33d4803ee Merge pull request #228 from upibhalla/master
      c9e9fa6fd Update test_muparser.py
      419661b6e Update test_muparser.py
      7c8ca61a6 Merge branch 'master' of https://github.com/upibhalla/moose-core
      b13fc98cc Fix for muparser tests
      7eefdca47 Merge branch 'master' into master
      1ad271b07 Merge pull request #229 from dilawar/master
      30fe94cda Optimizations for rdesigneur in _parseComptField function
      d862de4e9 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      3eef327f1 Added instructions on what to do post-build.
      985af4e11 Fixes BhallaLab/moose#224 and BhallaLab/moose-core#230 .
      917d68db0 Merge branch 'master' of github.com:BhallaLab/moose-core
      586d48a62 Merge pull request #222 from hrani/master
      3c7ce10fa New line added
      e7c8d0e81 Merge branch 'master' of http://github.com/hrani/moose-core
      7ce91a0f2 import rdesigneur.rmoogli as rmoogli is added at init file, otherwise script that uses rmoogli gives and error "NameError: global name \'rmoogli\' is not defined"
      fd5f360d6 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      eb76ab120 Fix to Neuron.cpp handling of messages between Ca channels and Ca_conc objects.
      f9f188513 Merge branch 'master' into master
      67c9b0a85 Disabled seg-fault causing test on python3. Runs with python2.
      cd40023f2 disable seg-fault causing function on python3.
      761172460 Merge branch 'master' into master
      946cb77e7 call plotDEGF only once.
      47f6803df iteritems( ) is no longer supported by python3; replacing it with items().
      f447f0d35 Passes with python3.4 .
      1d26f38c2 import matplotlib in rdesigneur.display only when display is called.
      4b56d7a66 dependencies are handled by cmake now. Removing scripts.
      20c131a3f Added field Table::plotDump to substitute for the Table::xplot function which has problems with Moose interface to Python.
      2c7b9efc9 Merge branch 'master' into master
      8005f2f04 loading SBML was commented, now uncommenting while mergering
      
      git-subtree-dir: moose-core
      git-subtree-split: 33d4803eed211af61fd8b6f45d71e8675f77f951
      6f7697fb
  3. Oct 31, 2017
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 2657e3345..268a28862 · 7b3c355a
      Dilawar Singh authored
      268a28862 Merge pull request #224 from upibhalla/master
      3ab452e97 Fixed test_nsdf.py. It had relied on the old (and incorrect) function of the spike message to the Table. I have now updated the test_nsdf.py to work with the fixed version of the Table.
      616f33a60 Fixed spike timing functionality in Table class. Incorporated into rdesigneur so that tables can record spike times for saving, and users can plot spike times as a dot raster.
      7f372b6aa Merge pull request #223 from upibhalla/master
      186e91d68 Merge branch 'master' into master
      d91a681bf Fix on diffusion scaling in spines, and added Pool::volume field for plotting in rdesigneur.
      41c71b147 Merge pull request #221 from upibhalla/master
      e27ef8a45 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      b07046e15 New Neuron::getSpineIdsFromCompartmentIds function, needed for rdesineur to connect adaptors for spine size and other spine properties.
      69d985877 Merge pull request #220 from bhanu151/master
      4f67f3338 retracting seqActivation normalization by dt to restore time-step invariance
      ca1f36ca6 Merge pull request #219 from hrani/master
      be6dc0a28 Hopefully last cleanup
      e03c69ddd Hopefully last cleanup
      7332ff66b spell correction
      d17d383dc absolute import with mtypes just for python3
      fb28e1009 Hopefully last one, tested for filepath,moose path and moose object
      b782b9552 In merge.py, clean way of cheking the type of path provided, filepath,moose obj, moose path are taken,if source is empty then nothing to copy, if destination was empty list is update with new object
      dc0c83027 clean up with in mergeChemModel file
      13152346b cleanup in setup file
      1f9100b7f cleanup in init file
      50cd8feee removed unwanted lines and clean up
      e9b88cee7 folder "merge" renamed to "chemMerge", moose.py: func added so that chemMerge can be imported directly,cleanup in test_import.py with the changes made to this commit,merge.py file Neutral object is copied into des path instead of creating and now user have to genesis/SBML format
      072913a9c Merge pull request #218 from BhallaLab/missing_merge
      fab362fa7 Couple of lines added to moose import test.
      064fbea56 Fixed moose.merge import. Added a test which tests moose module import (incomplete).
      4211da0e8 Merge pull request #216 from hrani/master
      a45e9f0a1 Merge branch 'master' of http://github.com/hrani/moose-core
      dacd64039 some more checks made for empty model, empty compartment and for display atleast one reaction should exist for displaying into widget
      e0566d476 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      2db1b4dac Merge branch 'master' into master
      a62961a27 Merge pull request #217 from upibhalla/master
      15ee2cc7f Merge branch 'master' of https://github.com/BhallaLab/moose-core
      aca164612 Two important fixes for numerics of stochastic solver with diffusion. Affects models using sumtotals and functions.
      f5302b08f validator was switched off, which is not correct, so switching ON
      87e66a18d if in reaction stoichiometry is not defined then assume 1 and if no unit base unit defined then assume 1 which is mole
      38879fd5b Merge pull request #215 from hrani/master
      2384657e0 readSBML: explicitly ratio is set to 4, so that e2,e1 is balanced, If units are defined in the rate law for the reaction then checks are made and if not in milli mole the base unit then recalculate, spell correction. writeSBML: instead of printing error msg, saving into string for later use writekkit : instead of printing error msg, saving into string for later use
      798c0b6a7 Merge pull request #213 from hrani/master
      c1c26f698 Merge branch 'master' into master
      aa1cb43e2 Merge pull request #214 from bhanu151/master
      b60b73b3a SeqSynHnadler fixes - normalized seqActivation by dt
      3d36e7bd1 unwanted print statement is removed
      67e026ab8 function definition are read from SBML files, rules which are not read to moose a errorFlag is set out, rateLaw without unit definition, are taken from the substance units and recalculated for all higher reaction, validator checks if model is valid and send out errormsg if not valid, if model doesn't have atleast one compartment, then errormsg is send out
      91180c067 Merge pull request #210 from dilawar/master
      1f37c10f0 Python3/Python2 import thread has been fixed.
      012b5f3ca Preserve the order of plots. Use OrderedDict. Since OrderedDict is not available in python2.6; added implementation.
      78f244b0c Utility function to plot tables matching a regular expression.
      03dc5a8fc Fixed import error.
      2b9e30565 try/except import in moose.py file.
      574a12503 Added a test script.
      f5202b0cd Merge branch 'master' of github.com:BhallaLab/moose-core
      b792838ee Merge pull request #207 from hrani/master
      e39c76df2 resolved conflicts
      75e289296 all conflict a removed
      1e7ebbe3c unwanted statements
      98d625b62 Merge branch 'master' into master
      cdbe6add9 Fixed clock dt assignment bug in rdesigneur, came up when turnOffElec flag is true (#208)
      0da306f5a Fixed clock dt assignment bug in rdesigneur, came up when turnOffElec flag is true
      e9526f7c3 Fixes to import plot_util library.
      abd664d1e unwanted print statement removed
      fd794de74 in print stm space clean up,added findcompartment function to one common place, some space char are allowed in name field, in kkit writer, moose obj which doesn't have compartment are not written, which then appended to error msg for user
      5015b14cd Merge branch 'master' of github.com:BhallaLab/moose-core
      b32a0bbe9 Fixes to issue204 (#205)
      9f88d7c5f Merge pull request #203 from hrani/master
      6dbf8bef2 Merge branch 'master' of http://github.com/hrani/moose-core
      3c6d41ce4 Restoring contents after bad commit and bad merge
      1d34b9b2c Restored some old commit, after the bad commit and after revert fail
      f2d3e94ad Restored some old commit, after the bad commit and after revert fail
      daa657802 Restoring contents after bad commit and bad merge
      30b1c36b2 Merge pull request #202 from upibhalla/master
      24c079561 Restoring updates to ksolve including isBuffered flag
      d71f6eb53 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      eb43e5524 Fixed Rdesigneur verbose flag
      5e42df95c Merge branch 'master' of github.com:BhallaLab/moose-core
      3c46150a1 Merge branch 'master' of github.com:dilawar/moose-core
      b04156b03 Fixes to issue #200. (#201)
      1e3bbe04f Merge branch 'master' of github.com:BhallaLab/moose-core
      f11ef0a3f Added test script but has not been enabled. This tests the SparseMsg::connectionLists.
      
      git-subtree-dir: moose-core
      git-subtree-split: 268a2886219290af163c9c95b755901fa68cfa5d
      7b3c355a
  4. Jul 01, 2017
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 95fe1a7..891f2f8 · 750df413
      Dilawar Singh authored
      891f2f8 Removed trailing spaces from code by pre-commit hook utility.
      0ed2535 Cherry-pick "Added connectionList field to SparseMsg to allow direct control over connection matrix. Some sanity checks in SparseMatrix to go with this"
      d62d10d The bug on travis is still not bypassed. If this does not work, disable DOQCS tests on OSX.
      618b4d6 Install moose on osx as well. Prerequisite to test DOQCS.
      f717f82 Merge branch 'master' of github.com:BhallaLab/moose-core
      908820e Lets see if this is a good workaround travis issue travis-ci/travis-ci#6522.
      e251f53 Lets see if is a workaround fixes the OSX bug.
      4ff7cff Hopefully this will fix issue on travis-osx build failure. Related to travis-ci/travis-ci#6522.
      590c09e Don't use timeout in script. So that we can run on macosx as well. Removed timeout command from script. Now it can run on OSX as well.
      e2f8afd Only test doqcs on LinuxOS, not on MacOSX.
      dc7b55a Fix to travis-ci/travis-ci#6307.
      54b8471 Merge branch 'master' of github.com:BhallaLab/moose-core
      18c8759 Test docqs agains gsl version/python2 moose-core.
      d6ca9cc Fixes by pre-commit hooks. - Removed trailing whitespaces automatically. - insert * coding - utf8 * line on top of each python script automatically.
      d4a6939 Using version v0.8 now.
      f944afe Added pre-commit pip install pre-commit --user to activate it.
      030bfe0 Merge pull request #195 from dilawar/master
      d00a5d1 All tests are passing and new code is protected by appropriate macros.
      1959771 Merge branch 'async' of github.com:dilawar/moose-core
      0f6aba0 Merge branch 'master' of github.com:BhallaLab/moose-core
      ac0a4cd Added note on what to do.
      b3bf54e Slower version but results are same.
      6bc71c9 Async version is slower (80sec vs 70 sec).
      d838267 asyncing clock is not producing great results.
      eeaafbf Implemented first parallel version.
      166f84e Equivalent serial code which can easily be called from std::async now.
      e09a0c1 Merge pull request #194 from dilawar/master
      d2d1097 Added MACRO to integrate serial and parallel version.
      e68acd6 This is good but do parallelism at Clock.cpp
      4cebbca Rdesigneur has python3 default import : absolute_import.
      f431cca Merge branch 'master' of github.com:BhallaLab/moose-core
      85afa6d Some changes to Ksolve. Still seg-faults.
      47e023e Time to test the Gsolve performance when threads are enabled.
      2bbfd4f Commented out code appropriately.
      91c2da6 moose.test( ) is added not cmake but not enabled. Enable them once all scripts are fixed in moose-examples.
      a1699fc Optimized GSolve with default 2 threads.
      00a9d9e Removed the debug message. Lets check it now. By default it should be not slower than the default version.
      7700c07 Fast Ksolve with 2 default threads.
      d154eb3 Parallel ksolve.
      
      git-subtree-dir: moose-core
      git-subtree-split: 891f2f8bf7359d61f186c3792c6f12b61d8c0afb
      750df413
  5. Jun 22, 2017
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 2c3fe7516..052318cb4 · 0014d826
      Dilawar Singh authored
      052318cb4 [skip ci] Moved git precommit script into script. if someone wants to activate it in her repo, rename it to .pre-commit-config.yaml and enable it
      d15e77649 Removed legacy makefile #180. These appeared again because of push from subtree in moose repo. Sigh!
      ed708e01b No-longer supporting Makefile based old flow on travis.
      bea1f4a9d Integrated test script from PR BhallaLab/moose#218 . I need to confirm if results are correct.
      
      git-subtree-dir: moose-core
      git-subtree-split: 052318cb48027ca0c401a13be9fddd2b0d5a66b7
      0014d826
  6. Jun 21, 2017