Skip to content

Commit 242c48e

Browse files
Bump FLINT to 3.2.0-rc1
2 parents deed5b1 + e1a59f5 commit 242c48e

37 files changed

+533
-461
lines changed

.github/workflows/buildwheel.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
fail-fast: false
162162
matrix:
163163
# Supported Flint versions:
164-
flint-tag: ['v3.0.0', 'v3.0.1', 'v3.1.0', 'v3.1.1', 'v3.1.2']
164+
flint-tag: ['v3.0.1', 'v3.1.3-p1', 'v3.2.0-rc1']
165165
steps:
166166
- uses: actions/checkout@v4
167167
- uses: actions/setup-python@v5
@@ -173,8 +173,22 @@ jobs:
173173

174174
# Test against flint main
175175
test_flint_main:
176-
name: Test flint main
177-
runs-on: ubuntu-22.04
176+
name: Test flint main Linux x86-64
177+
runs-on: ubuntu-24.04
178+
steps:
179+
- uses: actions/checkout@v4
180+
- uses: actions/setup-python@v5
181+
with:
182+
python-version: '3.13'
183+
- run: bin/install_flint_ubuntu.sh main
184+
# Need to disable flint version check to build against main
185+
- run: pip install --config-settings=setup-args="-Dflint_version_check=false" .
186+
- run: python -m flint.test --verbose
187+
188+
# Test against flint main
189+
test_flint_main_arm:
190+
name: Test flint main Linux ARM
191+
runs-on: ubuntu-24.04-arm
178192
steps:
179193
- uses: actions/checkout@v4
180194
- uses: actions/setup-python@v5

bin/build_dependencies_unix.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,13 +282,8 @@ curl -O -L https://github.com/flintlib/flint/releases/download/v$FLINTVER/flint-
282282
tar xf flint-$FLINTVER.tar.gz
283283
cd flint-$FLINTVER
284284
./bootstrap.sh
285-
# --host=$HOST_ARG\ # host is ignored
286-
# --enable-arch works on 3.1.3p1, not available on HEAD
287285
./configure --prefix=$PREFIX\
288-
--enable-arch=${HOST_ARG%%-*}\
289-
--disable-assembly\
290-
--disable-avx2\
291-
--disable-avx512\
286+
--host=$HOST_ARG\
292287
$FLINTARB_WITHGMP\
293288
--with-mpfr=$PREFIX\
294289
--disable-static\

bin/build_variables.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ MPIRVER=3.0.0 # MPIR build no longer works (not clear where to download from)
2121
# These are the actual dependencies used (at least by default):
2222
GMPVER=6.3.0
2323
MPFRVER=4.1.0
24-
FLINTVER='3.1.3-p1'
24+
FLINTVER='3.2.0-rc1'

bin/rst_to_pxd.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ def get_functions(file):
132132
macros.append(line.strip())
133133
continue
134134

135+
if line.strip().endswith('\\'):
136+
continue
137+
135138
m = is_func.match(line)
136139
if m:
137140
ret.append(clean_types(line[m.end():]))

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ project(
1212
# then we can consider not using a speculative upper version cap here.
1313
#
1414
flint_lower = '>=3.0'
15-
flint_upper = '<3.2'
15+
flint_upper = '<3.3'
1616
cython_lower = '>=3.0.11'
1717
cython_upper = '<3.2'
1818

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ skip = "*-win32 *-manylinux_i686 *-musllinux_*"
8989
# free-threaded-support = true
9090

9191
manylinux-x86_64-image = "manylinux2014"
92-
manylinux-aarch64-image = "manylinux2014"
92+
manylinux-aarch64-image = "manylinux_2_28"
9393
manylinux-i686-image = "manylinux2014"
9494
test-command = "python -c \"import flint; print(str(flint.fmpz(2)))\""
9595

src/flint/flintlib/functions/acb_hypgeom.pxd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ cdef extern from "flint/acb_hypgeom.h":
6868
void acb_hypgeom_fresnel(acb_t res1, acb_t res2, const acb_t z, int normalized, slong prec)
6969
void _acb_hypgeom_fresnel_series(acb_ptr res1, acb_ptr res2, acb_srcptr z, slong zlen, int normalized, slong len, slong prec)
7070
void acb_hypgeom_fresnel_series(acb_poly_t res1, acb_poly_t res2, const acb_poly_t z, int normalized, slong len, slong prec)
71+
void acb_hypgeom_bessel_j_deriv_bound(mag_t res, const acb_t nu, const acb_t z, ulong d)
7172
void acb_hypgeom_bessel_j_asymp(acb_t res, const acb_t nu, const acb_t z, slong prec)
7273
void acb_hypgeom_bessel_j_0f1(acb_t res, const acb_t nu, const acb_t z, slong prec)
7374
void acb_hypgeom_bessel_j(acb_t res, const acb_t nu, const acb_t z, slong prec)

src/flint/flintlib/functions/acb_mat.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ cdef extern from "flint/acb_mat.h":
2222
void acb_mat_set_fmpq_mat(acb_mat_t dest, const fmpq_mat_t src, slong prec)
2323
void acb_mat_set_arb_mat(acb_mat_t dest, const arb_mat_t src)
2424
void acb_mat_set_round_arb_mat(acb_mat_t dest, const arb_mat_t src, slong prec)
25-
void acb_mat_get_real(arb_mat_t re, const arb_mat_t mat)
26-
void acb_mat_get_imag(arb_mat_t im, const arb_mat_t mat)
25+
void acb_mat_get_real(arb_mat_t re, const acb_mat_t mat)
26+
void acb_mat_get_imag(arb_mat_t im, const acb_mat_t mat)
2727
void acb_mat_set_real_imag(acb_mat_t mat, const arb_mat_t re, const arb_mat_t im)
2828
void acb_mat_randtest(acb_mat_t mat, flint_rand_t state, slong prec, slong mag_bits)
2929
void acb_mat_randtest_eig(acb_mat_t mat, flint_rand_t state, acb_srcptr E, slong prec)

src/flint/flintlib/functions/acb_poly.pxd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ cdef extern from "flint/acb_poly.h":
195195
void acb_poly_cosh_series(acb_poly_t c, const acb_poly_t h, slong n, slong prec)
196196
void _acb_poly_sinc_series(acb_ptr s, acb_srcptr h, slong hlen, slong n, slong prec)
197197
void acb_poly_sinc_series(acb_poly_t s, const acb_poly_t h, slong n, slong prec)
198+
void _acb_poly_sinc_pi_series(acb_ptr s, acb_srcptr h, slong hlen, slong n, slong prec)
199+
void acb_poly_sinc_pi_series(acb_poly_t s, const acb_poly_t h, slong n, slong prec)
198200
void _acb_poly_lambertw_series(acb_ptr res, acb_srcptr z, slong zlen, const fmpz_t k, int flags, slong len, slong prec)
199201
void acb_poly_lambertw_series(acb_poly_t res, const acb_poly_t z, const fmpz_t k, int flags, slong len, slong prec)
200202
void _acb_poly_gamma_series(acb_ptr res, acb_srcptr h, slong hlen, slong n, slong prec)
@@ -236,7 +238,6 @@ cdef extern from "flint/acb_poly.h":
236238
void acb_poly_root_bound_fujiwara(mag_t bound, acb_poly_t poly)
237239
void _acb_poly_root_inclusion(acb_t r, const acb_t m, acb_srcptr poly, acb_srcptr polyder, slong len, slong prec)
238240
slong _acb_poly_validate_roots(acb_ptr roots, acb_srcptr poly, slong len, slong prec)
239-
void _acb_poly_refine_roots_durand_kerner(acb_ptr roots, acb_srcptr poly, slong len, slong prec)
240241
slong _acb_poly_find_roots(acb_ptr roots, acb_srcptr poly, acb_srcptr initial, slong len, slong maxiter, slong prec)
241242
slong acb_poly_find_roots(acb_ptr roots, const acb_poly_t poly, acb_srcptr initial, slong maxiter, slong prec)
242243
int _acb_poly_validate_real_roots(acb_srcptr roots, acb_srcptr poly, slong len, slong prec)

src/flint/flintlib/functions/arb.pxd

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from flint.flintlib.types.arb cimport arb_ptr, arb_srcptr, arb_t, mag_srcptr, mag_t
22
from flint.flintlib.types.arf cimport arf_rnd_t, arf_srcptr, arf_t
3-
from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, fmpz_t, mp_limb_t, mp_ptr, mp_size_t, mp_srcptr, slong, ulong
3+
from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, fmpz_t, nn_ptr, nn_srcptr, slong, ulong
44
from flint.flintlib.types.fmpq cimport fmpq_t
55

66
# unknown type FILE
@@ -318,14 +318,14 @@ cdef extern from "flint/arb.h":
318318
void arb_partitions_ui(arb_t res, ulong n, slong prec)
319319
void arb_primorial_nth_ui(arb_t res, ulong n, slong prec)
320320
void arb_primorial_ui(arb_t res, ulong n, slong prec)
321-
void _arb_atan_taylor_naive(mp_ptr y, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N, int alternating)
322-
void _arb_atan_taylor_rs(mp_ptr y, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N, int alternating)
323-
void _arb_exp_taylor_naive(mp_ptr y, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N)
324-
void _arb_exp_taylor_rs(mp_ptr y, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N)
325-
void _arb_sin_cos_taylor_naive(mp_ptr ysin, mp_ptr ycos, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N)
326-
void _arb_sin_cos_taylor_rs(mp_ptr ysin, mp_ptr ycos, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N, int sinonly, int alternating)
327-
int _arb_get_mpn_fixed_mod_log2(mp_ptr w, fmpz_t q, mp_limb_t * error, const arf_t x, mp_size_t wn)
328-
int _arb_get_mpn_fixed_mod_pi4(mp_ptr w, fmpz_t q, int * octant, mp_limb_t * error, const arf_t x, mp_size_t wn)
321+
void _arb_atan_taylor_naive(nn_ptr y, ulong * error, nn_srcptr x, slong xn, ulong N, int alternating)
322+
void _arb_atan_taylor_rs(nn_ptr y, ulong * error, nn_srcptr x, slong xn, ulong N, int alternating)
323+
void _arb_exp_taylor_naive(nn_ptr y, ulong * error, nn_srcptr x, slong xn, ulong N)
324+
void _arb_exp_taylor_rs(nn_ptr y, ulong * error, nn_srcptr x, slong xn, ulong N)
325+
void _arb_sin_cos_taylor_naive(nn_ptr ysin, nn_ptr ycos, ulong * error, nn_srcptr x, slong xn, ulong N)
326+
void _arb_sin_cos_taylor_rs(nn_ptr ysin, nn_ptr ycos, ulong * error, nn_srcptr x, slong xn, ulong N, int sinonly, int alternating)
327+
int _arb_get_mpn_fixed_mod_log2(nn_ptr w, fmpz_t q, ulong * error, const arf_t x, slong wn)
328+
int _arb_get_mpn_fixed_mod_pi4(nn_ptr w, fmpz_t q, int * octant, ulong * error, const arf_t x, slong wn)
329329
slong _arb_exp_taylor_bound(slong mag, slong prec)
330330
void arb_exp_arf_bb(arb_t z, const arf_t x, slong prec, int m1)
331331
void _arb_exp_sum_bs_simple(fmpz_t T, fmpz_t Q, flint_bitcnt_t * Qexp, const fmpz_t x, flint_bitcnt_t r, slong N)

0 commit comments

Comments
 (0)