Merged
Conversation
Member
|
modify docs too with new command: docs/source/merlin_commands.rst |
koning
approved these changes
Sep 25, 2020
lucpeterson
approved these changes
Sep 25, 2020
ben-bay
added a commit
that referenced
this pull request
Sep 25, 2020
* Feature/ben/null chain (#276) * added minimum of 3 hours, estimate was too low for concurrency=128 * adapting scripts for null chain * data reading and aggregation appears to work, at least for 1-node concurrency levels * added aggregation logic * fixing syntax bugs * all data appears to be aggragating correctly * fixed read in place * added to CHANGELOG * fixed typo * fixed style * added 'time' to 'merlin run' command, for better future provenance * celery 5 (#279) * upgraded to celery 5 * updated docs
ben-bay
added a commit
that referenced
this pull request
Dec 16, 2020
* Feature/ben/null chain (#276) * added minimum of 3 hours, estimate was too low for concurrency=128 * adapting scripts for null chain * data reading and aggregation appears to work, at least for 1-node concurrency levels * added aggregation logic * fixing syntax bugs * all data appears to be aggragating correctly * fixed read in place * added to CHANGELOG * fixed typo * fixed style * added 'time' to 'merlin run' command, for better future provenance * celery 5 (#279) * upgraded to celery 5 * updated docs * Improved messaging about no_errors option (#283) * Design optimization template (#284) * intitial push design_optimization_template * added more inputs for optimizer step * Create requirements.txt * added required python packages * added a visualization step * removed make samples script in favor of spellbook * added a clean up step that deletes the merlin samples paths from run_simulation step * sending results to user email * renamed workflow * added to CHANGELOG Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov> * Update optimization.yaml * Library/Req Changes (#286) * Pin modern celery version that has queue purge fix. Add johnnydep to dev dependencies to all us to find all dependencies * Update CHANGELOG * 1.7.6 Co-authored-by: Luc Peterson <peterson76@llnl.gov> Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov>
ben-bay
added a commit
that referenced
this pull request
Jan 7, 2021
* Feature/ben/null chain (#276) * added minimum of 3 hours, estimate was too low for concurrency=128 * adapting scripts for null chain * data reading and aggregation appears to work, at least for 1-node concurrency levels * added aggregation logic * fixing syntax bugs * all data appears to be aggragating correctly * fixed read in place * added to CHANGELOG * fixed typo * fixed style * added 'time' to 'merlin run' command, for better future provenance * celery 5 (#279) * upgraded to celery 5 * updated docs * Improved messaging about no_errors option (#283) * Design optimization template (#284) * intitial push design_optimization_template * added more inputs for optimizer step * Create requirements.txt * added required python packages * added a visualization step * removed make samples script in favor of spellbook * added a clean up step that deletes the merlin samples paths from run_simulation step * sending results to user email * renamed workflow * added to CHANGELOG Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov> * Update optimization.yaml * Library/Req Changes (#286) * Pin modern celery version that has queue purge fix. Add johnnydep to dev dependencies to all us to find all dependencies * Update CHANGELOG * 1.7.6 * added to CHANGELOG * removed changelog note on wrong branch * fixed bug (#290) * added to gitignore * Bugfix/ben/requirements in examples (#292) * including example requirements in package. These had been excluded by accident * added to CHANGELOG * switch default password to jackalope-password (#291) * switch default password to jackalope-password * switch default password to jackalope-password * added to CHANGELOG * restart_shell test (#288) * added restart_shell test * added to CHANGELOG * Update run_tests.py * fixed typo in 2 tests * bug appears to be fixed (#293) * bug appears to be fixed * pop -> get * removed warning * removed old commented code * 1.7.7 * modified CHANGELOG Co-authored-by: Luc Peterson <peterson76@llnl.gov> Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov>
ben-bay
added a commit
that referenced
this pull request
Jan 8, 2021
* Feature/ben/null chain (#276) * added minimum of 3 hours, estimate was too low for concurrency=128 * adapting scripts for null chain * data reading and aggregation appears to work, at least for 1-node concurrency levels * added aggregation logic * fixing syntax bugs * all data appears to be aggragating correctly * fixed read in place * added to CHANGELOG * fixed typo * fixed style * added 'time' to 'merlin run' command, for better future provenance * celery 5 (#279) * upgraded to celery 5 * updated docs * Improved messaging about no_errors option (#283) * Design optimization template (#284) * intitial push design_optimization_template * added more inputs for optimizer step * Create requirements.txt * added required python packages * added a visualization step * removed make samples script in favor of spellbook * added a clean up step that deletes the merlin samples paths from run_simulation step * sending results to user email * renamed workflow * added to CHANGELOG Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov> * Update optimization.yaml * Library/Req Changes (#286) * Pin modern celery version that has queue purge fix. Add johnnydep to dev dependencies to all us to find all dependencies * Update CHANGELOG * 1.7.6 * added to CHANGELOG * removed changelog note on wrong branch * fixed bug (#290) * added to gitignore * Bugfix/ben/requirements in examples (#292) * including example requirements in package. These had been excluded by accident * added to CHANGELOG * switch default password to jackalope-password (#291) * switch default password to jackalope-password * switch default password to jackalope-password * added to CHANGELOG * restart_shell test (#288) * added restart_shell test * added to CHANGELOG * Update run_tests.py * fixed typo in 2 tests * bug appears to be fixed (#293) * bug appears to be fixed * pop -> get * removed warning * removed old commented code * 1.7.7 * modified CHANGELOG * Update version_test.sh * Update .travis.yml Co-authored-by: Luc Peterson <peterson76@llnl.gov> Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov>
ben-bay
added a commit
that referenced
this pull request
Jan 8, 2021
* Feature/ben/null chain (#276) * added minimum of 3 hours, estimate was too low for concurrency=128 * adapting scripts for null chain * data reading and aggregation appears to work, at least for 1-node concurrency levels * added aggregation logic * fixing syntax bugs * all data appears to be aggragating correctly * fixed read in place * added to CHANGELOG * fixed typo * fixed style * added 'time' to 'merlin run' command, for better future provenance * celery 5 (#279) * upgraded to celery 5 * updated docs * Improved messaging about no_errors option (#283) * Design optimization template (#284) * intitial push design_optimization_template * added more inputs for optimizer step * Create requirements.txt * added required python packages * added a visualization step * removed make samples script in favor of spellbook * added a clean up step that deletes the merlin samples paths from run_simulation step * sending results to user email * renamed workflow * added to CHANGELOG Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov> * Update optimization.yaml * Library/Req Changes (#286) * Pin modern celery version that has queue purge fix. Add johnnydep to dev dependencies to all us to find all dependencies * Update CHANGELOG * 1.7.6 * added to CHANGELOG * removed changelog note on wrong branch * fixed bug (#290) * added to gitignore * Bugfix/ben/requirements in examples (#292) * including example requirements in package. These had been excluded by accident * added to CHANGELOG * switch default password to jackalope-password (#291) * switch default password to jackalope-password * switch default password to jackalope-password * added to CHANGELOG * restart_shell test (#288) * added restart_shell test * added to CHANGELOG * Update run_tests.py * fixed typo in 2 tests * bug appears to be fixed (#293) * bug appears to be fixed * pop -> get * removed warning * removed old commented code * 1.7.7 * modified CHANGELOG * Update version_test.sh * Update .travis.yml * fixed restart_shell cli test * added to CHANGELOG * re-fixed bug Co-authored-by: Luc Peterson <peterson76@llnl.gov> Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov>
ben-bay
added a commit
that referenced
this pull request
Jan 14, 2021
* Feature/ben/null chain (#276) * added minimum of 3 hours, estimate was too low for concurrency=128 * adapting scripts for null chain * data reading and aggregation appears to work, at least for 1-node concurrency levels * added aggregation logic * fixing syntax bugs * all data appears to be aggragating correctly * fixed read in place * added to CHANGELOG * fixed typo * fixed style * added 'time' to 'merlin run' command, for better future provenance * celery 5 (#279) * upgraded to celery 5 * updated docs * Improved messaging about no_errors option (#283) * Design optimization template (#284) * intitial push design_optimization_template * added more inputs for optimizer step * Create requirements.txt * added required python packages * added a visualization step * removed make samples script in favor of spellbook * added a clean up step that deletes the merlin samples paths from run_simulation step * sending results to user email * renamed workflow * added to CHANGELOG Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov> * Update optimization.yaml * Library/Req Changes (#286) * Pin modern celery version that has queue purge fix. Add johnnydep to dev dependencies to all us to find all dependencies * Update CHANGELOG * 1.7.6 * added to CHANGELOG * removed changelog note on wrong branch * fixed bug (#290) * added to gitignore * Bugfix/ben/requirements in examples (#292) * including example requirements in package. These had been excluded by accident * added to CHANGELOG * switch default password to jackalope-password (#291) * switch default password to jackalope-password * switch default password to jackalope-password * added to CHANGELOG * restart_shell test (#288) * added restart_shell test * added to CHANGELOG * Update run_tests.py * fixed typo in 2 tests * bug appears to be fixed (#293) * bug appears to be fixed * pop -> get * removed warning * removed old commented code * 1.7.7 * modified CHANGELOG * Update version_test.sh * Update .travis.yml * fixed restart_shell cli test * added to CHANGELOG * re-fixed bug * Bugfix/ben/restart error (#297) * added initial bugfix logic * added new restart file * adjusted messages * adjusted messages * added restart test * added to CHANGELOG * fixed styleC * added spellbook to reqs so that integration tests can pass * fixed dep * added step to restart.yaml * reformatted if/else to try/except * added another code block * added _* * added final check step to test * fixed cli test * corrected worker steps * 1.7.9 Co-authored-by: Luc Peterson <peterson76@llnl.gov> Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov>
ben-bay
added a commit
that referenced
this pull request
Mar 8, 2021
* 1.7.9 (#298) * Feature/ben/null chain (#276) * added minimum of 3 hours, estimate was too low for concurrency=128 * adapting scripts for null chain * data reading and aggregation appears to work, at least for 1-node concurrency levels * added aggregation logic * fixing syntax bugs * all data appears to be aggragating correctly * fixed read in place * added to CHANGELOG * fixed typo * fixed style * added 'time' to 'merlin run' command, for better future provenance * celery 5 (#279) * upgraded to celery 5 * updated docs * Improved messaging about no_errors option (#283) * Design optimization template (#284) * intitial push design_optimization_template * added more inputs for optimizer step * Create requirements.txt * added required python packages * added a visualization step * removed make samples script in favor of spellbook * added a clean up step that deletes the merlin samples paths from run_simulation step * sending results to user email * renamed workflow * added to CHANGELOG Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov> * Update optimization.yaml * Library/Req Changes (#286) * Pin modern celery version that has queue purge fix. Add johnnydep to dev dependencies to all us to find all dependencies * Update CHANGELOG * 1.7.6 * added to CHANGELOG * removed changelog note on wrong branch * fixed bug (#290) * added to gitignore * Bugfix/ben/requirements in examples (#292) * including example requirements in package. These had been excluded by accident * added to CHANGELOG * switch default password to jackalope-password (#291) * switch default password to jackalope-password * switch default password to jackalope-password * added to CHANGELOG * restart_shell test (#288) * added restart_shell test * added to CHANGELOG * Update run_tests.py * fixed typo in 2 tests * bug appears to be fixed (#293) * bug appears to be fixed * pop -> get * removed warning * removed old commented code * 1.7.7 * modified CHANGELOG * Update version_test.sh * Update .travis.yml * fixed restart_shell cli test * added to CHANGELOG * re-fixed bug * Bugfix/ben/restart error (#297) * added initial bugfix logic * added new restart file * adjusted messages * adjusted messages * added restart test * added to CHANGELOG * fixed styleC * added spellbook to reqs so that integration tests can pass * fixed dep * added step to restart.yaml * reformatted if/else to try/except * added another code block * added _* * added final check step to test * fixed cli test * corrected worker steps * 1.7.9 Co-authored-by: Luc Peterson <peterson76@llnl.gov> Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov> * updated feature_demo with spellbook calls Co-authored-by: Luc Peterson <peterson76@llnl.gov> Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov>
ben-bay
added a commit
that referenced
this pull request
Jun 21, 2021
* 1.7.9 (#298) * Feature/ben/null chain (#276) * added minimum of 3 hours, estimate was too low for concurrency=128 * adapting scripts for null chain * data reading and aggregation appears to work, at least for 1-node concurrency levels * added aggregation logic * fixing syntax bugs * all data appears to be aggragating correctly * fixed read in place * added to CHANGELOG * fixed typo * fixed style * added 'time' to 'merlin run' command, for better future provenance * celery 5 (#279) * upgraded to celery 5 * updated docs * Improved messaging about no_errors option (#283) * Design optimization template (#284) * intitial push design_optimization_template * added more inputs for optimizer step * Create requirements.txt * added required python packages * added a visualization step * removed make samples script in favor of spellbook * added a clean up step that deletes the merlin samples paths from run_simulation step * sending results to user email * renamed workflow * added to CHANGELOG Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov> * Update optimization.yaml * Library/Req Changes (#286) * Pin modern celery version that has queue purge fix. Add johnnydep to dev dependencies to all us to find all dependencies * Update CHANGELOG * 1.7.6 * added to CHANGELOG * removed changelog note on wrong branch * fixed bug (#290) * added to gitignore * Bugfix/ben/requirements in examples (#292) * including example requirements in package. These had been excluded by accident * added to CHANGELOG * switch default password to jackalope-password (#291) * switch default password to jackalope-password * switch default password to jackalope-password * added to CHANGELOG * restart_shell test (#288) * added restart_shell test * added to CHANGELOG * Update run_tests.py * fixed typo in 2 tests * bug appears to be fixed (#293) * bug appears to be fixed * pop -> get * removed warning * removed old commented code * 1.7.7 * modified CHANGELOG * Update version_test.sh * Update .travis.yml * fixed restart_shell cli test * added to CHANGELOG * re-fixed bug * Bugfix/ben/restart error (#297) * added initial bugfix logic * added new restart file * adjusted messages * adjusted messages * added restart test * added to CHANGELOG * fixed styleC * added spellbook to reqs so that integration tests can pass * fixed dep * added step to restart.yaml * reformatted if/else to try/except * added another code block * added _* * added final check step to test * fixed cli test * corrected worker steps * 1.7.9 Co-authored-by: Luc Peterson <peterson76@llnl.gov> Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov> * added task priorities * renaming task queues and setting default priorities * fixed style * swapped priority to correct configuration * added to CHANGELOG * fixing unit tests * fixing unit tests * fixed indentation mistake * fixed indentation mistake * made get_priority function that supports rabbit and redis apis * moved priority function to utils * task queue name fix * task queue name fix * updated CHANGELOG * added config utils * removed comment * added priority enum and unknown state error raise * added conditional redis priority config * improved queue name logic * improved queue name logic * fixed typo * Double queue tag bugfix and configfile support for queue tag customization * fixed premature config imports * hard-coded max priority to 10. Previously this would have been 1 for redis broker, which would have caused an error. * fixed style Co-authored-by: Luc Peterson <peterson76@llnl.gov> Co-authored-by: Yamen Mubarka <mubarka1@llnl.gov>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.