pytensor 2.28.0__tar.gz → 2.28.1__tar.gz

{pytensor-2.28.0/pytensor.egg-info → pytensor-2.28.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pytensor
-Version: 2.28.0
+Version: 2.28.1
 Summary: Optimizing compiler for evaluating mathematical expressions on CPUs and GPUs.
 Author-email: pymc-devs <pymc.devs@gmail.com>
 License: .. _license:
@@ -244,7 +244,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?branch=main
+.. |Tests Status| image:: https://github.com/pymc-devs/pytensor/workflows/Tests/badge.svg
   :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.28.0 → pytensor-2.28.1}/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?branch=main
+.. |Tests Status| image:: https://github.com/pymc-devs/pytensor/workflows/Tests/badge.svg
   :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.28.0 → pytensor-2.28.1}/pytensor/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-02-20T16:27:45+0100",
+ "date": "2025-02-24T18:22:58+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "5d4e9e0749aa0d33a9db26080a35fdd579aef23d",
- "version": "2.28.0"
+ "full-revisionid": "67017a662a65abaa0e388925762aa3c903abe840",
+ "version": "2.28.1"
 }
 '''  # END VERSION_JSON
 

{pytensor-2.28.0 → pytensor-2.28.1}/pytensor/configdefaults.py

@@ -331,7 +331,7 @@ def add_compile_configvars():
                 rc = 1
             if rc != 0:
                 _logger.warning(
-                    "g++ not available, if using conda: `conda install m2w64-toolchain`"
+                    "g++ not available, if using conda: `conda install gxx`"
                 )
 
     if rc != 0:

{pytensor-2.28.0 → pytensor-2.28.1}/pytensor/link/numba/dispatch/slinalg.py

@@ -124,20 +124,26 @@ def solve_triangular_impl(A, B, trans, lower, unit_diagonal, b_ndim, overwrite_b
         _N = np.int32(A.shape[-1])
         _solve_check_input_shapes(A, B)
 
+        # Seems weird to not use the b_ndim input directly, but when I did that Numba complained that the output type
+        # could potentially be 3d (it didn't understand b_ndim was always equal to B.ndim)
         B_is_1d = B.ndim == 1
 
+        # This will only copy if A is not already fortran contiguous
+        A_f = np.asfortranarray(A)
+
         if overwrite_b:
-            B_copy = B
+            if B_is_1d:
+                B_copy = np.expand_dims(B, -1)
+            else:
+                # This *will* allow inplace destruction of B, but only if it is already fortran contiguous.
+                # Otherwise, there's no way to get around the need to copy the data before going into TRTRS
+                B_copy = np.asfortranarray(B)
         else:
             if B_is_1d:
-                # _copy_to_fortran_order does nothing with vectors
-                B_copy = np.copy(B)
+                B_copy = np.copy(np.expand_dims(B, -1))
             else:
                 B_copy = _copy_to_fortran_order(B)
 
-        if B_is_1d:
-            B_copy = np.expand_dims(B_copy, -1)
-
         NRHS = 1 if B_is_1d else int(B_copy.shape[-1])
 
         UPLO = val_to_int_ptr(ord("L") if lower else ord("U"))
@@ -155,7 +161,7 @@ def solve_triangular_impl(A, B, trans, lower, unit_diagonal, b_ndim, overwrite_b
             DIAG,
             N,
             NRHS,
-            np.asfortranarray(A).T.view(w_type).ctypes,
+            A_f.view(w_type).ctypes,
             LDA,
             B_copy.view(w_type).ctypes,
             LDB,

{pytensor-2.28.0 → pytensor-2.28.1}/pytensor/printing.py

@@ -89,6 +89,7 @@ def debugprint(
     | Sequence[Variable | Apply | Function | FunctionGraph],
     depth: int = -1,
     print_type: bool = False,
+    print_shape: bool = False,
     file: Literal["str"] | TextIO | None = None,
     id_type: IDTypesType = "CHAR",
     stop_on_name: bool = False,
@@ -98,6 +99,7 @@ def debugprint(
     print_op_info: bool = False,
     print_destroy_map: bool = False,
     print_view_map: bool = False,
+    print_memory_map: bool = False,
     print_fgraph_inputs: bool = False,
 ) -> str | TextIO:
     r"""Print a graph as text.
@@ -123,6 +125,8 @@ def debugprint(
         Print graph to this depth (``-1`` for unlimited).
     print_type
         If ``True``, print the `Type`\s of each `Variable` in the graph.
+    print_shape
+        If ``True``, print the shape of each `Variable` in the graph.
     file
         When `file` extends `TextIO`, print to it; when `file` is
         equal to ``"str"``, return a string; when `file` is ``None``, print to
@@ -153,6 +157,8 @@ def debugprint(
         Whether to print the `destroy_map`\s of printed objects
     print_view_map
         Whether to print the `view_map`\s of printed objects
+    print_memory_map
+        Whether to set both `print_destroy_map` and `print_view_map` to ``True``.
     print_fgraph_inputs
         Print the inputs of `FunctionGraph`\s.
 
@@ -177,6 +183,10 @@ def debugprint(
     if used_ids is None:
         used_ids = dict()
 
+    if print_memory_map:
+        print_destroy_map = True
+        print_view_map = True
+
     inputs_to_print = []
     outputs_to_print = []
     profile_list: list[Any | None] = []
@@ -265,6 +275,7 @@ N.B.:
             depth=depth,
             done=done,
             print_type=print_type,
+            print_shape=print_shape,
             file=_file,
             id_type=id_type,
             inner_graph_ops=inner_graph_vars,
@@ -295,6 +306,7 @@ N.B.:
             depth=depth,
             done=done,
             print_type=print_type,
+            print_shape=print_shape,
             file=_file,
             topo_order=topo_order,
             id_type=id_type,
@@ -365,6 +377,7 @@ N.B.:
                 depth=depth,
                 done=done,
                 print_type=print_type,
+                print_shape=print_shape,
                 file=_file,
                 id_type=id_type,
                 inner_graph_ops=inner_graph_vars,
@@ -387,6 +400,7 @@ N.B.:
                         depth=depth,
                         done=done,
                         print_type=print_type,
+                        print_shape=print_shape,
                         file=_file,
                         id_type=id_type,
                         stop_on_name=stop_on_name,
@@ -421,6 +435,7 @@ N.B.:
                     depth=depth,
                     done=done,
                     print_type=print_type,
+                    print_shape=print_shape,
                     file=_file,
                     id_type=id_type,
                     stop_on_name=stop_on_name,
@@ -452,6 +467,7 @@ def _debugprint(
     depth: int = -1,
     done: dict[Literal["output"] | Variable | Apply, str] | None = None,
     print_type: bool = False,
+    print_shape: bool = False,
     file: TextIO = sys.stdout,
     print_destroy_map: bool = False,
     print_view_map: bool = False,
@@ -484,6 +500,8 @@ def _debugprint(
         See `debugprint`.
     print_type
         See `debugprint`.
+    print_shape
+        See `debugprint`.
     file
         File-like object to which to print.
     print_destroy_map
@@ -532,6 +550,11 @@ def _debugprint(
     else:
         type_str = ""
 
+    if print_shape and hasattr(var.type, "shape"):
+        shape_str = f" shape={str(var.type.shape).replace('None', '?')}"
+    else:
+        shape_str = ""
+
     if prefix_child is None:
         prefix_child = prefix
 
@@ -612,7 +635,7 @@ def _debugprint(
         if is_inner_graph_header:
             var_output = f"{prefix}{node.op}{id_str}{destroy_map_str}{view_map_str}{o}"
         else:
-            var_output = f"{prefix}{node.op}{output_idx}{id_str}{type_str}{var_name}{destroy_map_str}{view_map_str}{o}{data}"
+            var_output = f"{prefix}{node.op}{output_idx}{id_str}{type_str}{shape_str}{var_name}{destroy_map_str}{view_map_str}{o}{data}"
 
         if print_op_info and node not in op_information:
             op_information.update(op_debug_information(node.op, node))
@@ -662,6 +685,7 @@ def _debugprint(
                     depth=depth - 1,
                     done=_done,
                     print_type=print_type,
+                    print_shape=print_shape,
                     file=file,
                     topo_order=topo_order,
                     id_type=id_type,
@@ -692,7 +716,7 @@ def _debugprint(
         else:
             data = ""
 
-        var_output = f"{prefix}{var}{id_str}{type_str}{data}"
+        var_output = f"{prefix}{var}{id_str}{type_str}{shape_str}{data}"
 
         if print_op_info and var.owner and var.owner not in op_information:
             op_information.update(op_debug_information(var.owner.op, var.owner))

{pytensor-2.28.0 → pytensor-2.28.1}/pytensor/tensor/rewriting/shape.py

@@ -966,16 +966,15 @@ def local_reshape_to_dimshuffle(fgraph, node):
     inp, output_shape = node.inputs
     [output] = node.outputs
 
-    # Remove any broadcastable dimensions from the input
-    squeeze_axes = [i for i, bcast in enumerate(inp.type.broadcastable) if bcast]
-
     # Trivial case, all dimensions of input/output are known to be broadcastable:
     # there's nothing to reshape
     if all(inp.type.broadcastable) or all(output.type.broadcastable):
+        squeeze_axes = tuple(range(inp.type.ndim))
         new_output_shape = []
         expand_axes = tuple(range(output.type.ndim))
 
     else:
+        squeeze_axes = [i for i, bcast in enumerate(inp.type.broadcastable) if bcast]
         unpacked_shape = _unpack_shape_vector(output_shape)
         new_output_shape = []
         expand_axes = []

{pytensor-2.28.0 → pytensor-2.28.1}/pytensor/tensor/type.py

@@ -399,22 +399,13 @@ class TensorType(CType[np.ndarray], HasDataType, HasShape):
         else:
             shape = self.shape
             len_shape = len(shape)
-
-            def shape_str(s):
-                if s is None:
-                    return "?"
-                else:
-                    return str(s)
-
-            formatted_shape = ", ".join(shape_str(s) for s in shape)
-            if len_shape == 1:
-                formatted_shape += ","
+            formatted_shape = str(shape).replace("None", "?")
 
             if len_shape > 2:
                 name = f"Tensor{len_shape}"
             else:
                 name = ("Scalar", "Vector", "Matrix")[len_shape]
-            return f"{name}({self.dtype}, shape=({formatted_shape}))"
+            return f"{name}({self.dtype}, shape={formatted_shape})"
 
     def __repr__(self):
         return f"TensorType({self.dtype}, shape={self.shape})"

{pytensor-2.28.0 → pytensor-2.28.1/pytensor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pytensor
-Version: 2.28.0
+Version: 2.28.1
 Summary: Optimizing compiler for evaluating mathematical expressions on CPUs and GPUs.
 Author-email: pymc-devs <pymc.devs@gmail.com>
 License: .. _license:
@@ -244,7 +244,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?branch=main
+.. |Tests Status| image:: https://github.com/pymc-devs/pytensor/workflows/Tests/badge.svg
   :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.28.0 → pytensor-2.28.1}/scripts/slowest_tests/update-slowest-times-issue.sh

@@ -7,8 +7,19 @@ repo=pytensor
 issue_number=1124
 title="Speed up test times :rocket:"
 workflow=Tests
-latest_id=$(gh run list --workflow $workflow --status success --limit 1 --json databaseId --jq '.[0].databaseId')
-jobs=$(gh api /repos/$owner/$repo/actions/runs/$latest_id/jobs --jq '.jobs | map({name: .name, run_id: .run_id, id: .id, started_at: .started_at, completed_at: .completed_at})')
+latest_id=$(gh run list --branch main --limit 1 --workflow $workflow --status success --json databaseId,startedAt,updatedAt --jq '
+. | map({
+  databaseId: .databaseId,
+  startedAt: .startedAt,
+  updatedAt: .updatedAt,
+  minutes:  (((.updatedAt | fromdate) - (.startedAt | fromdate)) / 60)
+} | select(.minutes > 10)) 
+| .[0].databaseId
+')
+jobs=$(gh api /repos/$owner/$repo/actions/runs/$latest_id/jobs --jq '
+.jobs 
+| map({name: .name, run_id: .run_id, id: .id, started_at: .started_at, completed_at: .completed_at})
+')
 
 # Skip 3.10, float32, and Benchmark tests
 function skip_job() {
@@ -31,7 +42,7 @@ function skip_job() {
 # Remove common prefix from the name
 function remove_prefix() {
     name=$1
-    echo $name | sed -e 's/^ubuntu-latest test py3.12 : fast-compile 0 : float32 0 : //'
+    echo $name | sed -e 's/^ubuntu-latest test py3.13 numpy>=2.0 : fast-compile 0 : float32 0 : //'
 }
 
 function human_readable_time() {
@@ -64,7 +75,11 @@ echo "$jobs" | jq -c '.[]' | while read -r job; do
     fi
 
     echo "Processing job: $name (ID: $id, Run ID: $run_id)"
-    times=$(gh run view --job $id --log | python extract-slow-tests.py)
+
+    # Seeing a bit more stabilty with the API rather than the CLI
+    # https://docs.github.com/en/rest/actions/workflow-jobs?apiVersion=2022-11-28#download-job-logs-for-a-workflow-run
+    times=$(gh api /repos/$owner/$repo/actions/jobs/$id/logs | python extract-slow-tests.py)
+    # times=$(gh run view --job $id --log | python extract-slow-tests.py)
 
     if [ -z "$times" ]; then
         # Some of the jobs are non-test jobs, so we skip them
@@ -89,6 +104,11 @@ echo "$jobs" | jq -c '.[]' | while read -r job; do
     fi
 done
 
+if [ -z "$all_times" ]; then
+    echo "No slow tests found, exiting"
+    exit 1
+fi
+
 run_date=$(date +"%Y-%m-%d")
 body=$(cat << EOF
 If you are motivated to help speed up some tests, we would appreciate it!
@@ -100,7 +120,8 @@ $all_times
 You can find more information on how to contribute [here](https://pytensor.readthedocs.io/en/latest/dev_start_guide.html)
 
 Automatically generated by [GitHub Action](https://github.com/pymc-devs/pytensor/blob/main/.github/workflows/slow-tests-issue.yml)
-Latest run date: $run_date
+Latest run date: $run_date 
+Run logs: [$latest_id](https://github.com/pymc-devs/pytensor/actions/runs/$latest_id)
 EOF
 )