Skip to content

Commit

Permalink
Merge branch 'develop' into update_refs
Browse files Browse the repository at this point in the history
  • Loading branch information
@PaulJonasJost
PaulJonasJost authored Sep 5, 2024
2 parents 03a7359 + 6c6cdfe commit 53a5224
Show file tree
Hide file tree
Showing 14 changed files with 280 additions and 70 deletions.
90 changes: 45 additions & 45 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand All @@ -54,7 +54,7 @@ jobs:
CXX: clang++

- name: Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
Expand All @@ -67,15 +67,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand All @@ -90,7 +90,7 @@ jobs:
run: ulimit -n 65536 65536 && tox -e base

- name: Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
Expand All @@ -103,15 +103,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~\AppData\Local\pip\Cache
Expand All @@ -136,15 +136,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand All @@ -162,7 +162,7 @@ jobs:
CXX: clang++

- name: Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
Expand All @@ -180,28 +180,28 @@ jobs:

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

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

- name: Cache tox and cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
.tox/
key: "${{ runner.os }}-${{ runner.arch }}-py${{ matrix.python-version }}-ci-${{ github.job }}"

- name: Install julia
uses: julia-actions/setup-julia@v1
uses: julia-actions/setup-julia@v2
with:
version: 1.9

- name: Cache Julia
uses: julia-actions/cache@v1
uses: julia-actions/cache@v2

- name: Install dependencies
run: .github/workflows/install_deps.sh
Expand All @@ -216,7 +216,7 @@ jobs:
run: tox -e julia

- name: Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
Expand All @@ -229,15 +229,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand All @@ -252,7 +252,7 @@ jobs:
run: tox -e optimize

- name: Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
Expand All @@ -265,15 +265,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand All @@ -288,7 +288,7 @@ jobs:
run: tox -e hierarchical

- name: Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
Expand All @@ -301,15 +301,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand All @@ -324,7 +324,7 @@ jobs:
run: tox -e select

- name: Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
Expand All @@ -337,15 +337,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand All @@ -369,15 +369,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand All @@ -402,15 +402,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand All @@ -432,15 +432,15 @@ jobs:

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

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

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand Down
1 change: 0 additions & 1 deletion doc/api.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ API reference
pypesto.history
pypesto.logging
pypesto.objective
pypesto.objective.aesara
pypesto.objective.jax
pypesto.objective.julia
pypesto.objective.roadrunner
Expand Down
17 changes: 17 additions & 0 deletions pypesto/hierarchical/base_parameter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,23 @@ def __init__(

if scale not in {LIN, LOG, LOG10}:
raise ValueError(f"Scale not recognized: {scale}.")

if (
scale in [LOG, LOG10]
and inner_parameter_type == InnerParameterType.SIGMA
):
raise ValueError(
f"Inner parameter type `{inner_parameter_type}` "
f"cannot be log-scaled."
)

if scale in [LOG, LOG10] and lb <= 0:
raise ValueError(
f"Lower bound of inner parameter `{inner_parameter_id}` "
f"cannot be non-positive for log-scaled parameters. "
f"Provide a positive lower bound."
)

self.scale = scale

if inner_parameter_type not in (
Expand Down
Loading

0 comments on commit 53a5224

Please sign in to comment.