Skip to content
Snippets Groups Projects
  1. Jul 01, 2017
    • Dilawar Singh's avatar
      Merge commit '750df413' · 6753dfb2
      Dilawar Singh authored
      6753dfb2
    • 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
  2. Jun 28, 2017
  3. Jun 27, 2017
  4. Jun 24, 2017
  5. Jun 23, 2017
    • Dilawar Singh's avatar
      Squashed 'moose-examples/' changes from cd2a2b9..37bf0cc · b0021958
      Dilawar Singh authored
      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' of github.com:BhallaLab/moose-examples
      204d5e4 This is removed b'cos Rdesignuer does the job
      8c7c00c can pass command line arguments also
      70f83d0 cleanup in return type from None to moose.shell
      fe4238b indentation for python3
      3e81764 indentation fixes for python3
      66f1bb0 Removed <<<<, ===  and >>> from improper merge.
      0719a5d Merge commit '349abe7e'
      7054325 mooseaddChemSolver is needed in loadSbmlModel file
      6116c7e Indentation cleanup
      9fd501a conflict cleanups
      fe297f6 indentation correction
      2b24c64 indentation correction
      0e329d5 Merge branch 'master' of http://github.com/BhallaLab/moose-examples
      7ce262e corrected indentation
      864776c added deleted files
      87a6963 temp deleted
      0f1e722 Resolved merge conflict
      0ff3b05 temp deletion
      69062d9 For crossComptSimpleReac a temp fix so that segfault doesn't occur, rest cleanup
      729f216 deleted unwanted files and added new files
      7318878 cleanups
      045aa11 Fixed assert by Upi
      2b16c59 Deleted temp files.
      3881f8a khali khali
      97599aa Fixed docstring on example.
      
      git-subtree-dir: moose-examples
      git-subtree-split: 37bf0cc0a733d5b4c61659f9eb6e747f57530273
      b0021958
    • Dilawar Singh's avatar
      Merge commit 'b0021958' · 835d98ca
      Dilawar Singh authored
      835d98ca
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from ba97d4c..d1130b7 · d0e1cee1
      Dilawar Singh authored
      d1130b7 Merge branch 'master' of github.com:BhallaLab/moose-core
      967ac3b Added VERSION info moose.version( ) or moose.__version__ returns the version. It was lost somewhere in rrefactoring the code.
      457850e Added version( ) and __version__ string.
      2625fd0 Added `moose.test` to test `moose-examples` online (#189)
      2a822a2 Added assertion in test case and remove import of matplotlib. BhallaLab/moose#221.
      2484214 absolute imports are forced with python2 as well.
      6c92901 All tests passes locally with python3.
      bd78e14 Fixes to import statements.
      5c3811e Print time information as well.
      a7e715c Inbuilt moose.test( ) functions to run moose-examples. BhallaLab/moose-core#184.
      c424e0d Fixes to chemUtil import.
      f29e35e Merge branch 'master' of github.com:BhallaLab/moose-core
      087aad0 moose.Compartment -> moose.element( ) in couple of more place. One more (#187)
      d618fe6 Merge branch 'master' into master
      4aca08a Merge branch 'master' of github.com:BhallaLab/moose-core
      b8266b3 Fixes to test failure. Not sure if it is correct.  BhallaLab/moose#218 .
      56870e8 Merge branch 'master' of github.com:BhallaLab/moose-core
      d1e37cb Changed the assert statement. Not sure if this is correct to do BhallaLab/moose-core#218. Need to ask developer for confirmation.
      cf44570 We are no longer testing Makefile base flow. Only cmake will be tested from now on.
      cf7ff18 moose.Compartment -> moose.element( ) in couple of more place. One more scripts passes the test now.
      
      git-subtree-dir: moose-core
      git-subtree-split: d1130b78bd744e01d045459adb20d5bcebdb34a0
      d0e1cee1
    • Dilawar Singh's avatar
      Merge commit 'd0e1cee1' · 58449207
      Dilawar Singh authored
      58449207
  6. Jun 22, 2017