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

Refactor/remove ytopt heffte #1419

Merged
merged 7 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
1 change: 0 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ per-file-ignores =
examples/calling_scripts/run_libensemble_on_warpx.py:E402
libensemble/tests/regression_tests/test_persistent_aposmm*:E402
libensemble/tests/regression_tests/test_persistent_gp_multitask_ax.py:E402
libensemble/tests/regression_tests/test_ytopt_heffte.py:E402
libensemble/tests/functionality_tests/test_uniform_sampling_then_persistent_localopt_runs.py:E402
libensemble/tests/functionality_tests/test_stats_output.py:E402
libensemble/tests/functionality_tests/test_active_persistent_worker_abort.py:E402
Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ jobs:
if: matrix.os == 'ubuntu-latest'
with:
path: |
/home/runner/work/libensemble/libensemble/heffte/build/
/home/runner/.local
/usr/share/miniconda3/envs/condaenv
/usr/share/miniconda3/bin
Expand Down Expand Up @@ -127,26 +126,6 @@ jobs:
run: |
pip install --upgrade git+https://github.com/bandframework/surmise.git

- name: Build ytopt and dependencies
if: matrix.python-version <= '3.10' && matrix.os != 'macos-latest'
run: |
pip install scikit-learn==1.4.0
pip install pandas==2.2.1
pip install ConfigSpace
pip install "ray[default]"
git clone https://github.com/ytopt-team/scikit-optimize.git
cd scikit-optimize
pip install .
cd ..
git clone -b version1 https://github.com/ytopt-team/autotune.git
cd autotune
pip install .
cd ..
git clone -b main https://github.com/ytopt-team/ytopt.git
cd ytopt
pip install .
cd ..

- name: Install generator dependencies for Ubuntu tests
if: matrix.os == 'ubuntu-latest' && matrix.python-version != '3.12'
run: |
Expand Down Expand Up @@ -180,27 +159,11 @@ jobs:
pip install -e .
popd

- name: Build heffte
if: matrix.os != 'macos-latest'
run: |
# begin heffte build and dependencies
sudo apt install libfftw3-dev
git clone https://github.com/icl-utk-edu/heffte.git
mkdir heffte/build
cd heffte/build
pwd
cmake -D CMAKE_BUILD_TYPE=Release -D BUILD_SHARED_LIBS=ON -D CMAKE_INSTALL_PREFIX=./ -D Heffte_ENABLE_AVX=ON -D Heffte_ENABLE_FFTW=ON ../
make -j 4
make install
cp ./benchmarks/speed3d_c2c ../../libensemble/tests/regression_tests/
# end heffte build and dependencies

- uses: actions/cache/save@v4
name: Save dependencies to cache
if: matrix.os == 'ubuntu-latest'
with:
path: |
/home/runner/work/libensemble/libensemble/heffte/build/
/home/runner/.local
/usr/share/miniconda3/envs/condaenv
/usr/share/miniconda3/bin
Expand All @@ -217,7 +180,6 @@ jobs:
- name: Remove various tests on newer pythons
if: matrix.python-version >= '3.11'
run: |
rm ./libensemble/tests/regression_tests/test_ytopt_heffte.py
# rm ./libensemble/tests/regression_tests/test_gpCAM.py
rm ./libensemble/tests/regression_tests/test_persistent_gp.py

Expand Down
10 changes: 3 additions & 7 deletions docs/examples/surmise.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@ persistent_surmise
------------------

Required: Surmise_

Note that currently the github fork https://github.com/mosesyhc/surmise should be used::

pip install --upgrade git+https://github.com/bandframework/surmise.git@develop

The :doc:`Borehole Calibration tutorial<../tutorials/calib_cancel_tutorial>` uses this generator as an example of the capability to cancel pending simulations.
The :doc:`Borehole Calibration tutorial<../tutorials/calib_cancel_tutorial>` uses this generator as an
example of the capability to cancel pending simulations.

.. automodule:: persistent_surmise_calib
:members:
:no-undoc-members:

.. _Surmise: https://surmise.readthedocs.io/en/latest/index.html
.. _Surmise: https://github.com/bandframework/surmise
71 changes: 0 additions & 71 deletions libensemble/gen_funcs/ytopt_asktell.py

This file was deleted.

26 changes: 0 additions & 26 deletions libensemble/sim_funcs/heffte.py

This file was deleted.

44 changes: 0 additions & 44 deletions libensemble/sim_funcs/ytopt_obj.py

This file was deleted.

Loading
Loading