Skip to content

Commit b3dddf0

Browse files
authored
Merge branch 'main' into doc/remove-mutabledata
2 parents 624347d + 5d4f98b commit b3dddf0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+570
-111
lines changed

.github/workflows/mypy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
environment-file: conda-envs/environment-test.yml
2121
create-args: >-
22-
python=3.10
22+
python=3.11
2323
environment-name: pymc-test
2424
init-shell: bash
2525
cache-environment: true

.github/workflows/tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
runs-on: ${{ matrix.os }}
147147
env:
148148
TEST_SUBSET: ${{ matrix.test-subset }}
149-
PYTENSOR_FLAGS: floatX=${{ matrix.floatx }},gcc__cxxflags='-march=native'
149+
PYTENSOR_FLAGS: floatX=${{ matrix.floatx }}
150150
defaults:
151151
run:
152152
shell: bash -leo pipefail {0}
@@ -185,7 +185,7 @@ jobs:
185185
matrix:
186186
os: [windows-latest]
187187
floatx: [float64]
188-
python-version: ["3.10"]
188+
python-version: ["3.11"]
189189
test-subset:
190190
- tests/variational/test_approximations.py tests/variational/test_callbacks.py tests/variational/test_inference.py tests/variational/test_opvi.py tests/test_initial_point.py
191191
- tests/model/test_core.py tests/sampling/test_mcmc.py
@@ -196,7 +196,7 @@ jobs:
196196
runs-on: ${{ matrix.os }}
197197
env:
198198
TEST_SUBSET: ${{ matrix.test-subset }}
199-
PYTENSOR_FLAGS: floatX=${{ matrix.floatx }},gcc__cxxflags='-march=core2'
199+
PYTENSOR_FLAGS: floatX=${{ matrix.floatx }}
200200
defaults:
201201
run:
202202
shell: cmd /C call {0}
@@ -256,7 +256,7 @@ jobs:
256256
runs-on: ${{ matrix.os }}
257257
env:
258258
TEST_SUBSET: ${{ matrix.test-subset }}
259-
PYTENSOR_FLAGS: floatX=${{ matrix.floatx }},gcc__cxxflags='-march=native'
259+
PYTENSOR_FLAGS: floatX=${{ matrix.floatx }}
260260
defaults:
261261
run:
262262
shell: bash -leo pipefail {0}
@@ -306,7 +306,7 @@ jobs:
306306
runs-on: ${{ matrix.os }}
307307
env:
308308
TEST_SUBSET: ${{ matrix.test-subset }}
309-
PYTENSOR_FLAGS: floatX=${{ matrix.floatx }},gcc__cxxflags='-march=native'
309+
PYTENSOR_FLAGS: floatX=${{ matrix.floatx }}
310310
defaults:
311311
run:
312312
shell: bash -leo pipefail {0}
@@ -352,7 +352,7 @@ jobs:
352352
runs-on: ${{ matrix.os }}
353353
env:
354354
TEST_SUBSET: ${{ matrix.test-subset }}
355-
PYTENSOR_FLAGS: floatX=${{ matrix.floatx }},gcc__cxxflags='-march=core2'
355+
PYTENSOR_FLAGS: floatX=${{ matrix.floatx }}
356356
defaults:
357357
run:
358358
shell: cmd /C call {0}

conda-envs/environment-alternative-backends.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222
- numpyro>=0.8.0
2323
- pandas>=0.24.0
2424
- pip
25-
- pytensor>=2.32.0,<2.33
25+
- pytensor>=2.35.0,<2.36
2626
- python-graphviz
2727
- networkx
2828
- rich>=13.7.1

conda-envs/environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
- numpy>=1.25.0
1313
- pandas>=0.24.0
1414
- pip
15-
- pytensor>=2.32.0,<2.33
15+
- pytensor>=2.35.0,<2.36
1616
- python-graphviz
1717
- networkx
1818
- scipy>=1.4.1

conda-envs/environment-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- numpy>=1.25.0
1212
- pandas>=0.24.0
1313
- pip
14-
- pytensor>=2.32.0,<2.33
14+
- pytensor>=2.35.0,<2.36
1515
- python-graphviz
1616
- rich>=13.7.1
1717
- scipy>=1.4.1

conda-envs/environment-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- pandas>=0.24.0
1515
- pip
1616
- polyagamma
17-
- pytensor>=2.32.0,<2.33
17+
- pytensor>=2.35.0,<2.36
1818
- python-graphviz
1919
- networkx
2020
- rich>=13.7.1

conda-envs/windows-environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
- numpy>=1.25.0
1313
- pandas>=0.24.0
1414
- pip
15-
- pytensor>=2.32.0,<2.33
15+
- pytensor>=2.35.0,<2.36
1616
- python-graphviz
1717
- networkx
1818
- rich>=13.7.1

conda-envs/windows-environment-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- pandas>=0.24.0
1616
- pip
1717
- polyagamma
18-
- pytensor>=2.32.0,<2.33
18+
- pytensor>=2.35.0,<2.36
1919
- python-graphviz
2020
- networkx
2121
- rich>=13.7.1

pymc/distributions/custom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
from pytensor import Variable, clone_replace
2020
from pytensor import tensor as pt
21-
from pytensor.graph.basic import io_toposort
2221
from pytensor.graph.features import ReplaceValidate
2322
from pytensor.graph.rewriting.basic import GraphRewriter
23+
from pytensor.graph.traversal import io_toposort
2424
from pytensor.scan.op import Scan
2525
from pytensor.tensor import TensorVariable, as_tensor_variable
2626
from pytensor.tensor.random.op import RandomVariable

pymc/distributions/shape_utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,17 +230,17 @@ def rv_size_is_none(size: TensorVariable | Constant | None) -> bool:
230230

231231

232232
@singledispatch
233-
def _change_dist_size(op: Op, dist: TensorVariable, new_size, expand):
233+
def _change_dist_size(op: Op, dist: Variable, new_size, expand):
234234
raise NotImplementedError(
235235
f"Variable {dist} of type {op} has no _change_dist_size implementation."
236236
)
237237

238238

239239
def change_dist_size(
240-
dist: TensorVariable,
240+
dist: Variable,
241241
new_size: PotentialShapeType,
242242
expand: bool = False,
243-
) -> TensorVariable:
243+
) -> Variable:
244244
"""Change or expand the size of a Distribution.
245245
246246
Parameters

0 commit comments

Comments
 (0)