Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.10.0 #417

Merged
merged 23 commits into from
Apr 13, 2023
Merged

Version 1.10.0 #417

merged 23 commits into from
Apr 13, 2023

Conversation

bgunnar5
Copy link
Member

Bump to version 1.10.0. See the changelog for all changes.

bgunnar5 and others added 23 commits December 21, 2022 16:35
Sync up the branches between main and develop. No changes.
…397)

* include all files for merlin examples

Co-authored-by: bgunnar
Add a singularity based openfoam_wf example.
Update the learn.py to create the missing Energy vs LidSpeed plot.
* Add flux native worker launch.

* Add flux native to changlog.

* Run black.

* Run black.

* Run fix-style

* Add try except for check_for_flux function when flux is not present.

* Add function doc.

* Add flux native run-workers test.

* Added PBS flux launch support
Added check_for_flux, check_for_slurm, check_for_lsf, and check_for_pbs
utility functions

* Return None from get_batch_type instead of slurm, now there are check
functions, there should be an error condition returned.

* Fix block comment

* Fix comment.

* Fix isort in Makefile.
Run fix-style
Add - to pbs for reading from stdin.

* Fix SYS_TYPE check

* fix-style

* Re fix-style with new isort.

* New qsub version uses -- for stdin.

* Chnage celery_regex ito celery_slurm_regex
Remove extra nodes variable in flux_par_native_test.yaml

* Change celery_regex ito celery_slurm_regex
Remove extra nodes variable in flux_par_native_test.yaml
Update integration test suite and add stop-workers tests

Update integration test suite and add stop-workers tests

modify changelog to show test changes

update copyright year and CI explanation
Update integration test suite and add stop-workers tests. Also update the copyright year in every file.
fix bugs for stop-workers and schema validation

fix all flags for stop-workers

fix small bug with schema validation

modify CHANGELOG

run fix-style

add myself to contributors list

decouple celery logic from main

remove unused import

make changes Luc requested in PR

change worker assignment to use sets
fix bugs for stop-workers and schema validation
This is a combination of 4 commits.

fix stop-workers, refactor integration tests, and fix pylint errors

fix pylint errors in merlin/ directory

fixed minor schema validation bugs

fix stop-workers flags and refactor integration tests

fix stop-workers flags and refactor integration tests

added a mapping getter to MerlinSpec object

update gitignore to ignore test outputs

add ability to see all tests in table format

update integration tests to use a different format and add stop-workers tests

fix flags for stop-workers

update CHANGELOG

add Brian to contributors

add a cleanup step to the stop-workers tests

fix schema validation bugs

pylint fixes to top level of merlin/ dir

pylint fixes for merlin/common/ dir

pylint fixes for merlin/config/ dir

pylint fixes for merlin/examples/ dir

pylint fixes for merlin/exceptions/ dir

pylint fixes for merlin/server/ dir

pylint fixes for merlin/spec/ dir

pylint fixes for merlin/study/ dir

pylint fixes for tests/integration/ dir

pylint configuration changes

fix-style changes

remove a pylint config option that didn't work

add negationchecks to two stop-workers tests

update changelog to show pylint fix

merge changes from develop

fix some merge/pylint issues

update github workflow to run all distributed tests

modify wording in the docs related to stop-workers

new pylint fixes after merging develop

fixing issues with rebase

fix merge issues that somehow got through

remove duplicate entries from changelog

fix more pylint errors in common/ and config/

fix additional pylint errors in examples/ exceptions/ and merlin/ top-level

fix additional pylint errors in server/ and spec/

refactor batch.py for pylint fixes and general cleanup

update variable name to make things cleaner

move a celery specific function to celery.py

add explanation of why we disable similar code warning

fix additional pylint errors in study/ directory

additional pylint fixes for utils.py and conditions.py

final pylint updates

refactor construct_worker_launch_command

update CHANGELOG

run fix-style

fix import issues

fix conflict between black and isort

move import back inside function to fix issues

move another import back inside function

add some logging messages to debug why tests fail on github

add extra log statements for debugging

remove batch refactor
* Update flux run command.

* Update get_flux_cmd and add get_flux_alloc. Use these functions in all cases.

* Update get_flux_alloc and test_definitions.py to work for testing.

* Update actual flux version.

* Update CHANGELOG.md with flux version.

* Change DEFAULT_FLUX_VERSION .

* Fix-style

* Return to default flux run in scriptadapter.

* fix bugs for stop-workers and schema validation

fix bugs for stop-workers and schema validation

fix all flags for stop-workers

fix small bug with schema validation

modify CHANGELOG

run fix-style

add myself to contributors list

decouple celery logic from main

remove unused import

make changes Luc requested in PR

* Fix batch flux exe and have test flux script return version as well.

* Make sure test flux decalres itself.
Fix flux alloc full path call.

* Make sure qsub emits fake info.
Check for flux or qsub in env for testing before adding the fake command.

* Move fake commands to test directory

* Remove unneeded f-string.

* Change the scheduler check output strings to be more descriptive.

---------

Co-authored-by: Brian Gunnarson <brianfunnarson14@gmail.com>
copy batch refactor changes from pylint-errors branch

fix-style and additional logs

add more logs

attempt to fix the test 14 error

remove log statements used for debugging

add flux alloc changes to batch refactor

playing with flux alloc

fix flux alloc issue and add lsf test

add lsf run-workers test

remove unused import
begin work on refactoring query-workers

add --queues, --workers, and --spec flags to query-workers

add query-workers tests

revert back to pinging workers for querying

make regex searches work slightly better

clean up code

update documentation for query-workers

modify changelog

run fix-style

resolve review requests

move an import that was breaking tests
add test for walltime conversion

modify changelog

run fix-style and fix issue with unit tests

modify walltime to work with different formats for all schedulers

modify walltime tests
@bgunnar5 bgunnar5 merged commit 3acb30d into main Apr 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants