Skip to content

Commit adee77d

Browse files
author
Release Manager
committed
gh-37193: Some fixes & improvements to autogenerated flint .pxd - flint autogen: fields of a[rc]b_poly_struct - flint autogen: remove two typedefs that don't exist in flint - move fix from #37064 to the flint interface generator - flint autogen: add warnings about generated files to the templates - regenerate flint wrappers URL: #37193 Reported by: Marc Mezzarobba Reviewer(s): Vincent Delecroix
2 parents 0319fbb + c179886 commit adee77d

File tree

7 files changed

+45
-17
lines changed

7 files changed

+45
-17
lines changed

src/sage/libs/arb/types.pxd

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,8 @@ from sage.libs.flint.types cimport (
2929
acb_mat_t,
3030
acb_poly_struct,
3131
acb_poly_t,
32-
acb_poly_ptr,
33-
acb_poly_srcptr,
3432
acb_calc_integrate_opt_struct,
3533
acb_calc_integrate_opt_t,
3634
acb_calc_func_t,
3735
arb_poly_struct,
38-
arb_poly_t,
39-
arb_poly_ptr,
40-
arb_poly_srcptr)
36+
arb_poly_t)

src/sage/libs/flint/flint_sage.pyx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# distutils: extra_compile_args = -D_XPG6
2+
3+
# WARNING: src/sage/libs/flint/flint_sage.pyx is generated from
4+
# src/sage_setup/autogen/flint/templates/flint_sage.pyx.template;
5+
# please make sure that you are modifying the correct file!
6+
27
"""
38
Flint imports
49

src/sage/libs/flint/flint_wrap.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* WARNING: src/sage/libs/flint/flint_wrap.h is generated from
2+
* src/sage_setup/autogen/flint/templates/flint_wrap.h.template
3+
* please make sure that you are modifying the correct file! */
4+
15
#ifndef SAGE_FLINT_WRAP_H
26
#define SAGE_FLINT_WRAP_H
37
/* Using flint headers together in the same module as headers from

src/sage/libs/flint/types.pxd

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# distutils: depends = flint/acb.h flint/acb_calc.h flint/acb_dft.h flint/acb_dirichlet.h flint/acb_elliptic.h flint/acb_hypgeom.h flint/acb_mat.h flint/acb_modular.h flint/acb_poly.h flint/acf.h flint/aprcl.h flint/arb.h flint/arb_calc.h flint/arb_fmpz_poly.h flint/arb_fpwrap.h flint/arb_hypgeom.h flint/arb_mat.h flint/arb_poly.h flint/arf.h flint/arith.h flint/bernoulli.h flint/bool_mat.h flint/ca.h flint/ca_ext.h flint/ca_field.h flint/ca_mat.h flint/ca_poly.h flint/ca_vec.h flint/calcium.h flint/d_mat.h flint/d_vec.h flint/dirichlet.h flint/dlog.h flint/double_extras.h flint/double_interval.h flint/fexpr.h flint/fexpr_builtin.h flint/fft.h flint/flint.h flint/fmpq.h flint/fmpq_mat.h flint/fmpq_mpoly.h flint/fmpq_mpoly_factor.h flint/fmpq_poly.h flint/fmpq_vec.h flint/fmpz.h flint/fmpz_extras.h flint/fmpz_factor.h flint/fmpz_lll.h flint/fmpz_mat.h flint/fmpz_mod.h flint/fmpz_mod_mat.h flint/fmpz_mod_mpoly.h flint/fmpz_mod_mpoly_factor.h flint/fmpz_mod_poly.h flint/fmpz_mod_poly_factor.h flint/fmpz_mod_vec.h flint/fmpz_mpoly.h flint/fmpz_mpoly_factor.h flint/fmpz_mpoly_q.h flint/fmpz_poly.h flint/fmpz_poly_factor.h flint/fmpz_poly_mat.h flint/fmpz_poly_q.h flint/fmpz_vec.h flint/fmpzi.h flint/fq.h flint/fq_default.h flint/fq_default_mat.h flint/fq_default_poly.h flint/fq_default_poly_factor.h flint/fq_embed.h flint/fq_mat.h flint/fq_nmod.h flint/fq_nmod_embed.h flint/fq_nmod_mat.h flint/fq_nmod_mpoly.h flint/fq_nmod_mpoly_factor.h flint/fq_nmod_poly.h flint/fq_nmod_poly_factor.h flint/fq_nmod_vec.h flint/fq_poly.h flint/fq_poly_factor.h flint/fq_vec.h flint/fq_zech.h flint/fq_zech_embed.h flint/fq_zech_mat.h flint/fq_zech_poly.h flint/fq_zech_poly_factor.h flint/fq_zech_vec.h flint/gr.h flint/gr_generic.h flint/gr_mat.h flint/gr_mpoly.h flint/gr_poly.h flint/gr_special.h flint/gr_vec.h flint/hypgeom.h flint/long_extras.h flint/mag.h flint/mpf_mat.h flint/mpf_vec.h flint/mpfr_mat.h flint/mpfr_vec.h flint/mpn_extras.h flint/mpoly.h flint/nf.h flint/nf_elem.h flint/nmod.h flint/nmod_mat.h flint/nmod_mpoly.h flint/nmod_mpoly_factor.h flint/nmod_poly.h flint/nmod_poly_factor.h flint/nmod_poly_mat.h flint/nmod_types.h flint/nmod_vec.h flint/padic.h flint/padic_mat.h flint/padic_poly.h flint/partitions.h flint/perm.h flint/profiler.h flint/qadic.h flint/qfb.h flint/qqbar.h flint/qsieve.h flint/thread_pool.h flint/ulong_extras.h
22

3+
# WARNING: src/sage/libs/flint/types.pxd is generated from
4+
# src/sage_setup/autogen/flint/templates/types.pxd.template
5+
# please make sure that you are modifying the correct file!
6+
37
"""
48
Declarations for FLINT types
59
"""
@@ -129,10 +133,10 @@ cdef extern from "flint_wrap.h":
129133
ctypedef arb_mat_struct arb_mat_t[1]
130134

131135
ctypedef struct arb_poly_struct:
132-
pass
136+
arb_ptr coeffs
137+
long alloc
138+
long length
133139
ctypedef arb_poly_struct[1] arb_poly_t
134-
ctypedef arb_poly_struct * arb_poly_ptr
135-
ctypedef const arb_poly_struct * arb_poly_srcptr
136140

137141

138142
# flint/arb_calc.h
@@ -165,10 +169,10 @@ cdef extern from "flint_wrap.h":
165169

166170
# flint/acb_poly.h
167171
ctypedef struct acb_poly_struct:
168-
pass
172+
acb_ptr coeffs
173+
long alloc
174+
long length
169175
ctypedef acb_poly_struct[1] acb_poly_t
170-
ctypedef acb_poly_struct * acb_poly_ptr
171-
ctypedef const acb_poly_struct * acb_poly_srcptr
172176

173177
# flint/acb_calc.h
174178
ctypedef struct acb_calc_integrate_opt_struct:

src/sage_setup/autogen/flint/templates/flint_sage.pyx.template

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# distutils: extra_compile_args = -D_XPG6
2+
3+
# WARNING: src/sage/libs/flint/flint_sage.pyx is generated from
4+
# src/sage_setup/autogen/flint/templates/flint_sage.pyx.template;
5+
# please make sure that you are modifying the correct file!
6+
27
"""
38
Flint imports
49

src/sage_setup/autogen/flint/templates/flint_wrap.h.template

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* WARNING: src/sage/libs/flint/flint_wrap.h is generated from
2+
* src/sage_setup/autogen/flint/templates/flint_wrap.h.template
3+
* please make sure that you are modifying the correct file! */
4+
15
#ifndef SAGE_FLINT_WRAP_H
26
#define SAGE_FLINT_WRAP_H
37
/* Using flint headers together in the same module as headers from
@@ -40,4 +44,10 @@
4044

4145
#pragma pop_macro("ulong")
4246

47+
/* CPU_SIZE_1 and SIZE_RED_FAILURE_THRESH are defined as macros in flint/fmpz_lll.h
48+
* and as variables in fplll/defs.h, which breaks build if linbox is compiled with fplll */
49+
50+
#undef CPU_SIZE_1
51+
#undef SIZE_RED_FAILURE_THRESH
52+
4353
#endif

src/sage_setup/autogen/flint/templates/types.pxd.template

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# distutils: depends = {HEADER_LIST}
22

3+
# WARNING: src/sage/libs/flint/types.pxd is generated from
4+
# src/sage_setup/autogen/flint/templates/types.pxd.template
5+
# please make sure that you are modifying the correct file!
6+
37
"""
48
Declarations for FLINT types
59
"""
@@ -129,10 +133,10 @@ cdef extern from "flint_wrap.h":
129133
ctypedef arb_mat_struct arb_mat_t[1]
130134

131135
ctypedef struct arb_poly_struct:
132-
pass
136+
arb_ptr coeffs
137+
long alloc
138+
long length
133139
ctypedef arb_poly_struct[1] arb_poly_t
134-
ctypedef arb_poly_struct * arb_poly_ptr
135-
ctypedef const arb_poly_struct * arb_poly_srcptr
136140

137141

138142
# flint/arb_calc.h
@@ -165,10 +169,10 @@ cdef extern from "flint_wrap.h":
165169

166170
# flint/acb_poly.h
167171
ctypedef struct acb_poly_struct:
168-
pass
172+
acb_ptr coeffs
173+
long alloc
174+
long length
169175
ctypedef acb_poly_struct[1] acb_poly_t
170-
ctypedef acb_poly_struct * acb_poly_ptr
171-
ctypedef const acb_poly_struct * acb_poly_srcptr
172176

173177
# flint/acb_calc.h
174178
ctypedef struct acb_calc_integrate_opt_struct:

0 commit comments

Comments
 (0)