Remove array struct support #2635
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zoldalma999
force-pushed
the
remove-arraystructs
branch
from
95c914b to
c05426b
Compare
| @@ -485,7 +485,7 @@ typedef enum { | |||
| #define PYGAMEAPI_PIXELARRAY_NUMSLOTS 2 | |||
| #define PYGAMEAPI_COLOR_NUMSLOTS 5 | |||
| #define PYGAMEAPI_MATH_NUMSLOTS 2 | |||
| #define PYGAMEAPI_BASE_NUMSLOTS 29 | |||
| #define PYGAMEAPI_BASE_NUMSLOTS 28 | |||
There was a problem hiding this comment.
This seems like a bad breaking change?
| @@ -2281,7 +1753,7 @@ MODINIT_DEFINE(base) | |||
| c_api[11] = pg_mod_autoquit; | |||
| c_api[12] = pg_RGBAFromObj; | |||
| c_api[13] = pgBuffer_AsArrayInterface; | |||
| c_api[14] = pgBuffer_AsArrayStruct; | |||
| c_api[14] = pg_SetDefaultConvertFormat; | |||
There was a problem hiding this comment.
Maybe I don't understand the C API, but this looks wrong?
There was a problem hiding this comment.
The reason this is done this way is so that I don't have to renumber all the slots. I also changed the include/_pygame.h file, so it still works. And as far as I know, we are more lenient towards C API changes than python API ones and only code that use pgBuffer_AsArrayStruct would break (which should be very few, as most if not all code should have migrated to the buffer protocol) so I removed it.
But I can also leave this as a dummy function, that just sets an exception or warning, so that there is a bit of time to migrate off of it.
ankith26
reviewed
Dec 27, 2023
zoldalma999
force-pushed
the
remove-arraystructs
branch
from
c05426b to
0f5de9f
Compare
|
This PR has conflicts that need resolving |
ankith26
reviewed
Jan 6, 2024
| PAI_ARR_HAS_DESCR = 0x800 | ||
|
|
||
|
|
||
| class ArrayInterface: |
There was a problem hiding this comment.
This PR is removing a lot of tests, some removals are justified, but I wonder if this class can be, say, rewritten to use the array interface, or the new buffer interface to test that?
There was a problem hiding this comment.
I think there is already a class like this for the buffer interface called buftools.py
MyreMylar
reviewed
Feb 12, 2024
Comment on lines
-381
to
-479
| @unittest.skipIf(IS_PYPY, "newbuf with ctypes") | ||
| def test_PgObject_AsBuffer_PyBUF_flags(self): | ||
| from pygame.bufferproxy import BufferProxy | ||
| import ctypes | ||
|
|
||
| is_lil_endian = pygame.get_sdl_byteorder() == pygame.LIL_ENDIAN | ||
| fsys, frev = ("<", ">") if is_lil_endian else (">", "<") | ||
| buftools = self.buftools | ||
| Importer = buftools.Importer | ||
| e = arrinter.Exporter( | ||
| (10, 2), typekind="f", itemsize=ctypes.sizeof(ctypes.c_double) | ||
| ) | ||
| a = BufferProxy(e) | ||
| b = Importer(a, buftools.PyBUF_SIMPLE) | ||
| self.assertEqual(b.ndim, 0) | ||
| self.assertTrue(b.format is None) | ||
| self.assertEqual(b.len, e.len) | ||
| self.assertEqual(b.itemsize, e.itemsize) | ||
| self.assertTrue(b.shape is None) | ||
| self.assertTrue(b.strides is None) | ||
| self.assertTrue(b.suboffsets is None) | ||
| self.assertFalse(b.readonly) | ||
| self.assertEqual(b.buf, e.data) | ||
| b = Importer(a, buftools.PyBUF_WRITABLE) | ||
| self.assertEqual(b.ndim, 0) | ||
| self.assertTrue(b.format is None) | ||
| self.assertEqual(b.len, e.len) | ||
| self.assertEqual(b.itemsize, e.itemsize) | ||
| self.assertTrue(b.shape is None) | ||
| self.assertTrue(b.strides is None) | ||
| self.assertTrue(b.suboffsets is None) | ||
| self.assertFalse(b.readonly) | ||
| self.assertEqual(b.buf, e.data) | ||
| b = Importer(a, buftools.PyBUF_ND) | ||
| self.assertEqual(b.ndim, e.nd) | ||
| self.assertTrue(b.format is None) | ||
| self.assertEqual(b.len, a.length) | ||
| self.assertEqual(b.itemsize, e.itemsize) | ||
| self.assertEqual(b.shape, e.shape) | ||
| self.assertTrue(b.strides is None) | ||
| self.assertTrue(b.suboffsets is None) | ||
| self.assertFalse(b.readonly) | ||
| self.assertEqual(b.buf, e.data) | ||
| e = arrinter.Exporter((5, 10), typekind="i", itemsize=2, strides=(24, 2)) | ||
| a = BufferProxy(e) | ||
| b = Importer(a, buftools.PyBUF_STRIDES) | ||
| self.assertEqual(b.ndim, e.nd) | ||
| self.assertTrue(b.format is None) | ||
| self.assertEqual(b.len, e.len) | ||
| self.assertEqual(b.itemsize, e.itemsize) | ||
| self.assertEqual(b.shape, e.shape) | ||
| self.assertEqual(b.strides, e.strides) | ||
| self.assertTrue(b.suboffsets is None) | ||
| self.assertFalse(b.readonly) | ||
| self.assertEqual(b.buf, e.data) | ||
| b = Importer(a, buftools.PyBUF_FULL_RO) | ||
| self.assertEqual(b.ndim, e.nd) | ||
| self.assertEqual(b.format, "=h") | ||
| self.assertEqual(b.len, e.len) | ||
| self.assertEqual(b.itemsize, e.itemsize) | ||
| self.assertEqual(b.shape, e.shape) | ||
| self.assertEqual(b.strides, e.strides) | ||
| self.assertTrue(b.suboffsets is None) | ||
| self.assertFalse(b.readonly) | ||
| self.assertEqual(b.buf, e.data) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_SIMPLE) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_WRITABLE) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_WRITABLE) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_ND) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_C_CONTIGUOUS) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_F_CONTIGUOUS) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_ANY_CONTIGUOUS) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_CONTIG) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_SIMPLE) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_ND) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_C_CONTIGUOUS) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_F_CONTIGUOUS) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_ANY_CONTIGUOUS) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_CONTIG) | ||
| e = arrinter.Exporter( | ||
| (3, 5, 10), | ||
| typekind="i", | ||
| itemsize=2, | ||
| strides=(120, 24, 2), | ||
| flags=arrinter.PAI_ALIGNED, | ||
| ) | ||
| a = BufferProxy(e) | ||
| b = Importer(a, buftools.PyBUF_FULL_RO) | ||
| self.assertEqual(b.ndim, e.nd) | ||
| self.assertEqual(b.format, frev + "h") | ||
| self.assertEqual(b.len, e.len) | ||
| self.assertEqual(b.itemsize, e.itemsize) | ||
| self.assertEqual(b.shape, e.shape) | ||
| self.assertEqual(b.strides, e.strides) | ||
| self.assertTrue(b.suboffsets is None) | ||
| self.assertTrue(b.readonly) | ||
| self.assertEqual(b.buf, e.data) | ||
| self.assertRaises(BufferError, Importer, a, buftools.PyBUF_FULL) | ||
|
|
There was a problem hiding this comment.
Why is this test gone? It looks to be related to the buffer interface not the array struct.
MyreMylar
approved these changes
Feb 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1497, fixes #405