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

epic: export and import fit result #159

Merged
merged 21 commits into from
Jan 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9a5a16a
ci: add GitHub workflow for epic branches (#144)
redeboer Nov 9, 2020
031a800
feat: add variable logging functionality using tf (#155)
spflueger Nov 12, 2020
217ce0b
feat: print execute time in optimize (#156)
redeboer Nov 13, 2020
ff31b33
ci: allow "epic" as commit namespace
redeboer Nov 13, 2020
f4267a4
refactor: log optimize process via callbacks (#164)
redeboer Nov 16, 2020
9969a2d
feat: implement YAML optimize callback (#154)
sebastianJaeger Nov 18, 2020
ff09840
fix: link to callbacks module
redeboer Nov 18, 2020
17420dd
docs: limit number of free parameters
redeboer Nov 18, 2020
6c5533f
fix: inherit from Callback
redeboer Nov 18, 2020
0a34685
fix: rename iteration to function_call
redeboer Nov 18, 2020
0f8a7b8
Merge branch 'master' into epic/99-export-fit
redeboer Nov 19, 2020
f8c4bd6
test!: define tests for Minuit2.optimize (#169)
redeboer Nov 20, 2020
fe61e94
feat: add CSVSummary callback (#173)
sebastianJaeger Nov 20, 2020
d2746b6
fix: copy initial parameters in optimize call (#174)
redeboer Nov 20, 2020
f4ec346
Merge branch 'master' into epic/99-export-fit
redeboer Nov 21, 2020
4810b68
feat: implement Loadable callback (#177)
redeboer Nov 24, 2020
c6df8cb
Merge branch 'master' into epic/99-export-fit
redeboer Nov 24, 2020
3ab70f8
Merge remote-tracking branch 'ComPWA/master' into epic/99-export-fit
redeboer Jan 4, 2021
c5a237a
ci: upgrade developer dependencies (automatic)
redeboer Jan 4, 2021
cdadae3
fix: remove CI on epic branch (leave for PR to ~)
redeboer Jan 4, 2021
710af47
fix: plot final plot with updated parameters
redeboer Jan 4, 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
75 changes: 75 additions & 0 deletions .github/workflows/ci-epic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# cspell:ignore CUDA

name: CI for epics

on:
pull_request:
branches:
- epic/*

jobs:
pytest:
name: Unit tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- ubuntu-20.04
python-version: [3.6, 3.7, 3.8]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r reqs/${{ matrix.python-version }}/requirements-test.txt
pip install .
- name: Test with pytest
env:
CUDA_VISIBLE_DEVICES: "-1"
run: pytest -n auto

documentation:
name: Build documentation
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r reqs/3.7/requirements-doc.txt
pip install tensorflow-cpu
pip install .
sudo apt-get -y install pandoc
- name: Build documentation
working-directory: docs
env:
CUDA_VISIBLE_DEVICES: "-1"
run: make html
- name: Test doctests in docstrings
working-directory: docs
run: make ignore-warnings=1 doctest

style:
name: Style checks
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r reqs/3.7/requirements-sty.txt
pip install .
- name: Perform style checks
run: pre-commit run -a
2 changes: 1 addition & 1 deletion .github/workflows/pr-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: docker://agilepathway/pull-request-label-checker:latest
with:
any_of: Bug,💡 Enhancement,📝 Docs,🔨 Maintenance,🖱️ DX
none_of: Epic,❌ Won't fix,💫 Good first issue
none_of: ❌ Won't fix,💫 Good first issue
repo_token: ${{ secrets.GITHUB_TOKEN }}

check-title:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*.pdf
*.png
*.svg
*.v2
*.xml
*.yaml
*.yml
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ coverage:
project:
default:
# basic
target: 75% # can't go below this percentage
target: 80% # can't go below this percentage
threshold: 3% # allow drops by this percentage
base: auto
# advanced
Expand Down
4 changes: 4 additions & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@
"spflueger",
"struct",
"sympy",
"tensorboard",
"tensorflow",
"tensorwaves",
"toctree",
"topness",
"traceback",
"unbinned",
"venv",
"weisskopf",
Expand Down Expand Up @@ -119,6 +121,7 @@
"genindex",
"heli",
"histtype",
"iloc",
"iminuit",
"indeterministic",
"isort",
Expand All @@ -128,6 +131,7 @@
"linestyle",
"linkcheck",
"linspace",
"logdir",
"macos",
"markdownlint",
"mathrm",
Expand Down
1 change: 1 addition & 0 deletions docs/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.csv
*.doctree
*.inv
*build/
Expand Down
6 changes: 1 addition & 5 deletions docs/usage/1_create_model.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@
},
{
"cell_type": "markdown",
"metadata": {
"jupyter": {
"source_hidden": true
}
},
"metadata": {},
"source": [
"```{admonition} Simplified model: $J/\\psi \\to f_0\\gamma$\n",
"---\n",
Expand Down
6 changes: 1 addition & 5 deletions docs/usage/2_generate_data.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,7 @@
},
{
"cell_type": "markdown",
"metadata": {
"jupyter": {
"source_hidden": true
}
},
"metadata": {},
"source": [
"````{admonition} Available kinematic variables\n",
"---\n",
Expand Down
Loading