From ad991c35155ab1b13165a066487e194ab650a137 Mon Sep 17 00:00:00 2001 From: Natalia Polina Date: Wed, 21 Sep 2022 17:21:46 -0500 Subject: [PATCH 1/3] Fixed issue #890 in reshape() function. --- dpctl/tensor/_reshape.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dpctl/tensor/_reshape.py b/dpctl/tensor/_reshape.py index d5451a45ad..356d6a188f 100644 --- a/dpctl/tensor/_reshape.py +++ b/dpctl/tensor/_reshape.py @@ -86,7 +86,7 @@ def reshape(X, newshape, order="C", copy=None): raise TypeError if not isinstance(newshape, (list, tuple)): newshape = (newshape,) - if order not in ["C", "F"]: + if order not in "cCfF": raise ValueError( f"Keyword 'order' not recognized. Expecting 'C' or 'F', got {order}" ) From b31ddb068840a91a88173f5bde03acc430448ea5 Mon Sep 17 00:00:00 2001 From: Natalia Polina Date: Thu, 29 Sep 2022 17:43:43 -0500 Subject: [PATCH 2/3] 'order' is normalized to the upper case for reshape() function. --- dpctl/tensor/_reshape.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dpctl/tensor/_reshape.py b/dpctl/tensor/_reshape.py index 356d6a188f..293904d656 100644 --- a/dpctl/tensor/_reshape.py +++ b/dpctl/tensor/_reshape.py @@ -86,7 +86,11 @@ def reshape(X, newshape, order="C", copy=None): raise TypeError if not isinstance(newshape, (list, tuple)): newshape = (newshape,) - if order not in "cCfF": + if order in "c": + order = "C" + elif order in "f": + order = "F" + elif order not in ["C", "F"]: raise ValueError( f"Keyword 'order' not recognized. Expecting 'C' or 'F', got {order}" ) From b54d783af3bbc7ed92a8224fd5a21bf2da60212e Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Wed, 5 Oct 2022 05:13:19 -0500 Subject: [PATCH 3/3] simplified validation of 'order' arguments to reshape --- dpctl/tensor/_reshape.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dpctl/tensor/_reshape.py b/dpctl/tensor/_reshape.py index 293904d656..633a24d7e2 100644 --- a/dpctl/tensor/_reshape.py +++ b/dpctl/tensor/_reshape.py @@ -86,11 +86,9 @@ def reshape(X, newshape, order="C", copy=None): raise TypeError if not isinstance(newshape, (list, tuple)): newshape = (newshape,) - if order in "c": - order = "C" - elif order in "f": - order = "F" - elif order not in ["C", "F"]: + if order in "cfCF": + order = order.upper() + else: raise ValueError( f"Keyword 'order' not recognized. Expecting 'C' or 'F', got {order}" )