Replacing "--with-lagrangian" with "--lagrangian" in hydro example and other details (#400)

* mainly modifying bash demo script to avoid --with-lagrangian

* Update hydro_cylinders.py

* stop using setup.py, start using pip install

---------

Co-authored-by: David L Woodruff <[email protected]>

Author: AymericPCLegros

.github/workflows/nompi4py.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: PH EF tests
         run: |

.github/workflows/pull_push_regression.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: Test EF/PH
         run: |

.github/workflows/schur_complement.yml

@@ -31,12 +31,12 @@ jobs:
         pip install git+https://github.com/pyutilib/pyutilib.git
         git clone https://github.com/pyomo/pyomo.git
         cd pyomo/
-        python setup.py develop
+        pip install -e .
         pyomo download-extensions
         pyomo build-extensions
         cd ../
         pip install git+https://github.com/parapint/parapint.git
-        python setup.py develop
+        pip install -e .
     - name: Test with nose
       run: |
         nosetests -v mpisppy/tests/test_sc.py

.github/workflows/straight.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: mpi tests
         run: |

.github/workflows/testaph.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run tests
         timeout-minutes: 100

.github/workflows/testbunpick.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run pickled bundles tests
         timeout-minutes: 10

.github/workflows/testconfint.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run farmer tests
         timeout-minutes: 10

.github/workflows/testgradient.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: Build Pyomo extensions
         run: |

.github/workflows/testpysp.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run pysp model tests
         timeout-minutes: 100

.github/workflows/testwithcylinders.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run tests
         timeout-minutes: 10

examples/hydro/demo.bash

@@ -2,7 +2,7 @@
 
 SOLVERNAME=cplex
 
-mpiexec --oversubscribe --np 3 python -m mpi4py hydro_cylinders.py --branching-factors 3 3 --bundles-per-rank=0 --max-iterations=100 --default-rho=1 --with-xhatshuffle --with-lagrangian --solver-name=${SOLVERNAME} --stage2EFsolvern=${SOLVERNAME}
+mpiexec --oversubscribe --np 3 python -m mpi4py hydro_cylinders.py --branching-factors 3 3 --bundles-per-rank=0 --max-iterations=100 --default-rho=1 --xhatshuffle --lagrangian --solver-name=${SOLVERNAME} --stage2EFsolvern=${SOLVERNAME}
 
 # including this option will cause the upper bounder to solve the EF since there are only three ranks in total.
 #--stage2EFsolvern=${SOLVERNAME}

examples/hydro/hydro.py

@@ -228,6 +228,7 @@ def scenario_creator(scenario_name, branching_factors=None, data_path=None):
     instance = model.create_instance(fname, name=scenario_name)
 
     instance._mpisppy_node_list = MakeNodesforScen(instance, branching_factors, snum)
+    model._mpisppy_probability = "uniform"
     return instance
 
 #=============================================================================

examples/hydro/hydro_cylinders.py

@@ -92,6 +92,7 @@ def main():
         list_of_spoke_dict.append(xhatshuffle_spoke)
 
     if cfg.stage2EFsolvern is not None:
+        assert xhatshuffle is not None, "xhatshuffle is required for stage2EFsolvern"
         xhatshuffle_spoke["opt_kwargs"]["options"]["stage2EFsolvern"] = cfg["stage2EFsolvern"]
         xhatshuffle_spoke["opt_kwargs"]["options"]["branching_factors"] = cfg["branching_factors"]