forked from sagemath/sage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sagemathgh-36407: Support python 3.12
This PR adds support for running with python 3.12 from system. This has been tested on the python 3.12 branch of void linux (x86_64, x86_64-musl and i686). The first two commits correspond to sagemath#36403. The rest is split is small pieces and I tried to add reasonable explanations in the commit messages. Reviewing by commit may be easier (ignoring the first two, already reviewed). See also: sagemath#36181 ### ⌛ Dependencies sagemath#36403 URL: sagemath#36407 Reported by: Gonzalo Tornaría Reviewer(s): Matthias Köppe
- Loading branch information
Showing
19 changed files
with
176 additions
and
46 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
#include "Python.h" | ||
#include <stdbool.h> | ||
|
||
#if PY_VERSION_HEX >= 0x030C00A5 | ||
#define ob_digit(o) (((PyLongObject*)o)->long_value.ob_digit) | ||
#else | ||
#define ob_digit(o) (((PyLongObject*)o)->ob_digit) | ||
#endif | ||
|
||
#if PY_VERSION_HEX >= 0x030C00A7 | ||
// taken from cpython:Include/internal/pycore_long.h @ 3.12 | ||
|
||
/* Long value tag bits: | ||
* 0-1: Sign bits value = (1-sign), ie. negative=2, positive=0, zero=1. | ||
* 2: Reserved for immortality bit | ||
* 3+ Unsigned digit count | ||
*/ | ||
#define SIGN_MASK 3 | ||
#define SIGN_ZERO 1 | ||
#define SIGN_NEGATIVE 2 | ||
#define NON_SIZE_BITS 3 | ||
|
||
static inline bool | ||
_PyLong_IsZero(const PyLongObject *op) | ||
{ | ||
return (op->long_value.lv_tag & SIGN_MASK) == SIGN_ZERO; | ||
} | ||
|
||
static inline bool | ||
_PyLong_IsNegative(const PyLongObject *op) | ||
{ | ||
return (op->long_value.lv_tag & SIGN_MASK) == SIGN_NEGATIVE; | ||
} | ||
|
||
static inline bool | ||
_PyLong_IsPositive(const PyLongObject *op) | ||
{ | ||
return (op->long_value.lv_tag & SIGN_MASK) == 0; | ||
} | ||
|
||
static inline Py_ssize_t | ||
_PyLong_DigitCount(const PyLongObject *op) | ||
{ | ||
assert(PyLong_Check(op)); | ||
return op->long_value.lv_tag >> NON_SIZE_BITS; | ||
} | ||
|
||
#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS)) | ||
|
||
static inline void | ||
_PyLong_SetSignAndDigitCount(PyLongObject *op, int sign, Py_ssize_t size) | ||
{ | ||
assert(size >= 0); | ||
assert(-1 <= sign && sign <= 1); | ||
assert(sign != 0 || size == 0); | ||
op->long_value.lv_tag = TAG_FROM_SIGN_AND_SIZE(sign, (size_t)size); | ||
} | ||
|
||
#else | ||
// fallback for < 3.12 | ||
|
||
static inline bool | ||
_PyLong_IsZero(const PyLongObject *op) | ||
{ | ||
return Py_SIZE(op) == 0; | ||
} | ||
|
||
static inline bool | ||
_PyLong_IsNegative(const PyLongObject *op) | ||
{ | ||
return Py_SIZE(op) < 0; | ||
} | ||
|
||
static inline bool | ||
_PyLong_IsPositive(const PyLongObject *op) | ||
{ | ||
return Py_SIZE(op) > 0; | ||
} | ||
|
||
static inline Py_ssize_t | ||
_PyLong_DigitCount(const PyLongObject *op) | ||
{ | ||
Py_ssize_t size = Py_SIZE(op); | ||
return size < 0 ? -size : size; | ||
} | ||
|
||
static inline void | ||
_PyLong_SetSignAndDigitCount(PyLongObject *op, int sign, Py_ssize_t size) | ||
{ | ||
#if (PY_MAJOR_VERSION == 3) && (PY_MINOR_VERSION < 9) | ||
// The function Py_SET_SIZE is defined starting with python 3.9. | ||
Py_SIZE(o) = size; | ||
#else | ||
Py_SET_SIZE(op, sign < 0 ? -size : size); | ||
#endif | ||
} | ||
|
||
#endif |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
from cpython.longintrepr cimport py_long, digit | ||
|
||
cdef extern from "pycore_long.h": | ||
digit* ob_digit(py_long o) | ||
bint _PyLong_IsZero(py_long o) | ||
bint _PyLong_IsNegative(py_long o) | ||
bint _PyLong_IsPositive(py_long o) | ||
Py_ssize_t _PyLong_DigitCount(py_long o) | ||
void _PyLong_SetSignAndDigitCount(py_long o, int sign, Py_ssize_t size) |
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
# sage.doctest: optional - sage.rings.finite_rings | ||
# cython: profile=True | ||
""" | ||
Lean matrices | ||
|
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
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
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
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
Oops, something went wrong.