Skip to content

Merge current version of flux-dev into develop.#196

Closed
FrankD412 wants to merge 23 commits intodevelopfrom
merge/flux-dev
Closed

Merge current version of flux-dev into develop.#196
FrankD412 wants to merge 23 commits intodevelopfrom
merge/flux-dev

Conversation

@FrankD412
Copy link
Copy Markdown
Member

The bugfix/flux-dev has been out in the weeds for a little while. It's been a specific branch for a specific application that contains a lot of ad hoc and as-needed fixes. This PR pulls the current flux-dev version of the FluxScriptAdapter into develop and is intended to bring it up to speed on the current paradigm of using the Record classes to pass information. This PR is also intended to clean it up, and now that there's a new version of flux to update it.

@FrankD412 FrankD412 added In Progress Issue or PR that is currently in active development. Adapters Items that are directly related to Maestro's adapter structure. labels Sep 23, 2019
@FrankD412 FrankD412 self-assigned this Sep 23, 2019
Francesco Di Natale and others added 21 commits January 22, 2020 12:44
* Additional arguments can be passed through batch.

* Correction of the use of extend to append.

* Removal of OMPI vars from env.

* Reversal of env altering.

* Addition of mpi exe to batch.

* Removal of -gpu flag

* Addition of "allocated" to PENDING set.

* Correction of the check_status method call.

* Correction of the Flux import

* Addition of the EnvironmentError to try/catch for check_status.

* Addition of jobid to submission INFO logging.
* Fixed a workflow setup issue caused by spaces in the spec name

* Additional dirname formatting
* Minor docstring correction.

* Change to study setup API to break out workspace creation.

* Update Maestro frontend to use new Study method.

* Renamed Study.setup to be better communicate its functionality.

* Correction to style for configure_study method.

* Moved environment application to add_step.

* Split out acquiring environment elements to its own method.

* Updates to staging checks.

* Renamed _setup_linear and _setup_parameterized from setup to stage for clarity.
* Addition of method and tweaks to support metadata.

* Addition of call to the method for generating metadata.

* Correction to encode YAML string for py3 compatibility.

* Another attempt at py2-py3 compatible encoding.

* Addition of load_metadata method.
* Command line parameter for custom ParameterGenerators.

* Addition of sample custom parameter generation.

* Correction to missing parameters in SIZE.

* Addition of utility method for importing custom gen py files.

* Correction of syntax.

* Conversion of DOS newlines to Unix.

* Addition of call to check for custom code.

* Correction of a bad docstring.

* Addition of parameter metadata to Maestro.

* Addition of parameters to study metadata.

* Addition of copying of the parameter file to study workspace.
…on. (#137)

* Tweaks to how the ExecutionGraph adds descriptions. Added logging.

* Updated study to use the new API and some minor refactor.

* Fixed #134
…on. (#137)

* Tweaks to how the ExecutionGraph adds descriptions. Added logging.

* Updated study to use the new API and some minor refactor.

* Fixed #134
* Updates to the README.

* Added initial getting started example documentation

* Addition of Quick Start documentation. (#130)

* Addition of Quick Start.

* Addition of cancellation status example.

* Corrections to quick start and fix for build errors.

* Addition of a LULESH study specification with heavier comments. (#132)

* Start of a LULESH spec that's commented.

* Addition of explanation of step structure.

* Additional comments about steps and dependencies.

* Minor tweaks to comments.

* Addition of parameter block comments.

* Addition of reference to launcher_token YAML

* Tweaks and edits based on feedback.
* Addition of a ping method.

* Tweaks to error logging.

* Moved specific existence exception out of return code check.

* Cleanup of some merge characters.

* Tweak for connectivity checking.

* Addition of info to the error message.

* Removal of git return codes since they don't mean anything.
@FrankD412
Copy link
Copy Markdown
Member Author

Closed, as this PR is stale.

@FrankD412 FrankD412 deleted the merge/flux-dev branch June 11, 2020 05:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Adapters Items that are directly related to Maestro's adapter structure. In Progress Issue or PR that is currently in active development.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants