Skip to content

Commit d0a3be8

Browse files
oscarbenjaminoscarbenjamin
authored
Merge pull request #294 from oscarbenjamin/pr_windows_2022_2nd
Try building on windows-2022
2 parents e39a2cd + da48c45 commit d0a3be8

17 files changed

+74
-21
lines changed

‎.github/workflows/buildwheel.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2019, macos-13, macos-14]
13+
os: [ubuntu-22.04, ubuntu-22.04-arm, windows-2022, macos-13, macos-14]
1414

1515
steps:
1616
- uses: actions/checkout@v4
@@ -29,17 +29,17 @@ jobs:
2929
# problematic in some situations. Maybe there is a better way to do
3030
# this.
3131
path-type: inherit
32-
if: ${{ matrix.os == 'windows-2019' }}
32+
if: ${{ startsWith( matrix.os , 'windows' ) }}
3333

3434
# Install pkgconfig on Windows from choco rather than from msys and
3535
# avoid using the Strawberry one.
3636
- run: choco install -y --stoponfirstfailure --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite
37-
if: ${{ matrix.os == 'windows-2019' }}
37+
if: ${{ startsWith( matrix.os , 'windows' ) }}
3838

3939
# We have to set this here rather than in the cibuildwheel config
4040
# This is probably something to do with \ vs / in paths...
4141
- run: echo "PKG_CONFIG_PATH=${{ github.workspace }}/.local/lib/pkgconfig" >> $env:GITHUB_ENV
42-
if: ${{ matrix.os == 'windows-2019' }}
42+
if: ${{ startsWith( matrix.os , 'windows' ) }}
4343

4444
- name: Build wheels
4545
uses: pypa/cibuildwheel@90a0ddeff0f23eebc21630e65d66d0f4955e9b94 # v3.0.0b1

‎bin/all_rst_to_pxd.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111
FLINT_DOC_DIR=$1
1212

1313
modules=(
14-
# "flint"
14+
"flint"
1515
"mpoly"
1616
# "thread_pool"
1717
# "machine_vectors"

‎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.2.2
24-
FLINTVER='3.3.0'
24+
FLINTVER='3.3.1'

‎pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ enable = ["cpython-freethreading", "pypy"]
8888
manylinux-x86_64-image = "manylinux2014"
8989
manylinux-aarch64-image = "manylinux_2_28"
9090
manylinux-i686-image = "manylinux2014"
91-
test-command = "python -c \"import flint; print(str(flint.fmpz(2)))\""
9291

9392
[tool.cibuildwheel.linux.environment]
9493
# LD_LIBRARY_PATH is needed by auditwheel

‎src/flint/flintlib/functions/flint.pxd

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
from flint.flintlib.types.flint cimport flint_rand_t, slong
2+
3+
# unknown type ...
4+
# unknown type FILE
5+
# unknown type flint_err_t
6+
# unknown type int ( cmp) ( void
7+
# unknown type size_t
8+
# unknown type va_list
9+
# unknown type va_list)
10+
# unknown type void (
11+
12+
# .. macro:: __FLINT_VERSION
13+
# .. macro:: __FLINT_RELEASE
14+
# .. macro:: FLINT_VERSION
15+
# .. macro:: FLINT_BITS
16+
# .. macro:: FLINT_D_BITS
17+
# .. macro:: FLINT_ABS(x)
18+
# .. macro:: FLINT_UABS(x)
19+
# .. macro:: FLINT_MIN(x, y)
20+
# .. macro:: FLINT_SWAP(T, x, y)
21+
# .. macro:: FLINT_SGN(x)
22+
# .. macro:: UWORD_MIN
23+
24+
cdef extern from "flint/flint.h":
25+
# void * flint_malloc(size_t size)
26+
# void * flint_realloc(void * ptr, size_t size)
27+
# void * flint_calloc(size_t num, size_t size)
28+
void flint_free(void * ptr)
29+
void flint_rand_init(flint_rand_t state)
30+
void flint_rand_clear(flint_rand_t state)
31+
void flint_set_num_threads(int num_threads)
32+
# int flint_get_num_threads(void)
33+
int flint_set_num_workers(int num_workers)
34+
void flint_reset_num_workers(int num_workers)
35+
# int flint_printf(const char * format, ...)
36+
# int flint_fprintf(FILE * fs, const char * format, ...)
37+
# int flint_vprintf(const char * format, va_list vlist)
38+
# int flint_vfprintf(FILE * fs, const char * format, va_list vlist)
39+
# int flint_sprintf(char * s, const char * str, ...)
40+
# int flint_scanf(const char * str, ...)
41+
# int flint_fscanf(FILE * f, const char * str, ...)
42+
# int flint_sscanf(const char * s, const char * str, ...)
43+
# void flint_abort(void)
44+
# void flint_throw(flint_err_t exc, const char * msg, ...)
45+
# void flint_set_abort(void (* func)(void))
46+
# void flint_set_throw(void (* func)(flint_err_t, const char *, va_list))
47+
# void flint_merge_sort(void * buf, slong len, slong size, int (* cmp) (const void *, const void *, void *), void * data)
48+
# void flint_sort(void * buf, slong len, slong size, int (* cmp) (const void *, const void *, void *), void * data)

‎src/flint/flintlib/functions/fmpz_mod_mat.pxd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from flint.flintlib.types.flint cimport flint_rand_t, fmpz_struct, fmpz_t, slong, ulong
22
from flint.flintlib.types.fmpz cimport fmpz_mat_t
3-
from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_mat_t, fmpz_mod_poly_t
3+
from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_mat_t
4+
from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
45

56
# unknown type thread_pool_handle
67

‎src/flint/flintlib/functions/fmpz_mod_poly.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from flint.flintlib.types.flint cimport flint_rand_t, fmpz_struct, fmpz_t, slong, ulong
22
from flint.flintlib.types.fmpz cimport fmpz_mat_t, fmpz_poly_struct, fmpz_poly_t
3-
from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_poly_struct, fmpz_mod_poly_t
4-
from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_berlekamp_massey_t, fmpz_mod_poly_frobenius_powers_2exp_t, fmpz_mod_poly_frobenius_powers_t, fmpz_mod_poly_radix_t
3+
from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t
4+
from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_berlekamp_massey_t, fmpz_mod_poly_frobenius_powers_2exp_t, fmpz_mod_poly_frobenius_powers_t, fmpz_mod_poly_radix_t, fmpz_mod_poly_struct, fmpz_mod_poly_t
55
from flint.flintlib.types.nmod cimport nmod_poly_t
66

77
# unknown type FILE

‎src/flint/flintlib/functions/fmpz_mod_poly_factor.pxd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from flint.flintlib.types.flint cimport flint_rand_t, fmpz_struct, fmpz_t, slong
22
from flint.flintlib.types.fmpz cimport fmpz_factor_t
3-
from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_poly_factor_t, fmpz_mod_poly_t
3+
from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_poly_factor_t
4+
from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
45

56

67

‎src/flint/flintlib/functions/fq.pxd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, fmpz_t, slong, ulong
22
from flint.flintlib.types.fmpz cimport fmpz_poly_t
3-
from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_mat_t, fmpz_mod_poly_t
3+
from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_mat_t
4+
from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
45
from flint.flintlib.types.fq cimport fq_ctx_t, fq_t
56

67
# unknown type

‎src/flint/flintlib/functions/fq_default.pxd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from flint.flintlib.types.flint cimport flint_rand_t, fmpz_t, slong, ulong
22
from flint.flintlib.types.fmpz cimport fmpz_poly_t
3-
from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t, fmpz_mod_poly_t
3+
from flint.flintlib.types.fmpz_mod cimport fmpz_mod_ctx_t
4+
from flint.flintlib.types.fmpz_mod_poly cimport fmpz_mod_poly_t
45
from flint.flintlib.types.fq_default cimport fq_default_ctx_t, fq_default_t
56
from flint.flintlib.types.nmod cimport nmod_poly_t
67

0 commit comments

Comments
 (0)