Skip to content

Commit

Permalink
Merge pull request #1160 from Libensemble/release/v_1.1.0
Browse files Browse the repository at this point in the history
Release/v 1.1.0
  • Loading branch information
shuds13 authored Nov 8, 2023
2 parents f0cecc6 + 6199ef2 commit 06ae667
Show file tree
Hide file tree
Showing 64 changed files with 670 additions and 937 deletions.
1 change: 1 addition & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ per-file-ignores =
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
libensemble/tests/unit_tests/test_persistent_aposmm.py:E402

Expand Down
143 changes: 143 additions & 0 deletions .github/workflows/basic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
name: libEnsemble-simple-CI

on:
pull_request:
types:
- ready_for_review
- opened
- reopened
- synchronize

jobs:
test-libE:
if: '! github.event.pull_request.draft'
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
mpi-version: [mpich]
python-version: [3.9, "3.10", "3.11", "3.12"]
comms-type: [m, l]
include:
- os: macos-latest
python-version: 3.11
mpi-version: "mpich=4.0.3"
comms-type: m
- os: macos-latest
python-version: 3.11
mpi-version: "mpich=4.0.3"
comms-type: l

env:
HYDRA_LAUNCHER: "fork"
TERM: xterm-256color
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

defaults:
run:
shell: bash -l {0}

steps:
- uses: actions/checkout@v4
- name: Setup conda - Python ${{ matrix.python-version }}
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: condaenv
miniconda-version: "latest"
python-version: ${{ matrix.python-version }}
channels: conda-forge
channel-priority: flexible
auto-update-conda: true

- uses: actions/cache/restore@v3
name: Restore cached dependencies
id: cache
if: matrix.os == 'ubuntu-latest'
with:
path: |
/home/runner/.local
/usr/share/miniconda3/envs/condaenv
/usr/share/miniconda3/bin
/usr/share/miniconda3/lib
/usr/share/miniconda3/include
key: libe-${{ github.ref_name }}-${{ matrix.python-version }}-${{ matrix.comms-type }}

- name: Force-update certifi
run: |
python --version
pip install -I --upgrade certifi
- name: Install Ubuntu compilers
if: matrix.os == 'ubuntu-latest'
run: conda install gcc_linux-64

# Roundabout solution on macos for proper linking with mpicc
- name: Install macOS compilers and older SDK
if: matrix.os == 'macos-latest'
run: |
wget https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.15.sdk.tar.xz
mkdir ../sdk; tar xf MacOSX10.15.sdk.tar.xz -C ../sdk
conda install clang_osx-64
- name: Install basic testing/feature dependencies
run: |
pip install -r install/testing_requirements.txt
pip install -r install/misc_feature_requirements.txt
- name: Install mpi4py and MPI from conda
run: |
conda install mpi4py ${{ matrix.mpi-version }}
- name: Install generator dependencies
if: matrix.os != 'windows-latest' && steps.cache.outputs.cache-hit != 'true'
run: |
python -m pip install --upgrade pip
pip install mpmath
conda install numpy nlopt scipy
- uses: actions/cache/save@v3
name: Save dependencies to cache
if: matrix.os == 'ubuntu-latest'
with:
path: |
/home/runner/.local
/usr/share/miniconda3/envs/condaenv
/usr/share/miniconda3/bin
/usr/share/miniconda3/lib
/usr/share/miniconda3/include
key: libe-${{ github.ref_name }}-${{ matrix.python-version }}-${{ matrix.comms-type }}

- name: Install libEnsemble, flake8, lock environment
run: |
pip install -e .
flake8 libensemble
- name: Run simple tests, Ubuntu
if: matrix.os == 'ubuntu-latest'
run: |
./libensemble/tests/run-tests.sh -A "-W error" -z -${{ matrix.comms-type }}
- name: Run simple tests, macOS
if: matrix.os == 'macos-latest'
env:
CONDA_BUILD_SYSROOT: /Users/runner/work/libensemble/sdk/MacOSX10.15.sdk
run: |
./libensemble/tests/run-tests.sh -A "-W error" -z -${{ matrix.comms-type }}
- name: Merge coverage
run: |
mv libensemble/tests/.cov* .
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

spellcheck:
name: Spellcheck release branch
if: contains(github.base_ref, 'develop')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: crate-ci/[email protected]
105 changes: 33 additions & 72 deletions .github/workflows/ci.yml → .github/workflows/extra.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
name: libEnsemble-CI
name: libEnsemble-complete-CI

on:
pull_request:
types:
- ready_for_review
- opened
- reopened
- synchronize
workflow_dispatch:

jobs:
test-libE:
if: '! github.event.pull_request.draft'
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
mpi-version: [mpich]
python-version: [3.8, 3.9, "3.10", "3.11"]
python-version: [3.9, "3.10", "3.11", "3.12"]
comms-type: [m, l]
include:
- os: macos-latest
python-version: 3.9
python-version: 3.11
mpi-version: "mpich=4.0.3"
comms-type: m
- os: macos-latest
python-version: 3.9
python-version: 3.11
mpi-version: "mpich=4.0.3"
comms-type: l
- os: ubuntu-latest
Expand All @@ -32,8 +28,9 @@ jobs:
comms-type: t
- os: ubuntu-latest
mpi-version: "openmpi"
python-version: "3.10"
python-version: "3.11"
comms-type: l

env:
HYDRA_LAUNCHER: "fork"
TERM: xterm-256color
Expand All @@ -44,7 +41,7 @@ jobs:
shell: bash -l {0}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup conda - Python ${{ matrix.python-version }}
uses: conda-incubator/setup-miniconda@v2
with:
Expand Down Expand Up @@ -74,13 +71,6 @@ jobs:
python --version
pip install -I --upgrade certifi
# - name: Windows - Add clang path to $PATH env
# shell: bash
# if: matrix.os == 'windows-latest'
# run: |
# echo "PATH=$PATH:C:\msys64\mingw64\bin" >> $GITHUB_ENV
# echo "PATH=$PATH:C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64" >> $GITHUB_ENV

- name: Install Ubuntu compilers
if: matrix.os == 'ubuntu-latest'
run: conda install gcc_linux-64
Expand All @@ -93,16 +83,6 @@ jobs:
mkdir ../sdk; tar xf MacOSX10.15.sdk.tar.xz -C ../sdk
conda install clang_osx-64
# - name: Setup MPI (${{ matrix.mpi-version }})
# uses: mpi4py/setup-mpi@v1
# if: matrix.os == 'windows-latest'
# with:
# mpi: ${{ matrix.mpi-version }}

# - name: Install mpi4py on Windows
# if: matrix.os == 'windows-latest'
# run: pip install mpi4py

- name: Install mpi4py and MPI from conda
if: (matrix.python-version != '3.10' && matrix.os == 'ubuntu-latest') || matrix.os == 'macos-latest'
run: |
Expand All @@ -115,11 +95,14 @@ jobs:
pip install mpi4py
- name: Install generator dependencies
if: matrix.os != 'windows-latest' && steps.cache.outputs.cache-hit != 'true'
if: steps.cache.outputs.cache-hit != 'true'
run: |
python -m pip install --upgrade pip
conda env update --file install/gen_deps_environment.yml
- name: Install ax-platform
if: matrix.python-version != '3.12'
run: |
pip install ax-platform==0.2.8
- name: Install surmise
Expand All @@ -128,7 +111,7 @@ jobs:
pip install --upgrade git+https://github.com/bandframework/surmise.git@develop
- name: Build ytopt and dependencies
if: matrix.python-version != '3.11' && matrix.os != 'windows-latest' && matrix.os != 'macos-latest'
if: matrix.python-version <= '3.10' && matrix.os != 'macos-latest'
run: |
pip install scikit-learn==1.1.2
pip install pandas==1.5.3
Expand All @@ -147,18 +130,9 @@ jobs:
pip install .
cd ..
# - name: Install some generator dependencies on Windows
# if: matrix.os == 'windows-latest'
# run: |
# python -m pip install --upgrade pip
# conda install nlopt
# conda install scipy
# pip install mpmath

- name: Install generator dependencies for Ubuntu tests
if: matrix.os == 'ubuntu-latest' && steps.cache.outputs.cache-hit != 'true'
if: matrix.os == 'ubuntu-latest' && steps.cache.outputs.cache-hit != 'true' && matrix.python-version != '3.12'
run: |
conda install octave
sudo apt-get install bc
# begin heffte build and dependencies
Expand All @@ -177,16 +151,17 @@ jobs:
# pip install git+https://github.com/dragonfly/dragonfly.git
pip install git+https://github.com/jlnav/dragonfly.git@fix/remove_npobject
pip install scikit-build packaging Tasmanian --user
- name: Copy heffte exe on cache-hit
if: matrix.os == 'ubuntu-latest' && steps.cache.outputs.cache-hit != 'false'
if: matrix.os == 'ubuntu-latest' && steps.cache.outputs.cache-hit != 'false' && matrix.python-version != '3.12'
run: |
cd /home/runner/work/libensemble/libensemble
cp ./heffte/build/benchmarks/speed3d_c2c ./libensemble/tests/regression_tests/
- name: Install other testing dependencies
run: |
conda install octave
pip install scikit-build packaging Tasmanian --user
conda install pyzmq
pip install -r install/testing_requirements.txt
pip install -r install/misc_feature_requirements.txt
Expand All @@ -212,53 +187,39 @@ jobs:
pip install -e .
flake8 libensemble
- name: Remove ytopt-heffte test on Python 3.11 (easy way)
if: matrix.python-version == '3.11'
- name: Remove various tests on newer pythons
if: matrix.python-version >= '3.11'
run: |
rm ./libensemble/tests/regression_tests/test_heffte.py
rm ./libensemble/tests/regression_tests/test_ytopt_heffte.py
rm ./libensemble/tests/regression_tests/test_persistent_gp.py
rm ./libensemble/tests/regression_tests/test_persistent_gp_multitask_ax.py
- name: Run extensive tests, Ubuntu
if: matrix.os == 'ubuntu-latest'
run: |
./libensemble/tests/run-tests.sh -e -A "-W error" -z -${{ matrix.comms-type }}
# - name: Run simple tests, Windows
# if: matrix.os == 'windows-latest'
# run: |
# ./libensemble/tests/run-tests.sh -A "-W error" -z -${{ matrix.comms-type }}
./libensemble/tests/run-tests.sh -e -z -${{ matrix.comms-type }}
- name: Run extensive tests, macOS
if: matrix.os == 'macos-latest'
env:
CONDA_BUILD_SYSROOT: /Users/runner/work/libensemble/sdk/MacOSX10.15.sdk
run: |
./libensemble/tests/run-tests.sh -e -A "-W error" -z -${{ matrix.comms-type }}
./libensemble/tests/run-tests.sh -e -z -${{ matrix.comms-type }}
- name: Merge coverage, run Coveralls
env:
COVERALLS_PARALLEL: true
- name: Merge coverage
run: |
mv libensemble/tests/.cov* .
coveralls --service=github
coveralls:
name: Notify coveralls of all jobs completing
needs: [test-libE]
if: '! github.event.pull_request.draft'
runs-on: ubuntu-latest
container: python:3-slim
steps:
- name: Finished
run: |
pip3 install --upgrade coveralls
coveralls --finish
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

spellcheck:
name: Spellcheck release branch
if: contains(github.base_ref, 'main')
if: contains(github.base_ref, 'develop')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: crate-ci/typos@v1.0.4
- uses: actions/checkout@v4
- uses: crate-ci/typos@v1.16.23
8 changes: 7 additions & 1 deletion .typos.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
[default]
extend-ignore-identifiers-re = [
".*NDArray.*",
"8ba9de56.*"
]

[default.extend-words]
als = "als"
datas = "datas"
numer = "numer"
inout = "inout"

[files]
extend-exclude = ["*.bib", "*.xml"]
extend-exclude = ["*.bib", "*.xml", "docs/nitpicky"]
4 changes: 2 additions & 2 deletions .wci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ description: |
language: Python

release:
version: 1.0.0
date: 2023-09-25
version: 1.1.0
date: 2023-11-08

documentation:
general: https://libensemble.readthedocs.io
Expand Down
Loading

0 comments on commit 06ae667

Please sign in to comment.