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

Parameter Sweep migration #1437

Merged
merged 22 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7e0638c
Remove code now in watertap-org/parameter-sweep
lbianchi-lbl Jun 14, 2024
6ac79a5
Remove CI workflow for MPI code
lbianchi-lbl Jun 14, 2024
543504e
Remove dedicated step to install ray
lbianchi-lbl Jun 14, 2024
7af7633
Update import paths in parameter_sweep client code
lbianchi-lbl Jun 14, 2024
638dd6b
Add parameter-sweep as a dependency
lbianchi-lbl Jun 14, 2024
dddfde0
Reduce CI job matrix size while WIP
lbianchi-lbl Jun 14, 2024
fd33077
Use parameter-sweep from main
lbianchi-lbl Jun 14, 2024
a2ad377
Update parameter-sweep requirement to 0.1.dev2 from PyPI
lbianchi-lbl Jun 14, 2024
953b0fd
Revert "Reduce CI job matrix size while WIP"
lbianchi-lbl Jun 14, 2024
4b3ae8a
Update references to parameter_sweep in how-to guides
lbianchi-lbl Jun 14, 2024
fdd59fe
Replace files and toc entries for pages now in parameter-sweep repo
lbianchi-lbl Jun 14, 2024
c09e2b6
Skip directly to docs tests while WIP
lbianchi-lbl Jun 14, 2024
d84471c
Revert "Skip directly to docs tests while WIP"
lbianchi-lbl Jun 14, 2024
fc6129f
Add intersphinx mapping for Parameter Sweep
lbianchi-lbl Jun 27, 2024
e431199
Remove Ray optional dependency target from parameter-sweep requirement
lbianchi-lbl Jun 27, 2024
117c2e6
Update PS requirement to 0.1.dev5
lbianchi-lbl Jun 27, 2024
01c1548
Try moving functions used by prop pack to a non-OLI util module
lbianchi-lbl Jun 27, 2024
117f1be
Remove unused imports
lbianchi-lbl Jun 27, 2024
ea480e5
Move test for periodic table
lbianchi-lbl Jun 27, 2024
f010f70
Add function for loading periodic table
lbianchi-lbl Jun 27, 2024
4ae8609
Tweak imports
lbianchi-lbl Jun 27, 2024
89052fd
Update links in Sphinx docs to point to parameter-sweep.readthedocs.io
lbianchi-lbl Jun 27, 2024
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
3 changes: 0 additions & 3 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@ jobs:
echo '::group::Output of "pip install" commands'
pip install -r requirements-dev.txt
echo '::endgroup::'
echo '::group::Output of "pip install -U ray" command'
pip install -U ray
echo '::endgroup::'
echo '::group::Output of "conda install -c conda-forge cyipopt" command'
conda install -c conda-forge cyipopt "numpy<2"
echo '::endgroup::'
Expand Down
101 changes: 0 additions & 101 deletions .github/workflows/mpi4py-test.yml

This file was deleted.

1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
# intersphinx mapping to idaes
intersphinx_mapping = {
"idaes": ("https://idaes-pse.readthedocs.io/en/stable/", None),
"parameter_sweep": ("https://parameter-sweep.readthedocs.io/en/latest/", None),
}

rst_epilog = """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Once this is done, we import the differential parameter sweep tool and sampling

.. testcode::

from watertap.tools.parameter_sweep import differential_parameter_sweep, UniformSample, NormalSample
from parameter_sweep import differential_parameter_sweep, UniformSample, NormalSample

We will use the :ref:`same setup steps as before<how_to_use_parameter_sweep>` to set up the generating functions for our model, sweep params, and outputs:

Expand Down Expand Up @@ -214,4 +214,5 @@ With the flowsheet defined and suitably initialized, along with the definitions
Module Documentation
--------------------

* :mod:`watertap.tools.parameter_sweep`
* :mod:`parameter_sweep`
* :mod:`parameter_sweep.differential`
4 changes: 2 additions & 2 deletions docs/how_to_guides/how_to_use_parameter_sweep.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Once this is done, import the parameter sweep tool

.. testcode::

from watertap.tools.parameter_sweep import parameter_sweep, LinearSample
from parameter_sweep import parameter_sweep, LinearSample

Conceptually, regardless of the number of iterations necessary to test each possible combination of variables, it is only necessary to build, simulate, and set up the model once.
Thus, these steps are left to the user and handled outside the parameter sweep function.
Expand Down Expand Up @@ -158,4 +158,4 @@ Note that there are additional keyword arguments that can be passed to this func
Module Documentation
--------------------

* :mod:`watertap.tools.parameter_sweep`
* :mod:`parameter_sweep`
4 changes: 2 additions & 2 deletions docs/how_to_guides/how_to_use_parameter_sweep_monte_carlo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Once this is done, we import the parameter sweep tool and two different random s

.. testcode::

from watertap.tools.parameter_sweep import parameter_sweep, UniformSample, NormalSample
from parameter_sweep import parameter_sweep, UniformSample, NormalSample

The parameter sweep tool currently offers 6 classes that can be broadly categorized under the following 3 categroies:

Expand Down Expand Up @@ -132,4 +132,4 @@ which will parallelize the requested parameter sweep between 4 computational uni
Module Documentation
--------------------

* :mod:`watertap.tools.parameter_sweep`
* :mod:`parameter_sweep`
7 changes: 2 additions & 5 deletions docs/technical_reference/tools/index.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
Tools for Flowsheet Analysis
============================

.. toctree::
:maxdepth: 2

parameter_sweep
parallel_manager
* `Parameter Sweep <https://parameter-sweep.readthedocs.io/en/latest/getting_started/parameter_sweep.html>`_
* `Parallel Manager <https://parameter-sweep.readthedocs.io/en/latest/getting_started.html>`_
105 changes: 0 additions & 105 deletions docs/technical_reference/tools/parallel_manager.rst

This file was deleted.

83 changes: 0 additions & 83 deletions docs/technical_reference/tools/parameter_sweep.rst

This file was deleted.

4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@
"pyomo>=6.6.1",
"pyyaml", # watertap.core.wt_database
# for parameter_sweep
"h5py",
"requests",
"scipy",
"parameter-sweep>=0.1.dev5",
# for watertap.ui.api_model (though may be generally useful)
"pydantic >= 2, <3",
"numpy",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
build_model,
build_outputs,
)
from watertap.tools.parameter_sweep import (
from parameter_sweep import (
LinearSample,
UniformSample,
ParameterSweep,
Expand Down
Loading