Merge branch 'master' into feature/855-normaldist

CHANGELOG.md

@@ -19,7 +19,8 @@
 ### Random
 - [#858](https://github.com/helmholtz-analytics/heat/pull/858) New Feature: `standard_normal`, `normal`
 
-# v1.1.0
+# v1.1.1
+- [#864](https://github.com/helmholtz-analytics/heat/pull/864) Dependencies: constrain `torchvision` version range to match supported `pytorch` version range.
 
 ## Highlights
 - Slicing/indexing overhaul for a more NumPy-like user experience. Warning for distributed arrays: [breaking change!](#breaking-changes) Indexing one element along the distribution axis now implies the indexed element is communicated to all processes.

heat/core/dndarray.py

@@ -57,7 +57,7 @@ class DNDarray:
     balanced: bool or None
         Describes whether the data are evenly distributed across processes.
         If this information is not available (``self.balanced is None``), it
-        can be gathered via the :func:`is_distributed()` method (requires communication).
+        can be gathered via the :func:`is_balanced()` method (requires communication).
     """
 
     def __init__(
@@ -180,9 +180,6 @@ def nbytes(self) -> int:
     def ndim(self) -> int:
         """
         Number of dimensions of the ``DNDarray``
-
-        .. deprecated:: 0.5.0
-          `numdims` will be removed in HeAT 1.0.0, it is replaced by `ndim` because the latter is numpy API compliant.
         """
         return len(self.__gshape)
 

heat/core/linalg/basics.py

@@ -6,7 +6,7 @@
 import torch
 import warnings
 
-from typing import List, Callable, Union, Optional, Tuple, Literal
+from typing import List, Callable, Union, Optional, Tuple
 
 from torch._C import Value
 
@@ -780,7 +780,7 @@ def matrix_norm(
     x: DNDarray,
     axis: Optional[Tuple[int, int]] = None,
     keepdims: bool = False,
-    ord: Optional[Union[int, Literal["fro", "nuc"]]] = None,
+    ord: Optional[Union[int, str]] = None,
 ) -> DNDarray:
     """
     Computes the matrix norm of an array.
@@ -908,7 +908,7 @@ def norm(
     x: DNDarray,
     axis: Optional[Union[int, Tuple[int, int]]] = None,
     keepdims: bool = False,
-    ord: Optional[Union[int, float, Literal["fro", "nuc"]]] = None,
+    ord: Optional[Union[int, float, str]] = None,
 ) -> DNDarray:
     """
     Return the vector or matrix norm of an array.

heat/core/version.py

@@ -4,7 +4,7 @@
 """Indicates HeAT's main version."""
 minor: int = 1
 """Indicates feature extension."""
-micro: int = 0
+micro: int = 1
 """Indicates revisions for bugfixes."""
 extension: str = None
 """Indicates special builds, e.g. for specific hardware."""

setup.py

@@ -36,7 +36,7 @@
         "torch>=1.7.0, <1.9",
         "scipy>=0.14.0",
         "pillow>=6.0.0",
-        "torchvision>=0.8.0",
+        "torchvision>=0.8.0, <0.10",
     ],
     extras_require={
         "docutils": ["docutils>=0.16"],