Skip to content

Calibration rejected #447

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

Merged
merged 43 commits into from
May 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9c0fdb7
Check components in look-ahead mode (#397)
yannikschaelte Jan 11, 2021
76553d9
update releasenotes
yannikschaelte Jan 20, 2021
5899d77
Merge pull request #399 from ICB-DCM/develop
yannikschaelte Jan 20, 2021
e96111a
Various improvements (#401)
yannikschaelte Feb 2, 2021
ffeb40f
Merge branch 'master' into develop
yannikschaelte Feb 3, 2021
8b492cd
Global figure settings; Fix insufficient logging of look-ahead sample…
yannikschaelte Feb 4, 2021
2550adb
update docs for master->main (#406)
yannikschaelte Feb 4, 2021
57ad0a9
update releasenotes -> 0.10.13
yannikschaelte Feb 4, 2021
d877a3b
Merge pull request #407 from ICB-DCM/develop
yannikschaelte Feb 4, 2021
cff1bf0
Speed up parameter handling (#387)
yannikschaelte Feb 9, 2021
1a1816a
Restructure tests and docs (#408)
yannikschaelte Feb 10, 2021
eecef07
Merge branch 'main' into develop
yannikschaelte Feb 10, 2021
df6ecf2
fix redis for later started workers (#410)
yannikschaelte Feb 10, 2021
da4fece
Update to python 3.9 (#411)
yannikschaelte Feb 11, 2021
4e24aed
Add more replicates to performance test due to unstable failures (#412)
yannikschaelte Feb 11, 2021
0bbfcec
Improve PEtab support (#413)
yannikschaelte Feb 15, 2021
218e9b2
Add yaml2sbml example; map parameter bounds and names (#416)
yannikschaelte Feb 16, 2021
76f3b19
fix LA sampler weighting (#418)
yannikschaelte Feb 20, 2021
944389c
Save proposal id; Add migration routines (#419)
yannikschaelte Feb 21, 2021
407dc2e
Change default la weight to ess (#421)
yannikschaelte Feb 21, 2021
acde2d4
refactor nr_samples_per_parameter
yannikschaelte Feb 21, 2021
73be5f9
fixup
yannikschaelte Feb 21, 2021
a1756f7
fix typos
yannikschaelte Feb 21, 2021
93f0b44
fix typos
yannikschaelte Feb 21, 2021
9365d99
fix weights
yannikschaelte Feb 21, 2021
1301312
Prepare release (#423)
yannikschaelte Feb 21, 2021
5cf3e11
test history.particles.proposa_id; pass t=-1 to sampler for calibrati…
yannikschaelte Feb 21, 2021
5dd96cf
Merge pull request #409 from ICB-DCM/develop
yannikschaelte Feb 21, 2021
a959177
Merge branch 'develop' into rev_nr_samples_per_particle
yannikschaelte Feb 21, 2021
df441d6
fix typo
yannikschaelte Feb 21, 2021
1630238
fixup
yannikschaelte Feb 21, 2021
1576aad
Refactor: Remove nr_samples_per_parameter (#422)
yannikschaelte Feb 21, 2021
324cb06
Limit look-ahead sample number in delayed mode (#428)
yannikschaelte Feb 22, 2021
727ae44
Update GHA CI to recent changes (#435)
yannikschaelte Mar 12, 2021
56a4513
Various: Test webserver, rerun stochastic tests, tidy up package depe…
yannikschaelte Mar 12, 2021
c01d0ce
remove simulation files by default after collecting the summary stati…
EmadAlamoudi Mar 12, 2021
ae9114b
Fix typo in petab application nb; fixes #433 (#437)
yannikschaelte Mar 14, 2021
0f3f79f
Add description of JupyterHub (#439)
yannikschaelte Mar 29, 2021
65e5218
Check feather dependency (#441)
yannikschaelte Apr 5, 2021
7bc347c
enable having rejected particles at population t=-1
EmadAlamoudi Apr 6, 2021
e76e9f2
additional fix
EmadAlamoudi Apr 7, 2021
df13d94
enable the calibration population consider non successful simulation
EmadAlamoudi Apr 12, 2021
6b24658
fix an issue with the related to population t=-1
EmadAlamoudi Apr 27, 2021
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
18 changes: 18 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
########################
# Flake8 Configuration #
########################

[flake8]

extend-ignore =
# Related to security for pickles
S301, S403

per-file-ignores =
# Imported but unused
*/__init__.py:F401
# Print
*/cli.py:T001
pyabc/storage/migrate.py:T001
# Print and asserts
test*/*.py:T001,S101
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/blank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
name: Blank issue
about: A blank issue template
title: ''
labels: ''
assignees: ''

---
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Bug description**
[A clear and concise description of what the bug is.]

**Expected behavior**
[A clear and concise description of what you expected to happen.]

**To reproduce**
[A minimal example to reproduce this error, ideally a python script.]

**Environment**
[Report at least the pyABC version (`pip show pyabc`),
python version (`which python; python --version`),
and system (Ubuntu/Mac/...).]
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''

---

**Feature description**
[A clear and concise description of what you would like to have.]

**Motivation/Application**
[Why is this feature useful?]
146 changes: 96 additions & 50 deletions .github/workflows/ci_push.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
name: CI

# trigger
on: [push]
on: [pull_request]

jobs:

base:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8, 3.7]
python-version: [3.9, 3.7]

steps:
- name: Check out repository
Expand All @@ -23,19 +24,18 @@ jobs:
uses: actions/cache@v1
with:
path: ~/.cache
key: ${{ runner.os }}-ci-base
restore-keys: ${{ runner.os }}-
key: ci-${{ runner.os }}-${{ matrix.python-version }}-base

- name: Install dependencies
run: |
.github/workflows/ci_dependencies.sh base R
pip install -e .[R,test]
run: .github/workflows/install_deps.sh base R

- name: Run tests
timeout-minutes: 7
run: |
python -m pytest --cov=pyabc --cov-report=xml \
test/base test/visualization -s
timeout-minutes: 12
run: tox -e base

- name: Run visualization tests
timeout-minutes: 3
run: tox -e visualization

- name: Coverage
uses: codecov/codecov-action@v1
Expand All @@ -47,7 +47,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8, 3.7]
python-version: [3.9, 3.7]

steps:
- name: Check out repository
Expand All @@ -62,18 +62,14 @@ jobs:
uses: actions/cache@v1
with:
path: ~/.cache
key: ${{ runner.os }}-ci-external
restore-keys: ${{ runner.os }}-
key: ci-${{ runner.os }}-${{ matrix.python-version }}-external

- name: Install dependencies
run: |
.github/workflows/ci_dependencies.sh base R
pip install -e .[R,test]
run: .github/workflows/install_deps.sh base R

- name: Run tests
timeout-minutes: 10
run: |
python -m pytest --cov=pyabc --cov-report=xml test/external -s
run: tox -e external

- name: Coverage
uses: codecov/codecov-action@v1
Expand All @@ -85,7 +81,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8, 3.7]
python-version: [3.9]

steps:
- name: Check out repository
Expand All @@ -100,18 +96,14 @@ jobs:
uses: actions/cache@v1
with:
path: ~/.cache
key: ${{ runner.os }}-ci-petab
restore-keys: ${{ runner.os }}-
key: ci-${{ runner.os }}-${{ matrix.python-version }}-petab

- name: Install dependencies
run: |
.github/workflows/ci_dependencies.sh petab
pip install -e .[petab,test]
run: .github/workflows/install_deps.sh amici

- name: Run tests
timeout-minutes: 10
run: |
python -m pytest --cov=pyabc --cov-report=xml test/petab -s
timeout-minutes: 16
run: tox -e petab

- name: Coverage
uses: codecov/codecov-action@v1
Expand All @@ -123,7 +115,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
python-version: [3.8, 3.7]
python-version: [3.9, 3.7]

steps:
- name: Check out repository
Expand All @@ -138,31 +130,82 @@ jobs:
uses: actions/cache@v1
with:
path: ~/Library/Caches/pip
key: ${{ runner.os }}-ci-base
restore-keys: ${{ runner.os }}-
key: ci-${{ runner.os }}-${{ matrix.python-version }}-mac

- name: Install dependencies
run: |
.github/workflows/ci_dependencies.sh
pip install -e .[test]
run: .github/workflows/install_deps.sh

- name: Run tests
timeout-minutes: 4
run: |
python -m pytest --cov=pyabc --cov-report=xml \
test/base/test_macos.py -s
timeout-minutes: 7
run: tox -e mac

- name: Coverage
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml

notebooks1:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9]

steps:
- name: Check out repository
uses: actions/checkout@v2

- name: Prepare python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}

- name: Cache
uses: actions/cache@v1
with:
path: ~/.cache
key: ci-${{ runner.os }}-${{ matrix.python-version }}-notebooks1

- name: Install dependencies
run: .github/workflows/install_deps.sh

- name: Run notebooks
timeout-minutes: 10
run: tox -e notebooks1

notebooks2:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9]

steps:
- name: Check out repository
uses: actions/checkout@v2

- name: Prepare python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}

- name: Cache
uses: actions/cache@v1
with:
path: ~/.cache
key: ci-${{ runner.os }}-${{ matrix.python-version }}-notebooks2

- name: Install dependencies
run: .github/workflows/install_deps.sh R amici

- name: Run notebooks
timeout-minutes: 10
run: tox -e notebooks2

quality:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
python-version: [3.9]

steps:
- name: Check out repository
Expand All @@ -177,20 +220,23 @@ jobs:
uses: actions/cache@v1
with:
path: ~/.cache
key: ${{ runner.os }}-ci-quality
restore-keys: ${{ runner.os }}-
key: ci-${{ runner.os }}-${{ matrix.python-version }}-quality

- name: Install dependencies
run: |
pip install -e .[quality]
.github/workflows/install_deps.sh doc
pip install tox

- name: Run flake8
timeout-minutes: 2
run: ./run_flake8.sh

- name: Run pyroma
run: pyroma --min=10 .
- name: Run quality checks
timeout-minutes: 10
run: tox -e project,flake8,doc

- name: Run rst-lint
run: rst-lint README.rst
- name: Test migration
timeout-minutes: 3
run: tox -e migrate

- name: Coverage
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
67 changes: 0 additions & 67 deletions .github/workflows/ci_pr.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine

- name: Build and publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*

Loading