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

Release of v1.1.4 #193

Merged
merged 47 commits into from
Jul 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
e029d07
Addition of user enabled workspace hashing (#145)
FrankD412 Sep 30, 2018
560b96f
Update setup.py to 1.1.4dev
FrankD412 Oct 5, 2018
0614ef3
More generalized FluxScriptAdapter (#149)
FrankD412 Oct 12, 2018
8fa85f1
README tweak to update quickstart link. (#139)
FrankD412 Oct 21, 2018
e77d85d
typos. fixes #141 (#154)
gonsie Oct 23, 2018
affda8a
Correction of flake8 style errors [new version of flake8].
Oct 31, 2018
681bfcc
Update to setup.py to reflect dev version 1.0
Oct 31, 2018
17a10a1
Correction to safe pathing for missed cases and make_safe_path enhanc…
FrankD412 Nov 3, 2018
bac8ea3
Correction to fix the format of output status time to avoid a comma t…
FrankD412 Nov 5, 2018
4064a17
Removal of _stage_linear since it is now not needed. (#156)
FrankD412 Nov 6, 2018
6e73215
Addition of pargs for passing parameters to custom parameter generati…
FrankD412 Nov 8, 2018
c33427e
do not overwrite log file. (#162)
robinson96 Nov 13, 2018
430c983
Added confirmation message after launching a study (#163)
jsemler Nov 15, 2018
f34840c
Enhancements to store relative pathing in the metadata file. (#165)
FrankD412 Dec 12, 2018
99964cb
Addition of tag to LULESH git dependency. (#169)
FrankD412 Jan 8, 2019
53e2ba9
Script Adapter Plugin (#167) (#170)
kcathey Jan 18, 2019
e5b6e74
PyYAML vulnerability fix (#171)
FrankD412 Feb 2, 2019
7783e0f
Minor tweak to indentation for flake8 failure.
Feb 6, 2019
a1368dc
fixed pyyaml to requirements (#172)
kcathey Mar 1, 2019
ee3b47b
Addition of a loader to the yaml load call. (#174)
FrankD412 Mar 8, 2019
3541fe4
Correction to install enum34 for Python versions < 3.4 (#176)
FrankD412 Mar 19, 2019
9940517
Addition of a Dockerfile for tutorials and ease of trying out. (#178)
FrankD412 Mar 24, 2019
ab4418c
Take out shebang from shell definition and add it when script is writ…
koning Apr 18, 2019
e32fb0f
Tweaks to fix malformed log statements. (#182)
FrankD412 Apr 18, 2019
e40a3bb
Correction to message when stating no to launch.
Apr 19, 2019
db3221e
Enhance shell batch setting to apply to scheduler scripts. (#183)
Apr 25, 2019
8e188fb
Fixes the addition of the shebang header for SLURM (#184)
Apr 26, 2019
216cf14
Correction to an accidental reassignment of cmd.
FrankD412 May 1, 2019
08ecccc
Removal of an assignment of self._exec in SLURM adapter.
May 1, 2019
b9a0d41
Change to transition adapter returns to Record objects. (#177)
May 1, 2019
ff81b62
Addition of a SLURM enabled LULESH sample specification.
May 8, 2019
f217d99
Addition of output for stdout and stderr for Local adapter.
May 9, 2019
c4b0dfa
Correction of file to open.
May 9, 2019
ced6a04
Addition of 3.7 to testing stack.
May 9, 2019
fa22f3b
Added 3.7 to tox.ini.
May 9, 2019
5b7e5de
Removal of py37 in testing.
May 9, 2019
a262c0e
Addition of py37 to travisCI (#187)
May 9, 2019
d7c8235
Addition of build status badge.
May 9, 2019
ff006b2
Update SLURM sample spec to add missing walltime.
Jun 12, 2019
31b16f5
Addition of dumping the environment to a YAML file. (#190)
Jun 14, 2019
97db5e3
Addition of documentation that covers the set up of a simple study (#…
Jun 26, 2019
1134658
Correction of link to examples.
Jun 26, 2019
ade2836
Correction of link to examples (again).
Jun 26, 2019
ea4a9a4
Removal of Pipfile.lock.
Jul 2, 2019
fe480d1
Additions to gitignore for vscode and pipenv.
Jul 2, 2019
5ab8da0
Marking for v1.1.4 release.
Jul 14, 2019
20c5d49
Corrected a missed merge for release v1.1.4
Jul 15, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
*.pyc
build/
dist/
*egg-info/
Expand All @@ -7,8 +6,34 @@ venv
.output/
sample_output/

# VSCode
.vscode

# Doxygen output
docs/html/

# Testing output
.tox/
testing
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/


*.py[cod]
__pycache__/
htmlcov/
wheelhouse/

pylint_*.txt
Pipfile.lock

#pycharm
.idea/
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ python:
- "3.5"
- "3.6"

matrix:
include:
- python: 3.7
dist: xenial
sudo: true

install:
- pip install tox-travis
- pip install flake8
Expand Down
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM ubuntu
LABEL maintainer="Francesco Di Natale dinatale3@llnl.gov"

RUN apt-get update && apt-get install -y python python-pip git
ADD . /maestrowf
RUN pip install -U /maestrowf
26 changes: 26 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[[source]]
url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"

[packages]
"enum34" = "*"
filelock = "*"
six = "*"
tabulate = "*"
Fabric = "*"
PyYAML = ">= 4.2b1"
maestrowf = {path = "."}

[dev-packages]
"flake8" = "*"
pydocstyle = "*"
pylint = "*"
tox = "*"
coverage = "*"
sphinx_rtd_theme = "*"
Sphinx = "*"
pytest = "*"

[requires]
python_version = "3.6"
35 changes: 2 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Maestro Workflow Conductor (MaestroWF)
[![Build Status](https://travis-ci.org/LLNL/maestrowf.svg?branch=develop)](https://travis-ci.org/LLNL/maestrowf)
[![PyPI](https://img.shields.io/pypi/v/maestrowf.svg)](https://pypi.python.org/pypi?name=maestrowf&version=1.0.0&:action=display)
[![Issues](https://img.shields.io/github/issues/LLNL/maestrowf.svg)](https://github.com/LLNL/maestrowf/issues)
[![Forks](https://img.shields.io/github/forks/LLNL/maestrowf.svg)](https://github.com/LLNL/maestrowf/network)
Expand Down Expand Up @@ -68,39 +69,7 @@ If you plan to develop on MaestroWF, install the repository directly using:

### Quickstart Example

MaestroWF comes packed with a basic example using LULESH, a proxy application provided
by LLNL. Information and source code for LULESH can be found [here](https://codesign.llnl.gov/lulesh.php).

The example performs the following workflow locally:
- Download LULESH from the webpage linked above and decompress it.
- Substitute all necessary variables with their serial compilers and make LULESH.
- Execute a small parameter sweep of varying size and iterations (a simple sensitivity study)

Two copies of the workflow are in the ```samples/lulesh``` directory for unix and macosx.
This is due to differences with ```sed```. In order to execute the sample study simply
execute from the root directory of the repository:

Unix:

$ maestro run ./samples/lulesh/lulesh_sample1_unix.yaml

MacOSX:

$ maestro run ./samples/lulesh/lulesh_sample1_macosx.yaml

When prompted, reply in the affirmative:

$ Would you like to launch the study?[yn] y

Maestro will create a timestamped directory in ```sample_output/lulesh```.

To monitor the study run:

$ maestro status sample_output/lulesh/<study_dir>

To cancel the study:

$ maestro cancel sample_output/lulesh/<study_dir>
MaestroWF comes packed with a basic example using LULESH, a proxy application provided by LLNL. You can find the Quick Start guide [here](https://maestrowf.readthedocs.io/en/latest/quick_start.html#).

----------------

Expand Down
21 changes: 19 additions & 2 deletions docs/source/getting_started.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
Getting Started
================

Maestro Docker Container
************************

In order to set up the Docker container execute the following from the root of the Maestro repository::

$ docker --build -t maestrowf .

To launch the interactive shell of the Ubuntu image simply run::

$ docker run -it maestrowf

Once inside the Docker container, the following should bring up help::

$ maestro -h

For more information on using Dockerfiles, checkout Docker's `documentation <https://docs.docker.com/engine/reference/builder/>`.

Installing MaestroWF
*********************

MaestroWF can be installed via pip::
MaestroWF can be installed via pip outside of Docker with the following::

$ pip install maestrowf

Expand All @@ -13,7 +30,7 @@ MaestroWF can be installed via pip::
Once installed run::

$ maestro -h

usage: maestro [-h] [-l LOGPATH] [-d DEBUG_LVL] [-c] {cancel,run,status} ...

The Maestro Workflow Conductor for specifiying, launching, and managing general workflows.
Expand Down
Loading