Skip to content

Commit

Permalink
Refactor: Ensure params are numpy arrays in nll_func
Browse files Browse the repository at this point in the history
  • Loading branch information
jonas-eschle committed Oct 12, 2024
1 parent 41e5e21 commit 6e942a9
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 43 deletions.
43 changes: 8 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,58 +27,31 @@ defaults:

jobs:
tests_graph:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
timeout-minutes: 150
strategy:
max-parallel: 4
max-parallel: 16
fail-fast: False
matrix:
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
name: JIT compiled tests for Python ${{ matrix.python-version }}
os: [ ubuntu-latest, macos-latest, windows-latest ]
python-version: [ "3.9", "3.12" ]
jit: [ "0", "1" ]
name: Tests for Python ${{ matrix.python-version }} with JIT=${{ matrix.jit }}
steps:
- uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@v1
name: Set up Micromamba environment
with:
environment-name: test-env
create-args: >-
python=${{ matrix.python-version }} pip
python=${{ matrix.python-version }} pip uv root
- name: Install Python dependencies
run: |
which python
python -V
python -m pip install uv
python -m uv pip install -e ".[dev]"
- name: Test with pytest
run: |
ZFIT_DO_JIT=${{ matrix.jit }}
coverage run --source=. --omit=".tox/*" --branch -m pytest .
coverage report
tests_eager:
runs-on: ubuntu-latest
timeout-minutes: 150
strategy:
max-parallel: 4
fail-fast: False
matrix:
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
name: Eager mode tests for Python ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@v1
name: Set up Micromamba environment
with:
environment-name: test-env
create-args: >-
python=${{ matrix.python-version }} pip
- name: Install Python dependencies
run: |
which python
python -V
python -m pip install uv
python -m uv pip install -e ".[dev]"
- name: Test with pytest
run: |
ZFIT_DO_JIT=0
coverage run --source=. --omit=".tox/*,*/test*," --branch -m pytest .
coverage report
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ repos:
- id: fix-byte-order-marker
- id: check-ast

- repo: https://github.com/PyCQA/docformatter
rev: v1.7.5
hooks:
- id: docformatter
args: [ -r, --in-place, --wrap-descriptions, '120', --wrap-summaries, '120', -- ]
# - repo: https://github.com/PyCQA/docformatter
# rev: v1.7.5
# hooks:
# - id: docformatter
# args: [ -r, --in-place, --wrap-descriptions, '120', --wrap-summaries, '120', -- ]

- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.10.0
Expand Down
1 change: 0 additions & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ sphinxcontrib-images
sphinxcontrib-youtube>=1.0.0,<1.2.0
tox>=2.9.1
twine>=1.10.0
twine
watchdog>=0.8.3
wheel>=0.29.0
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ maintainer_email = [email protected]
license = BSD-3-Clause
license_files = LICENSE
classifiers =
Development Status :: 3 - Alpha
Development Status :: 4 - Beta
Intended Audience :: Science/Research
License :: OSI Approved :: BSD License
Natural Language :: English
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
install_requires=requirements,
long_description=readme,
include_package_data=True,
packages=find_packages(include=["zfit_physics", "zfit_physics.models", "zfit_physics.unstable"]),
packages=find_packages(
include=["zfit_physics", "zfit_physics.models", "zfit_physics.unstable", "zfit_physics.pyhf"]
),
test_suite="tests",
extras_require={"dev": dev_requirements},
use_scm_version=True,
Expand Down

0 comments on commit 6e942a9

Please sign in to comment.