From acb26f7d6b039363753a3fecb0c629668c563edc Mon Sep 17 00:00:00 2001 From: coquelin77 Date: Thu, 26 Aug 2021 13:26:08 +0200 Subject: [PATCH 1/6] removed typing.Literal from linalg.basics.py for py3.7 compatibility --- heat/core/linalg/basics.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/heat/core/linalg/basics.py b/heat/core/linalg/basics.py index 5c6225d7a0..0c67031947 100644 --- a/heat/core/linalg/basics.py +++ b/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. From 6f81f4b652a0cf59532a3ac72d32b591e8402e05 Mon Sep 17 00:00:00 2001 From: Claudia Comito Date: Mon, 6 Sep 2021 05:45:03 +0200 Subject: [PATCH 2/6] torchvision version range compatibility with pytorch version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 740f6660f7..dda7101ed5 100644 --- a/setup.py +++ b/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"], From bfbb1194346bc794f5138c684aa60ff478cc5f8a Mon Sep 17 00:00:00 2001 From: Claudia Comito Date: Mon, 6 Sep 2021 06:05:49 +0200 Subject: [PATCH 3/6] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d54b06c055..444604d240 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Pending additions +- [#864](https://github.com/helmholtz-analytics/heat/pull/864) Dependencies: constrain `torchvision` version range to match supported `pytorch` version range. + # v1.1.0 ## Highlights From 16fa572be6c2ea6e5547858bfc9b99027b2fbf29 Mon Sep 17 00:00:00 2001 From: Claudia Comito Date: Tue, 7 Sep 2021 10:50:42 +0200 Subject: [PATCH 4/6] Fix docs error --- heat/core/dndarray.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heat/core/dndarray.py b/heat/core/dndarray.py index 2243c4c8e3..a710f23d36 100644 --- a/heat/core/dndarray.py +++ b/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__( From 97af22991cf7d332b7fa37390502141764b9dee0 Mon Sep 17 00:00:00 2001 From: Claudia Comito Date: Tue, 7 Sep 2021 11:37:31 +0200 Subject: [PATCH 5/6] Fix docs --- heat/core/dndarray.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/heat/core/dndarray.py b/heat/core/dndarray.py index a710f23d36..4a797a3cd6 100644 --- a/heat/core/dndarray.py +++ b/heat/core/dndarray.py @@ -179,9 +179,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) From 2343d006edc291ac8ce33101007652557485a021 Mon Sep 17 00:00:00 2001 From: Claudia Comito Date: Wed, 8 Sep 2021 08:51:19 +0200 Subject: [PATCH 6/6] Update version, changelog --- CHANGELOG.md | 2 +- heat/core/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 444604d240..599753cb01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Pending additions +# v1.1.1 - [#864](https://github.com/helmholtz-analytics/heat/pull/864) Dependencies: constrain `torchvision` version range to match supported `pytorch` version range. # v1.1.0 diff --git a/heat/core/version.py b/heat/core/version.py index 9de7bd1335..d509d83651 100644 --- a/heat/core/version.py +++ b/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."""