pytensor 2.25.1__tar.gz → 2.25.2__tar.gz

{pytensor-2.25.1 → pytensor-2.25.2}/MANIFEST.in

@@ -8,5 +8,4 @@ global-include *.h
 global-include *.hh
 global-include *.sh
 recursive-include doc *
-include versioneer.py
 include pytensor/_version.py

{pytensor-2.25.1/pytensor.egg-info → pytensor-2.25.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytensor
-Version: 2.25.1
+Version: 2.25.2
 Summary: Optimizing compiler for evaluating mathematical expressions on CPUs and GPUs.
 Author-email: pymc-devs <pymc.devs@gmail.com>
 License: .. _license:
@@ -243,7 +243,7 @@ A good place to start contributing is by looking through the issues
 
 
 .. |Project Name| replace:: PyTensor
-.. |Tests Status| image:: https://github.com/pymc-devs/pytensor/workflows/Tests/badge.svg
-  :target: https://github.com/pymc-devs/pytensor/actions?query=workflow%3ATests
+.. |Tests Status| image:: https://github.com/pymc-devs/pytensor/workflows/Tests/badge.svg?branch=main
+  :target: https://github.com/pymc-devs/pytensor/actions?query=workflow%3ATests+branch%3Amain
 .. |Coverage| image:: https://codecov.io/gh/pymc-devs/pytensor/branch/main/graph/badge.svg?token=WVwr8nZYmc
   :target: https://codecov.io/gh/pymc-devs/pytensor

{pytensor-2.25.1 → pytensor-2.25.2}/README.rst

@@ -133,7 +133,7 @@ A good place to start contributing is by looking through the issues
 
 
 .. |Project Name| replace:: PyTensor
-.. |Tests Status| image:: https://github.com/pymc-devs/pytensor/workflows/Tests/badge.svg
-  :target: https://github.com/pymc-devs/pytensor/actions?query=workflow%3ATests
+.. |Tests Status| image:: https://github.com/pymc-devs/pytensor/workflows/Tests/badge.svg?branch=main
+  :target: https://github.com/pymc-devs/pytensor/actions?query=workflow%3ATests+branch%3Amain
 .. |Coverage| image:: https://codecov.io/gh/pymc-devs/pytensor/branch/main/graph/badge.svg?token=WVwr8nZYmc
   :target: https://codecov.io/gh/pymc-devs/pytensor

{pytensor-2.25.1 → pytensor-2.25.2}/doc/generate_dtype_tensor_table.py

@@ -31,7 +31,7 @@ for letter in letters:
         if len(shape[1]) < 6 or len(set(shape[1])) > 1:
             broadcastable_str = str(shape[1])
         else:
-            broadcastable_str = '(%s,) * %d' % (str(shape[1][0]), len(shape[1]))
+            broadcastable_str = f'({shape[1][0]},) * {len(shape[1])}'
         print('%s%-10s  %-10s  %-4s %-15s  %-20s' %(
                 letter[0], shape[0], letter[1], len(shape[1]), s, broadcastable_str
                 ))

{pytensor-2.25.1 → pytensor-2.25.2}/pyproject.toml

@@ -3,7 +3,7 @@ requires = [
     "setuptools>=59.0.0",
     "cython",
     "numpy>=1.17.0",
-    "versioneer[toml]>=0.28",
+    "versioneer[toml]==0.29",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -125,8 +125,8 @@ line-length = 88
 exclude = ["doc/", "pytensor/_version.py"]
 
 [tool.ruff.lint]
-select = ["C", "E", "F", "I", "UP", "W", "RUF"]
-ignore = ["C408", "C901", "E501", "E741", "RUF012"]
+select = ["C", "E", "F", "I", "UP", "W", "RUF", "PERF", "PTH", "ISC"]
+ignore = ["C408", "C901", "E501", "E741", "RUF012", "PERF203", "ISC001"]
 
 
 [tool.ruff.lint.isort]
@@ -136,6 +136,7 @@ lines-after-imports = 2
 # TODO: Get rid of these:
 "**/__init__.py" = ["F401", "E402", "F403"]
 "pytensor/tensor/linalg.py" = ["F403"]
+"pytensor/link/c/cmodule.py" = ["PTH"]
 # For the tests we skip because `pytest.importorskip` is used:
 "tests/link/jax/test_scalar.py" = ["E402"]
 "tests/link/jax/test_tensor_basic.py" = ["E402"]
@@ -149,23 +150,17 @@ lines-after-imports = 2
 "tests/sparse/test_sp2.py" = ["E402"]
 "tests/sparse/test_utils.py" = ["E402"]
 "tests/sparse/sandbox/test_sp.py" = ["E402", "F401"]
-"versioneer.py" = ["I"]
 
 
 [tool.mypy]
 python_version = "3.10"
 ignore_missing_imports = true
-no_implicit_optional = true
-check_untyped_defs = false
 strict_equality = true
 warn_redundant_casts = true
 warn_unused_configs = true
 warn_unused_ignores = true
 warn_return_any = true
-warn_no_return = false
 warn_unreachable = true
-show_error_codes = true
-allow_redefinition = false
 files = ["pytensor", "tests"]
 plugins = ["numpy.typing.mypy_plugin"]
 

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/__init__.py

@@ -28,7 +28,10 @@ from functools import singledispatch
 from pathlib import Path
 from typing import Any, NoReturn, Optional
 
-from pytensor.version import version as __version__
+from pytensor import _version
+
+
+__version__: str = _version.get_versions()["version"]
 
 
 pytensor_logger = logging.getLogger("pytensor")

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-07-10T08:33:07+0200",
+ "date": "2024-07-15T13:39:05+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "223b739f68bac30955cf06dafcf2932d0b3a18a7",
- "version": "2.25.1"
+ "full-revisionid": "72c6a816917b5ae1700fa469248278206a3bdf00",
+ "version": "2.25.2"
 }
 '''  # END VERSION_JSON
 

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/bin/pytensor_cache.py

@@ -30,9 +30,7 @@ def print_help(exit_status):
     print('Type "pytensor-cache clear" to erase the cache')
     print('Type "pytensor-cache list" to print the cache content')
     print('Type "pytensor-cache unlock" to unlock the cache directory')
-    print(
-        'Type "pytensor-cache cleanup" to delete keys in the old ' "format/code version"
-    )
+    print('Type "pytensor-cache cleanup" to delete keys in the old format/code version')
     print('Type "pytensor-cache purge" to force deletion of the cache directory')
     print(
         'Type "pytensor-cache basecompiledir" '

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/compile/builders.py

@@ -434,7 +434,7 @@ class OpFromGraph(Op, HasInnerGraph):
     def __str__(self):
         name = self.__class__.__name__ if self.name is None else self.name
         is_inline = self.is_inline
-        return "{name}{{inline={is_inline}}}".format(**locals())
+        return f"{name}{{inline={is_inline}}}"
 
     def _combine_list_overrides(self, default_outs, custom_outs, callable_args):
         """Combines default and custom overrides into a single list of outputs."""

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/compile/debugmode.py

@@ -478,7 +478,7 @@ def _check_inputs(
     """
     destroyed_idx_list = []
     destroy_map = node.op.destroy_map
-    for o_pos, i_pos_list in destroy_map.items():
+    for i_pos_list in destroy_map.values():
         destroyed_idx_list.extend(i_pos_list)
     destroyed_res_list = [node.inputs[i] for i in destroyed_idx_list]
 
@@ -598,7 +598,7 @@ def _check_viewmap(fgraph, node, storage_map):
         # TODO: make sure this is correct
         # According to OB, duplicate inputs are rejected on build graph time
         # if they cause problems. So if they are here it should be ok.
-        for key, val in good_alias.items():
+        for key in good_alias:
             bad_alias.pop(key, None)
         if bad_alias:
             raise BadViewMap(node, oi, outstorage, list(bad_alias.values()))
@@ -756,10 +756,7 @@ def _get_preallocated_maps(
     # TODO: Sparse? Scalar does not really make sense.
 
     # Do not preallocate memory for outputs that actually work inplace
-    considered_outputs = []
-    for r in node.outputs:
-        if r not in inplace_outs:
-            considered_outputs.append(r)
+    considered_outputs = [r for r in node.outputs if r not in inplace_outs]
 
     # Output storage that was initially present in the storage_map
     if "initial" in prealloc_modes or "ALL" in prealloc_modes:
@@ -1617,14 +1614,10 @@ class _Linker(LocalLinker):
                             opt = str(reason[0][0])
                             msg = (
                                 f"An optimization (probably {opt}) inserted an "
-                                "apply node that raise an error."
-                                + "\nThe information we have about this "
-                                "optimizations is:"
-                                + str(reason[0][1])
-                                + "\n"
-                                + reason[0][2]
-                                + "\n\nThe original exception: \n"
-                                + str(e)
+                                "apply node that raise an error.\n"
+                                "The information we have about this optimization is:"
+                                f"{reason[0][1]}\n{reason[0][2]}\n"
+                                f"\nThe original exception: \n{e}"
                             )
                             new_e = e.__class__(msg)
                             exc_type, exc_value, exc_trace = sys.exc_info()
@@ -1728,15 +1721,11 @@ class _Linker(LocalLinker):
                                 raise
                             opt = str(reason[0][0])
                             msg = (
-                                f"An optimization (probably {opt}) inserted "
-                                "an apply node that raise an error."
-                                + "\nThe information we have about this "
-                                "optimizations is:"
-                                + str(reason[0][1])
-                                + "\n"
-                                + reason[0][2]
-                                + "\n\nThe original exception: \n"
-                                + str(e)
+                                f"An optimization (probably {opt}) inserted an "
+                                "apply node that raise an error.\n"
+                                "The information we have about this optimization is:"
+                                f"{reason[0][1]}\n{reason[0][2]}\n"
+                                f"\nThe original exception: \n{e}"
                             )
                             new_e = e.__class__(msg)
                             exc_type, exc_value, exc_trace = sys.exc_info()

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/compile/function/types.py

@@ -1067,7 +1067,7 @@ class Function:
     container = property(
         lambda self: self._container,
         None,  # this property itself is not settable
-        doc=("dictionary-like access to the containers associated with " "Variables"),
+        doc=("dictionary-like access to the containers associated with Variables"),
     )
 
     def free(self):
@@ -1890,11 +1890,7 @@ def get_info_on_inputs(named_inputs, n_unnamed_inputs):
                 )
     else:
         if n_unnamed_inputs == 0:
-            msg = "The function has {} named input{} ({}).".format(
-                n_named_inputs,
-                get_plural(n_named_inputs),
-                ", ".join(named_inputs),
-            )
+            msg = f"The function has {n_named_inputs} named input{get_plural(n_named_inputs)} ({', '.join(named_inputs)})."
         else:
             msg = (
                 f"The function has {n_named_inputs} named input{get_plural(n_named_inputs)} ({', '.join(named_inputs)}), and {n_unnamed_inputs} unnamed "

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/compile/monitormode.py

@@ -110,6 +110,6 @@ def detect_nan(fgraph, i, node, fn):
         ):
             print("*** NaN detected ***")
             debugprint(node)
-            print("Inputs : %s" % [input[0] for input in fn.inputs])
-            print("Outputs: %s" % [output[0] for output in fn.outputs])
+            print(f"Inputs : {[input[0] for input in fn.inputs]}")
+            print(f"Outputs: {[output[0] for output in fn.outputs]}")
             break

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/compile/profiling.py

@@ -753,14 +753,11 @@ class ProfileStats:
                 )
             # Same as before, this I've sacrificed some information making
             # the output more readable
+        percent = sum(f for f, t, a, nd_id, nb_call in atimes[N:])
+        duration = sum(t for f, t, a, nd_id, nb_call in atimes[N:])
         print(
-            "   ... (remaining %i Apply instances account for "
-            "%.2f%%(%.2fs) of the runtime)"
-            % (
-                max(0, len(atimes) - N),
-                sum(f for f, t, a, nd_id, nb_call in atimes[N:]),
-                sum(t for f, t, a, nd_id, nb_call in atimes[N:]),
-            ),
+            f"   ... (remaining {max(0, len(atimes) - N)} Apply instances account for "
+            f"{percent:.2f}%%({duration:.2f}s) of the runtime)",
             file=file,
         )
         print("", file=file)
@@ -1380,9 +1377,9 @@ class ProfileStats:
         items.sort(key=lambda a: a[1], reverse=True)
         for idx, ((fgraph, node), node_outputs_size) in enumerate(items[:N]):
             code = ["c"] * len(node.outputs)
-            for out, inp in node.op.destroy_map.items():
+            for out in node.op.destroy_map:
                 code[out] = "i"
-            for out, inp in node.op.view_map.items():
+            for out in node.op.view_map:
                 code[out] = "v"
             shapes = str(fct_shapes[fgraph][node])
 

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/configdefaults.py

@@ -1155,14 +1155,14 @@ def _default_compiledirname() -> str:
     return safe
 
 
-def _filter_base_compiledir(path: Path) -> Path:
+def _filter_base_compiledir(path: str | Path) -> Path:
     # Expand '~' in path
-    return path.expanduser()
+    return Path(path).expanduser()
 
 
-def _filter_compiledir(path: Path) -> Path:
+def _filter_compiledir(path: str | Path) -> Path:
     # Expand '~' in path
-    path = path.expanduser()
+    path = Path(path).expanduser()
     # Turn path into the 'real' path. This ensures that:
     #   1. There is no relative path, which would fail e.g. when trying to
     #      import modules from the compile dir.

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/configparser.py

@@ -533,12 +533,11 @@ class DeviceParam(ConfigParam):
             )
         elif val == self.default:
             return val
-        else:
-            raise ValueError(
-                'Invalid value ("{val}") for configuration '
-                'variable "{self.name}". Valid options start with '
-                'one of "cpu".'
-            )
+        raise ValueError(
+            f'Invalid value ("{val}") for configuration '
+            f'variable "{self.name}". Valid options start with '
+            'one of "cpu".'
+        )
 
     def __str__(self):
         return f"{self.name} ({self.default})"

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/gradient.py

@@ -802,20 +802,20 @@ def _node_to_pattern(node):
         if not isinstance(connection_pattern, list):
             raise TypeError(
                 "Op.connection_pattern should return "
-                + f"list of list of bool, but for Op={node.op}"
-                + f"got {connection_pattern} with type {type(connection_pattern)}."
+                f"list of list of bool, but for Op={node.op}"
+                f"got {connection_pattern} with type {type(connection_pattern)}."
             )
         if len(connection_pattern) != len(node.inputs):
             raise ValueError(
                 f"{node.op}.connection_pattern should have {len(node.inputs)}"
-                + f" rows but has {len(connection_pattern)}."
+                f" rows but has {len(connection_pattern)}."
             )
         for ii, output_pattern in enumerate(connection_pattern):
             if not isinstance(output_pattern, list):
                 raise TypeError(
                     f"{node.op}.connection_pattern should return"
-                    + f" a list of lists, but element {int(ii)}"
-                    + f"is {output_pattern} of type {type(output_pattern)}."
+                    f" a list of lists, but element {int(ii)}"
+                    f"is {output_pattern} of type {type(output_pattern)}."
                 )
     else:
         connection_pattern = [[True for output in node.outputs] for ipt in node.inputs]
@@ -1328,7 +1328,7 @@ def _populate_grad_dict(var_to_app_to_idx, grad_dict, wrt, cost_name=None):
                 elif connected and not actually_connected:
                     msg = f"{node.op}.grad returned DisconnectedType for input {i}."
                     if hasattr(node.op, "connection_pattern"):
-                        msg += " Its connection_pattern method does not" " allow this."
+                        msg += " Its connection_pattern method does not allow this."
                         raise TypeError(msg)
                     else:
                         msg += (

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/graph/basic.py

@@ -909,6 +909,7 @@ def ancestors(
     def expand(r: Variable) -> Iterator[Variable] | None:
         if r.owner and (not blockers or r not in blockers):
             return reversed(r.owner.inputs)
+        return None
 
     yield from cast(Generator[Variable, None, None], walk(graphs, expand, False))
 
@@ -1011,6 +1012,7 @@ def vars_between(
     def expand(r: Variable) -> Iterable[Variable] | None:
         if r.owner and r not in ins:
             return reversed(r.owner.inputs + r.owner.outputs)
+        return None
 
     yield from cast(Generator[Variable, None, None], walk(outs, expand))
 
@@ -2039,13 +2041,15 @@ def get_var_by_name(
     from pytensor.graph.op import HasInnerGraph
 
     def expand(r) -> list[Variable] | None:
-        if r.owner:
-            res = list(r.owner.inputs)
+        if not r.owner:
+            return None
+
+        res = list(r.owner.inputs)
 
-            if isinstance(r.owner.op, HasInnerGraph):
-                res.extend(r.owner.op.inner_outputs)
+        if isinstance(r.owner.op, HasInnerGraph):
+            res.extend(r.owner.op.inner_outputs)
 
-            return res
+        return res
 
     results: tuple[Variable, ...] = ()
     for var in walk(graphs, expand, False):

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/graph/destroyhandler.py

@@ -182,7 +182,7 @@ def _build_droot_impact(destroy_handler):
     root_destroyer = {}  # root -> destroyer apply
 
     for app in destroy_handler.destroyers:
-        for output_idx, input_idx_list in app.op.destroy_map.items():
+        for input_idx_list in app.op.destroy_map.values():
             if len(input_idx_list) != 1:
                 raise NotImplementedError()
             input_idx = input_idx_list[0]
@@ -698,7 +698,7 @@ class DestroyHandler(Bookkeeper):
                 # keep track of clients that should run before the current Apply
                 root_clients = set_type()
                 # for each destroyed input...
-                for output_idx, input_idx_list in app.op.destroy_map.items():
+                for input_idx_list in app.op.destroy_map.values():
                     destroyed_idx = input_idx_list[0]
                     destroyed_variable = app.inputs[destroyed_idx]
                     root = droot[destroyed_variable]

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/graph/rewriting/basic.py

@@ -1664,15 +1664,12 @@ class PatternNodeRewriter(NodeRewriter):
 
         def pattern_to_str(pattern):
             if isinstance(pattern, list | tuple):
-                return "{}({})".format(
-                    str(pattern[0]),
-                    ", ".join(pattern_to_str(p) for p in pattern[1:]),
-                )
+                args = ", ".join(pattern_to_str(p) for p in pattern[1:])
+                return f"{pattern[0]!s}({args})"
             elif isinstance(pattern, dict):
-                return "{} subject to {}".format(
-                    pattern_to_str(pattern["pattern"]),
-                    str(pattern.get("constraint", "no conditions")),
-                )
+                a = pattern_to_str(pattern["pattern"])
+                b = pattern.get("constraint", "no conditions")
+                return f"{a} subject to {b}"
             else:
                 return str(pattern)
 

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/graph/rewriting/db.py

@@ -229,10 +229,10 @@ class RewriteDatabaseQuery:
     def __str__(self):
         return (
             "RewriteDatabaseQuery("
-            + f"inc={self.include},ex={self.exclude},"
-            + f"require={self.require},subquery={self.subquery},"
-            + f"position_cutoff={self.position_cutoff},"
-            + f"extra_rewrites={self.extra_rewrites})"
+            f"inc={self.include},ex={self.exclude},"
+            f"require={self.require},subquery={self.subquery},"
+            f"position_cutoff={self.position_cutoff},"
+            f"extra_rewrites={self.extra_rewrites})"
         )
 
     def __setstate__(self, state):

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/graph/utils.py

@@ -245,10 +245,9 @@ class MetaType(ABCMeta):
                 else:
 
                     def __str__(self):
-                        return "{}{{{}}}".format(
-                            self.__class__.__name__,
-                            ", ".join(f"{p}={getattr(self, p)!r}" for p in props),
-                        )
+                        classname = self.__class__.__name__
+                        args = ", ".join(f"{p}={getattr(self, p)!r}" for p in props)
+                        return f"{classname}{{{args}}}"
 
                 dct["__str__"] = __str__
 

{pytensor-2.25.1 → pytensor-2.25.2}/pytensor/link/basic.py

@@ -322,7 +322,7 @@ class PerformLinker(LocalLinker):
         output_storage=None,
         storage_map=None,
     ):
-        fgraph: Any = self.fgraph
+        fgraph = self.fgraph
         order = self.schedule(fgraph)
         no_recycling = self.no_recycling
 
@@ -347,7 +347,7 @@ class PerformLinker(LocalLinker):
             thunks[-1].outputs = [storage_map[v] for v in node.outputs]
 
         computed, last_user = gc_helper(order)
-        post_thunk_old_storage: Any = [] if self.allow_gc else None
+        post_thunk_old_storage = [] if self.allow_gc else None
 
         for node in order:
             if self.allow_gc: