Merge branch 'develop' into feature/Options

.travis.yml

@@ -21,12 +21,12 @@ env:
 #  allow_failures:
 #    - env: MPI=openmpi
 
-addons:
-  apt:
-    packages:
-      - gfortran
-      - libblas-dev
-      - liblapack-dev
+#addons:
+  #apt:
+    #packages:
+      #- gfortran
+      #- libblas-dev
+      #- liblapack-dev
 
 cache: 
   pip: true
@@ -53,8 +53,9 @@ before_install:
 install:
   - conda install gcc_linux-64
   - conda install $MPI
-  - conda install --no-update-deps scipy # includes numpy
-  - conda install --no-update-deps mpi4py
+  - conda install scipy # includes numpy
+  - conda install mpi4py
+  - conda install mumps-mpi=5.1.2=h5bebb2f_1007 # Force this version
   - conda install petsc4py petsc
   - conda install --no-update-deps nlopt
   # pip install these as the conda installs downgrade pytest on python3.4

conda/run_travis_locally/build_mpich_libE.sh

@@ -62,7 +62,8 @@ conda install $MPI || return
 #conda install numpy || return #scipy includes numpy
 conda install --no-update-deps scipy || return
 conda install --no-update-deps  mpi4py || return
-conda install --no-update-deps petsc4py petsc || return
+conda install mumps-mpi=5.1.2=h5bebb2f_1007 || return # Force this version
+conda install petsc4py petsc || return
 conda install --no-update-deps nlopt || return
 
 # pip install these as the conda installs downgrade pytest on python3.4

docs/data_structures/exit_criteria.rst

@@ -1,18 +1,19 @@
+.. _datastruct-exit-criteria:
+
 exit_criteria
 =============
 
 Exit criteria for libEnsemble::
 
-    exit_criteria: [dict]: 
-        
+    exit_criteria: [dict]:
+
         Optional keys (At least one must be given) :
-        
-        'sim_max' [int] : 
+
+        'sim_max' [int] :
             Stop after this many points have been evaluated (by sim_f) in current run
-        'gen_max' [int] : 
+        'gen_max' [int] :
             Stop after this many points have been generated by gen_f in current run
-        'elapsed_wallclock_time' [float] : 
+        'elapsed_wallclock_time' [float] :
             Stop after this amount of seconds have elapsed (since the libEnsemble manager has been initialized)
-        'stop_val' [(str,float)] : 
+        'stop_val' [(str,float)] :
             Stop when H[str] (for some field str returned from sim_out or gen_out) has been observed with a value less than the float given
-            

docs/index.rst

@@ -11,29 +11,35 @@ A library for managing ensemble-like collections of computations.
 .. toctree::
    :maxdepth: 2
    :caption: libEnsemble:
-   
+
    Quickstart<quickstart>
    contributing
    release_notes
-
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Tutorials:
+
+   tutorials/local_sine_tutorial
+
 .. toctree::
    :maxdepth: 2
    :caption: User Guide:
-   
+
    user_guide
    libE_module
    data_structures/data_structures
    user_funcs
    job_controller/jc_index
    logging
-   
+
 .. toctree::
    :maxdepth: 2
    :caption: Developer Guide:
-   
+
    dev_guide/developer_API.rst
- 
-   
+
+
 
 
 Indices and tables

docs/job_controller/mpi_controller.rst

@@ -15,3 +15,24 @@ See the controller API below for optional arguments.
   :inherited-members:
 ..  :member-order: bysource
 ..  :members: __init__, register_calc, launch, manager_poll
+
+
+Class specific attributes
+-------------------------
+
+These attributes can be set directly to alter behaviour of the MPI job controller. However, they should be used with caution, as they may not be implemented in other job controllers.
+
+:max_launch_attempts: (int) Maximum number of launch attempts for a given job. *Default: 5*.
+:fail_time: (int) *Only if wait_on_run is set.* Maximum run-time to failure in seconds that results in re-launch. *Default: 2*.
+
+Example. To increase resilience against launch failures::
+
+    jobctrl = MPIJobController()
+    jobctrl.max_launch_attempts = 10
+    jobctrl.fail_time = 5
+
+Note that an the re-try delay on launches starts at 5 seconds and increments by 5 seconds for each retry. So the 4th re-try will wait for 20 seconds before re-launching.
+
+
+
+