[GR-48140] Write individual array elements of MemoryView's shape, strides and suboffsets.

Author: steve-s

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_memoryview.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -39,6 +39,7 @@
 
 import itertools
 import sys
+import struct
 
 from . import CPyExtTestCase, CPyExtFunction, CPyExtType, unhandled_error_compare_with_message, unhandled_error_compare
 
@@ -445,6 +446,29 @@ def compile_module(self, name):
 
 
 class TestObject(object):
+    def test_memoryview_fromobject_multidim(self):
+        TestType = CPyExtType(
+            "TestMemoryViewMultidim",
+            """
+            PyObject* get_converted_view(PyObject* self, PyObject* obj) {
+                PyObject *mv = PyMemoryView_FromObject(obj);
+                if (!mv) {
+                    return NULL;
+                }
+
+                Py_buffer *view = PyMemoryView_GET_BUFFER(mv);
+                // int i = (int)PyNumber_AsSsize_t(idx, NULL);
+                return PyMemoryView_FromBuffer(view);
+            }
+            """,
+            tp_methods='{"get_converted_view", get_converted_view, METH_O, ""}',
+        )
+
+        obj = TestType()
+        t1_buf = struct.pack("d"*12, *[1.5*x for x in range(12)])
+        t1_mv = memoryview(t1_buf).cast('d', shape=[3,4])
+        assert t1_mv == obj.get_converted_view(t1_mv)
+
     def test_memoryview_acquire_release(self):
         TestType = CPyExtType(
             "TestMemoryViewBuffer1",

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyMemoryViewWrapper.java

@@ -91,9 +91,7 @@ static Object getShape(int[] intArray,
                             @Cached CStructAccess.AllocateNode alloc,
                             @Cached CStructAccess.WriteLongNode write) {
                 Object mem = alloc.alloc(intArray.length * Long.BYTES);
-                for (int i = 0; i < intArray.length; i++) {
-                    write.write(mem, intArray[i]);
-                }
+                write.writeIntArray(mem, intArray);
                 return mem;
             }
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/structs/CStructAccess.java

@@ -1048,6 +1048,16 @@ public final void writeLongArray(Object pointer, long[] values, int length, int
             }
         }
 
+        public final void writeIntArray(Object pointer, int[] values) {
+            writeIntArray(pointer, values, values.length, 0, 0);
+        }
+
+        public final void writeIntArray(Object pointer, int[] values, int length, int sourceOffset, int targetOffset) {
+            for (int i = 0; i < length; i++) {
+                execute(pointer, (i + targetOffset) * Long.BYTES, values[i + sourceOffset]);
+            }
+        }
+
         public final boolean accepts(ArgDescriptor desc) {
             return desc.isI64();
         }