Merge pull request #1928 from IntelPython/bugfix/gh-1926-astype

Bugfix/gh 1926 astype

Author: oleksandr-pavlyk

dpctl/tensor/_copy_utils.py

@@ -672,9 +672,13 @@ def astype(
     f_contig = usm_ary.flags.f_contiguous
     needs_copy = copy or not ary_dtype == target_dtype
     if not needs_copy and (order != "K"):
-        needs_copy = (c_contig and order not in ["A", "C"]) or (
-            f_contig and order not in ["A", "F"]
-        )
+        # ensure that order="F" for C-contig input triggers copy,
+        # and order="C" for F-contig input triggers copy too.
+        # 1D arrays which are both C- and F- contig should not
+        # force copying for neither order="F", nor order="C", see gh-1926
+        needs_copy = (
+            c_contig and not f_contig and order not in ["A", "C"]
+        ) or (not c_contig and f_contig and order not in ["A", "F"])
     if not needs_copy:
         return usm_ary
     copy_order = "C"

dpctl/tests/test_usm_ndarray_ctor.py

@@ -1435,6 +1435,17 @@ def test_astype_device():
     assert r.sycl_queue == q2
 
 
+def test_astype_gh_1926():
+    get_queue_or_skip()
+
+    x = dpt.ones(64)
+    x_ = dpt.astype(x, x.dtype, copy=False, order="C")
+    assert x is x_
+
+    x__ = dpt.astype(x, x.dtype, copy=False, order="F")
+    assert x is x__
+
+
 def test_copy():
     try:
         X = dpt.usm_ndarray((5, 5), "i4")[2:4, 1:4]