Skip to content

Commit 4e2989d

Browse files
authored
Merge branch 'main' into universal_wheel
2 parents b837193 + 0ae3cfe commit 4e2989d

File tree

161 files changed

+5845
-5484
lines changed

Some content is hidden

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

161 files changed

+5845
-5484
lines changed

.github/workflows/pypi.yml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ jobs:
2929
- name: Build SDist
3030
run: pipx run build --sdist
3131

32-
- uses: actions/upload-artifact@v3
32+
- uses: actions/upload-artifact@v4
3333
with:
34+
name: sdist
3435
path: dist/*.tar.gz
3536

3637
build_wheels:
37-
name: Build ${{ matrix.python-version }} wheels on ${{ matrix.platform }}
38+
name: Build wheels for ${{ matrix.platform }}
3839
runs-on: ${{ matrix.platform }}
3940
strategy:
4041
matrix:
@@ -50,8 +51,9 @@ jobs:
5051
- name: Build wheels
5152
uses: pypa/[email protected]
5253

53-
- uses: actions/upload-artifact@v3
54+
- uses: actions/upload-artifact@v4
5455
with:
56+
name: wheels-${{ matrix.platform }}
5557
path: ./wheelhouse/*.whl
5658

5759
build_universal_wheel:
@@ -84,10 +86,17 @@ jobs:
8486
needs: [make_sdist,build_wheels]
8587
runs-on: ubuntu-22.04
8688
steps:
87-
- uses: actions/download-artifact@v3
89+
- uses: actions/download-artifact@v4
90+
with:
91+
name: sdist
92+
path: dist
93+
94+
- uses: actions/download-artifact@v4
8895
with:
89-
name: artifact
96+
pattern: wheels-*
9097
path: dist
98+
merge-multiple: true
99+
91100
- name: Check SDist
92101
run: |
93102
mkdir -p test-sdist
@@ -107,16 +116,22 @@ jobs:
107116
runs-on: ubuntu-latest
108117
if: github.event_name == 'release' && github.event.action == 'published'
109118
steps:
110-
- uses: actions/download-artifact@v3
119+
- uses: actions/download-artifact@v4
111120
with:
112-
name: artifact
121+
name: sdist
113122
path: dist
114123

115-
- uses: actions/download-artifact@v3
124+
- uses: actions/download-artifact@v4
116125
with:
117126
name: universal_wheel
118127
path: dist
119128

129+
- uses: actions/download-artifact@v4
130+
with:
131+
pattern: wheels-*
132+
path: dist
133+
merge-multiple: true
134+
120135
- uses: pypa/[email protected]
121136
with:
122137
user: __token__

.github/workflows/test.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ jobs:
187187
FLOAT32: ${{ matrix.float32 }}
188188

189189
- name: Upload coverage file
190-
uses: actions/upload-artifact@v3
190+
uses: actions/upload-artifact@v4
191191
with:
192-
name: coverage
192+
name: coverage-${{ steps.matrix-id.outputs.id }}
193193
path: coverage/coverage-${{ steps.matrix-id.outputs.id }}.xml
194194

195195
benchmarks:
@@ -273,10 +273,11 @@ jobs:
273273
python -m pip install -U coverage>=5.1 coveralls
274274
275275
- name: Download coverage file
276-
uses: actions/download-artifact@v3
276+
uses: actions/download-artifact@v4
277277
with:
278-
name: coverage
278+
pattern: coverage-*
279279
path: coverage
280+
merge-multiple: true
280281

281282
- name: Upload coverage to Codecov
282283
uses: codecov/codecov-action@v4

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repos:
2222
)$
2323
- id: check-merge-conflict
2424
- repo: https://github.com/astral-sh/ruff-pre-commit
25-
rev: v0.5.1
25+
rev: v0.5.6
2626
hooks:
2727
- id: ruff
2828
args: ["--fix", "--output-format=full"]

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ For issues a minimal working example (MWE) is strongly recommended when relevant
2121
(fixing a typo in the documentation does not require a MWE). For discussions,
2222
MWEs are generally required. All MWEs must be implemented using PyTensor. Please
2323
do not submit MWEs if they are not implemented in PyTensor. In certain cases,
24-
pseudocode may be acceptable, but an PyTensor implementation is always preferable.
24+
pseudocode may be acceptable, but a PyTensor implementation is always preferable.
2525

2626
## Quick links
2727

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ global-include *.h
88
global-include *.hh
99
global-include *.sh
1010
recursive-include doc *
11-
include versioneer.py
1211
include pytensor/_version.py

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ A good place to start contributing is by looking through the issues
133133

134134

135135
.. |Project Name| replace:: PyTensor
136-
.. |Tests Status| image:: https://github.com/pymc-devs/pytensor/workflows/Tests/badge.svg
137-
:target: https://github.com/pymc-devs/pytensor/actions?query=workflow%3ATests
136+
.. |Tests Status| image:: https://github.com/pymc-devs/pytensor/workflows/Tests/badge.svg?branch=main
137+
:target: https://github.com/pymc-devs/pytensor/actions?query=workflow%3ATests+branch%3Amain
138138
.. |Coverage| image:: https://codecov.io/gh/pymc-devs/pytensor/branch/main/graph/badge.svg?token=WVwr8nZYmc
139139
:target: https://codecov.io/gh/pymc-devs/pytensor

doc/generate_dtype_tensor_table.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
if len(shape[1]) < 6 or len(set(shape[1])) > 1:
3232
broadcastable_str = str(shape[1])
3333
else:
34-
broadcastable_str = '(%s,) * %d' % (str(shape[1][0]), len(shape[1]))
34+
broadcastable_str = f'({shape[1][0]},) * {len(shape[1])}'
3535
print('%s%-10s %-10s %-4s %-15s %-20s' %(
3636
letter[0], shape[0], letter[1], len(shape[1]), s, broadcastable_str
3737
))

doc/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ to extend PyTensor, please feel free to ask.
157157
install
158158
tutorial/index
159159

160-
.. _LISA: https://mila.umontreal.ca/
160+
.. _LISA: https://mila.quebec/en
161161
.. _Greek mathematician: http://en.wikipedia.org/wiki/Theano_(mathematician)
162-
.. _numpy: http://numpy.scipy.org/
162+
.. _numpy: https://numpy.org/
163163
.. _BLAS: http://en.wikipedia.org/wiki/Basic_Linear_Algebra_Subprograms
164164

165165
.. _sympy: http://www.sympy.org/

doc/library/config.rst

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,6 @@ import ``pytensor`` and print the config variable, as in:
103103

104104
String value: either ``'cpu'``
105105

106-
.. attribute:: force_device
107-
108-
Bool value: either ``True`` or ``False``
109-
110-
Default: ``False``
111-
112-
This flag's value cannot be modified during the program execution.
113-
114106
.. attribute:: print_active_device
115107

116108
Bool value: either ``True`` or ``False``
@@ -139,16 +131,6 @@ import ``pytensor`` and print the config variable, as in:
139131
equal to ``float64`` is created.
140132
This can be used to help find upcasts to ``float64`` in user code.
141133

142-
.. attribute:: deterministic
143-
144-
String value: either ``'default'``, ``'more'``
145-
146-
Default: ``'default'``
147-
148-
If ``more``, sometimes PyTensor will select :class:`Op` implementations that
149-
are more "deterministic", but slower. See the ``dnn.conv.algo*``
150-
flags for more cases.
151-
152134
.. attribute:: allow_gc
153135

154136
Bool value: either ``True`` or ``False``
@@ -373,7 +355,7 @@ import ``pytensor`` and print the config variable, as in:
373355

374356
When ``True``, ignore the first call to an PyTensor function while profiling.
375357

376-
.. attribute:: config.lib__amblibm
358+
.. attribute:: config.lib__amdlibm
377359

378360
Bool value: either ``True`` or ``False``
379361

@@ -412,16 +394,6 @@ import ``pytensor`` and print the config variable, as in:
412394
ignore it (i.e. ``'ignore'``).
413395
We suggest never using ``'ignore'`` except during testing.
414396

415-
.. attribute:: assert_no_cpu_op
416-
417-
String value: ``'ignore'`` or ``'warn'`` or ``'raise'`` or ``'pdb'``
418-
419-
Default: ``'ignore'``
420-
421-
If there is a CPU :class:`Op` in the computational graph, depending on its value,
422-
this flag can either raise a warning, an exception or drop into the frame
423-
with ``pdb``.
424-
425397
.. attribute:: on_shape_error
426398

427399
String value: ``'warn'`` or ``'raise'``
@@ -797,18 +769,3 @@ import ``pytensor`` and print the config variable, as in:
797769
The verbosity level of the meta-rewriter: ``0`` for silent, ``1`` to only
798770
warn when PyTensor cannot meta-rewrite an :class:`Op`, ``2`` for full output (e.g.
799771
timings and the rewrites selected).
800-
801-
802-
.. attribute:: config.metaopt__optimizer_excluding
803-
804-
Default: ``""``
805-
806-
A list of rewrite tags that we don't want included in the meta-rewriter.
807-
Multiple tags are separate by ``':'``.
808-
809-
.. attribute:: config.metaopt__optimizer_including
810-
811-
Default: ``""``
812-
813-
A list of rewriter tags to be included during meta-rewriting.
814-
Multiple tags are separate by ``':'``.

doc/links.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ This is a sort of memo for developers and would-be developers.
3939

4040
.. _git: http://git-scm.com/
4141
.. _pytest: http://docs.pytest.org/en/latest/
42-
.. _numpy: http://numpy.scipy.org/
42+
.. _numpy: https://numpy.org/
4343
.. _python: http://www.python.org
4444
.. _scipy: http://scipy.org/
4545

4646
.. _autodiff: http://www.autodiff.org
47-
.. _boost.python: http://www.boost.org/doc/libs/1_38_0/libs/python/doc/index.html
47+
.. _boost.python: https://www.boost.org/doc/libs/1_85_0/libs/python/doc/html/index.html
4848
.. _cython: http://www.cython.org/
4949
.. _liboil: http://liboil.freedesktop.org/wiki/
5050
.. _llvm: http://llvm.org/
51-
.. _networkx: http://networkx.lanl.gov/
52-
.. _pypy: http://codespeak.net/pypy/dist/pypy/doc/
51+
.. _networkx: https://networkx.org/
52+
.. _pypy: https://doc.pypy.org/en/latest/
5353
.. _swig: http://www.swig.org/
54-
.. _unpython: http://code.google.com/p/unpython/
55-
.. _pycppad: http://www.seanet.com/~bradbell/pycppad/index.xml
56-
.. _shedskin: http://shed-skin.blogspot.com/
54+
.. _unpython: https://code.google.com/archive/p/unpython/
55+
.. _pycppad: https://github.com/Simple-Robotics/pycppad
56+
.. _shedskin: https://shedskin.github.io/shedskin/

0 commit comments

Comments
 (0)