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.

Sign up for GitHub

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

Jump to bottom

CI: fix benchmark steps, disable dependency caching #1494

Merged
merged 1 commit into from
Aug 11, 2022
Merged

CI: fix benchmark steps, disable dependency caching #1494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
101 changes: 54 additions & 47 deletions .github/workflows/commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2.3.4

- name: Cache python
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-3.7-pip-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-3.7-pip-
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache python
# uses: actions/cache@v3
# with:
# path: ~/.cache/pip
# key: ${{ runner.os }}-3.7-pip-${{ hashFiles('setup.cfg') }}
# restore-keys: |
# ${{ runner.os }}-3.7-pip-

- name: Setup Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -63,13 +64,14 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2.3.4

- name: Cache python
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-3.7-pip-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-3.7-pip-
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache python
# uses: actions/cache@v3
# with:
# path: ~/.cache/pip
# key: ${{ runner.os }}-3.7-pip-${{ hashFiles('setup.cfg') }}
# restore-keys: |
# ${{ runner.os }}-3.7-pip-

- name: Setup Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -119,13 +121,14 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2.3.4

- name: Cache python
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-3.7-pip-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-3.7-pip-
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache python
# uses: actions/cache@v3
# with:
# path: ~/.cache/pip
# key: ${{ runner.os }}-3.7-pip-${{ hashFiles('setup.cfg') }}
# restore-keys: |
# ${{ runner.os }}-3.7-pip-

- name: Setup Python
uses: actions/setup-python@v4
Expand All @@ -141,13 +144,14 @@ jobs:
pip install .
pip install ".[test, optional]"

- name: Cache Modflow executables
uses: actions/cache@v3
with:
path: $HOME/.local/bin
key: ${{ runner.os }}-${{ hashFiles('flopy/utils/get_modflow.py') }}
restore-keys: |
${{ runner.os }}-${{ hashFiles('flopy/utils/get_modflow.py') }}
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache Modflow executables
# uses: actions/cache@v3
# with:
# path: $HOME/.local/bin
# key: ${{ runner.os }}-${{ hashFiles('flopy/utils/get_modflow.py') }}
# restore-keys: |
# ${{ runner.os }}-${{ hashFiles('flopy/utils/get_modflow.py') }}

- name: Install Modflow executables
run: |
Expand Down Expand Up @@ -209,13 +213,14 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2.3.4

- name: Cache python
uses: actions/cache@v3
with:
path: ${{ matrix.path }}
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-${{ matrix.python-version }}-pip-
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache python
# uses: actions/cache@v3
# with:
# path: ${{ matrix.path }}
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.cfg') }}
# restore-keys: |
# ${{ runner.os }}-${{ matrix.python-version }}-pip-

- name: Setup Python
uses: actions/setup-python@v4
Expand All @@ -231,13 +236,14 @@ jobs:
pip install .
pip install ".[test, optional]"

- name: Cache Modflow executables
uses: actions/cache@v3
with:
path: $HOME/.local/bin
key: ${{ runner.os }}-${{ hashFiles('flopy/utils/get_modflow.py') }}
restore-keys: |
${{ runner.os }}-${{ hashFiles('flopy/utils/get_modflow.py') }}
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache Modflow executables
# uses: actions/cache@v3
# with:
# path: $HOME/.local/bin
# key: ${{ runner.os }}-${{ hashFiles('flopy/utils/get_modflow.py') }}
# restore-keys: |
# ${{ runner.os }}-${{ hashFiles('flopy/utils/get_modflow.py') }}

- name: Install Modflow executables
run: |
Expand Down Expand Up @@ -299,11 +305,12 @@ jobs:
- name: Get branch name
uses: nelonoel/branch-name@v1.0.1

- name: Cache Miniconda
uses: actions/cache@v2.1.0
with:
path: ~/conda_pkgs_dir
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.run-type }}-${{ hashFiles('etc/environment.yml') }}
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache Miniconda
# uses: actions/cache@v3
# with:
# path: ~/conda_pkgs_dir
# key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.run-type }}-${{ hashFiles('etc/environment.yml') }}

# Standard python fails on windows without GDAL installation
# Using custom bash shell ("shell: bash -l {0}") with Miniconda
Expand Down
96 changes: 48 additions & 48 deletions .github/workflows/daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2.3.4

- name: Cache python
uses: actions/cache@v3
with:
path: ${{ matrix.path }}
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-${{ matrix.python-version }}-pip-
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache python
# uses: actions/cache@v3
# with:
# path: ${{ matrix.path }}
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.cfg') }}
# restore-keys: |
# ${{ runner.os }}-${{ matrix.python-version }}-pip-

- name: Setup Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -116,13 +117,14 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2.3.4

- name: Cache python
uses: actions/cache@v3
with:
path: ${{ matrix.path }}
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-${{ matrix.python-version }}-pip-
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache python
# uses: actions/cache@v3
# with:
# path: ${{ matrix.path }}
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.cfg') }}
# restore-keys: |
# ${{ runner.os }}-${{ matrix.python-version }}-pip-

- name: Setup Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -201,13 +203,14 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2.3.4

- name: Cache python
uses: actions/cache@v3
with:
path: ${{ matrix.path }}
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-${{ matrix.python-version }}-pip-
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache python
# uses: actions/cache@v3
# with:
# path: ${{ matrix.path }}
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.cfg') }}
# restore-keys: |
# ${{ runner.os }}-${{ matrix.python-version }}-pip-

- name: Setup Python
uses: actions/setup-python@v4
Expand All @@ -233,18 +236,15 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Load cached benchmark results (for comparison)
uses: actions/cache@v2.1.0
uses: actions/cache@v3
with:
path: ./autotest/.benchmarks
key: benchmark-${{ matrix.os }}-${{ matrix.python-version }} }}
key: benchmark-${{ matrix.os }}-${{ matrix.python-version }}

- name: Run benchmarks
working-directory: ./autotest
run: |
pytest -v --durations=0 \
--cov=flopy --cov-report=xml \
--benchmark-only --benchmark-autosave --benchmark-compare --benchmark-compare-fail=mean:25% \
--keep-failed=.failed
pytest -v --durations=0 --cov=flopy --cov-report=xml --benchmark-only --benchmark-autosave --benchmark-compare --benchmark-compare-fail=mean:25% --keep-failed=.failed
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -299,11 +299,12 @@ jobs:
- name: Get branch name
uses: nelonoel/branch-name@v1.0.1

- name: Cache Miniconda
uses: actions/cache@v2.1.0
with:
path: ~/conda_pkgs_dir
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.run-type }}-${{ hashFiles('etc/environment.yml') }}
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache Miniconda
# uses: actions/cache@v3
# with:
# path: ~/conda_pkgs_dir
# key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.run-type }}-${{ hashFiles('etc/environment.yml') }}

# Standard python fails on windows without GDAL installation
# Using custom bash shell ("shell: bash -l {0}") with Miniconda
Expand Down Expand Up @@ -383,11 +384,12 @@ jobs:
- name: Get branch name
uses: nelonoel/branch-name@v1.0.1

- name: Cache Miniconda
uses: actions/cache@v2.1.0
with:
path: ~/conda_pkgs_dir
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.run-type }}-${{ hashFiles('etc/environment.yml') }}
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache Miniconda
# uses: actions/cache@v3
# with:
# path: ~/conda_pkgs_dir
# key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.run-type }}-${{ hashFiles('etc/environment.yml') }}

# Standard python fails on windows without GDAL installation
# Using custom bash shell ("shell: bash -l {0}") with Miniconda
Expand Down Expand Up @@ -467,11 +469,12 @@ jobs:
- name: Get branch name
uses: nelonoel/branch-name@v1.0.1

- name: Cache Miniconda
uses: actions/cache@v2.1.0
with:
path: ~/conda_pkgs_dir
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.run-type }}-${{ hashFiles('etc/environment.yml') }}
# Caching disabled until hashFiles issue resolved: https://github.com/actions/runner/issues/1840
# - name: Cache Miniconda
# uses: actions/cache@v3
# with:
# path: ~/conda_pkgs_dir
# key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.run-type }}-${{ hashFiles('etc/environment.yml') }}

# Standard python fails on windows without GDAL installation
# Using custom bash shell ("shell: bash -l {0}") with Miniconda
Expand Down Expand Up @@ -501,18 +504,15 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Load cached benchmark results (for comparison)
uses: actions/cache@v2.1.0
uses: actions/cache@v3
with:
path: ./autotest/.benchmarks
key: benchmark-${{ runner.os }}-${{ matrix.python-version }} }}
key: benchmark-${{ runner.os }}-${{ matrix.python-version }}

- name: Run benchmarks
working-directory: ./autotest
run: |
pytest -v --durations=0 \
--cov=flopy --cov-report=xml \
--benchmark-only --benchmark-autosave --benchmark-compare --benchmark-compare-fail=mean:25% \
--keep-failed=.failed
pytest -v --durations=0 --cov=flopy --cov-report=xml --benchmark-only --benchmark-autosave --benchmark-compare --benchmark-compare-fail=mean:25% --keep-failed=.failed
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down