Skip to content

Commit 478a9a5

Browse files
jcfrjcfr
committed
wip: Debug issue related to arm64 windows wheel
1 parent b13c95e commit 478a9a5

File tree

2 files changed

+178
-173
lines changed

2 files changed

+178
-173
lines changed

‎.github/workflows/build.yml

+173-173
Original file line numberDiff line numberDiff line change
@@ -21,81 +21,81 @@ env:
2121
USE_QEMU: ${{ fromJSON(github.event.inputs.use_qemu || 'false') || (github.event_name == 'schedule') || startsWith(github.ref, 'refs/tags/') }}
2222

2323
jobs:
24-
lint:
25-
name: Lint
26-
runs-on: ubuntu-22.04
27-
steps:
28-
- uses: actions/checkout@v3
29-
- uses: actions/setup-python@v4
30-
with:
31-
python-version: "3.x"
32-
- uses: pre-commit/[email protected]
24+
# lint:
25+
# name: Lint
26+
# runs-on: ubuntu-22.04
27+
# steps:
28+
# - uses: actions/checkout@v3
29+
# - uses: actions/setup-python@v4
30+
# with:
31+
# python-version: "3.x"
32+
# - uses: pre-commit/[email protected]
3333

3434

3535
build_wheels:
3636
name: Build ${{ matrix.build }}${{ matrix.arch }} wheels on ${{ matrix.os }}
37-
needs: [lint]
37+
# needs: [lint]
3838
runs-on: ${{ matrix.os }}
3939
strategy:
4040
fail-fast: false
4141
matrix:
4242
include:
43-
- os: ubuntu-22.04
44-
arch: "x86_64"
45-
build: "manylinux_"
46-
use_qemu: false
47-
- os: ubuntu-22.04
48-
arch: "x86_64"
49-
build: "musllinux_"
50-
use_qemu: false
51-
- os: ubuntu-22.04
52-
arch: "i686"
53-
build: "manylinux_"
54-
use_qemu: false
55-
- os: ubuntu-22.04
56-
arch: "i686"
57-
build: "musllinux_"
58-
use_qemu: false
59-
- os: ubuntu-22.04
60-
arch: "aarch64"
61-
build: "manylinux_"
62-
use_qemu: true
63-
- os: ubuntu-22.04
64-
arch: "aarch64"
65-
build: "musllinux_"
66-
use_qemu: true
67-
- os: ubuntu-22.04
68-
arch: "ppc64le"
69-
build: "manylinux_"
70-
use_qemu: true
71-
- os: ubuntu-22.04
72-
arch: "ppc64le"
73-
build: "musllinux_"
74-
use_qemu: true
75-
- os: ubuntu-22.04
76-
arch: "s390x"
77-
build: "manylinux_"
78-
use_qemu: true
79-
- os: ubuntu-22.04
80-
arch: "s390x"
81-
build: "musllinux_"
82-
use_qemu: true
83-
- os: windows-2019
84-
arch: "AMD64"
85-
build: ""
86-
use_qemu: false
43+
# - os: ubuntu-22.04
44+
# arch: "x86_64"
45+
# build: "manylinux_"
46+
# use_qemu: false
47+
# - os: ubuntu-22.04
48+
# arch: "x86_64"
49+
# build: "musllinux_"
50+
# use_qemu: false
51+
# - os: ubuntu-22.04
52+
# arch: "i686"
53+
# build: "manylinux_"
54+
# use_qemu: false
55+
# - os: ubuntu-22.04
56+
# arch: "i686"
57+
# build: "musllinux_"
58+
# use_qemu: false
59+
# - os: ubuntu-22.04
60+
# arch: "aarch64"
61+
# build: "manylinux_"
62+
# use_qemu: true
63+
# - os: ubuntu-22.04
64+
# arch: "aarch64"
65+
# build: "musllinux_"
66+
# use_qemu: true
67+
# - os: ubuntu-22.04
68+
# arch: "ppc64le"
69+
# build: "manylinux_"
70+
# use_qemu: true
71+
# - os: ubuntu-22.04
72+
# arch: "ppc64le"
73+
# build: "musllinux_"
74+
# use_qemu: true
75+
# - os: ubuntu-22.04
76+
# arch: "s390x"
77+
# build: "manylinux_"
78+
# use_qemu: true
79+
# - os: ubuntu-22.04
80+
# arch: "s390x"
81+
# build: "musllinux_"
82+
# use_qemu: true
83+
# - os: windows-2019
84+
# arch: "AMD64"
85+
# build: ""
86+
# use_qemu: false
8787
- os: windows-2022
8888
arch: "ARM64"
8989
build: ""
9090
use_qemu: false
91-
- os: windows-2019
92-
arch: "x86"
93-
build: ""
94-
use_qemu: false
95-
- os: macos-11
96-
arch: "x86_64"
97-
build: ""
98-
use_qemu: false
91+
# - os: windows-2019
92+
# arch: "x86"
93+
# build: ""
94+
# use_qemu: false
95+
# - os: macos-11
96+
# arch: "x86_64"
97+
# build: ""
98+
# use_qemu: false
9999

100100
steps:
101101
- uses: actions/checkout@v3
@@ -119,114 +119,114 @@ jobs:
119119
with:
120120
path: ./wheelhouse/*.whl
121121

122-
build_manylinux2010_wheels:
123-
name: Build ${{ matrix.arch }} manylinux2010 wheels
124-
needs: [lint]
125-
runs-on: ubuntu-22.04
126-
strategy:
127-
fail-fast: false
128-
matrix:
129-
include:
130-
- arch: "x86_64"
131-
- arch: "i686"
132-
133-
steps:
134-
- uses: actions/checkout@v3
135-
with:
136-
fetch-depth: 0 # required for versioneer to find tags
137-
138-
- name: Build wheels
139-
uses: pypa/[email protected]
140-
env:
141-
CIBW_ARCHS: "${{ matrix.arch }}"
142-
CIBW_BUILD: "cp39-manylinux_*"
143-
CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2010"
144-
CIBW_MANYLINUX_I686_IMAGE: "manylinux2010"
145-
146-
- uses: actions/upload-artifact@v3
147-
with:
148-
path: ./wheelhouse/*.whl
149-
150-
build_sdist:
151-
name: Build source distribution
152-
needs: [lint]
153-
runs-on: ubuntu-22.04
154-
steps:
155-
- uses: actions/checkout@v3
156-
with:
157-
fetch-depth: 0 # required for versioneer to find tags
158-
159-
- name: Build SDist
160-
run: pipx run build --sdist
161-
162-
- uses: actions/upload-artifact@v3
163-
with:
164-
path: dist/*.tar.gz
165-
166-
test_sdist:
167-
name: Test SDist with python ${{ matrix.python }}
168-
needs: [build_sdist]
169-
# 22.04 doesn't have 2.7 or 3.6
170-
runs-on: ubuntu-20.04
171-
strategy:
172-
fail-fast: false
173-
matrix:
174-
python: ["2.7", "3.6", "3.11"]
175-
176-
steps:
177-
- uses: actions/checkout@v3
178-
- uses: actions/setup-python@v4
179-
name: Install Python ${{ matrix.python }}
180-
with:
181-
python-version: ${{ matrix.python }}
182-
183-
- name: Install dependencies
184-
run: |
185-
sudo apt-get update
186-
sudo apt-get install -y --no-install-recommends libssl-dev
187-
pip install -r requirements-test.txt
188-
189-
- uses: actions/download-artifact@v3
190-
with:
191-
name: artifact
192-
path: dist
193-
194-
- name: Install SDist
195-
env:
196-
SKBUILD_CONFIGURE_OPTIONS: "-DBUILD_CMAKE_FROM_SOURCE:BOOL=OFF"
197-
run: |
198-
pip install dist/*.tar.gz
199-
rm -rf dist
200-
201-
- name: Test installed SDist
202-
run: pytest ./tests
203-
204-
check_dist:
205-
name: Check dist
206-
needs: [build_wheels, build_manylinux2010_wheels, build_sdist, test_sdist]
207-
runs-on: ubuntu-22.04
208-
steps:
209-
- uses: actions/download-artifact@v3
210-
with:
211-
name: artifact
212-
path: dist
213-
214-
- run: pipx run twine check --strict dist/*
215-
216-
upload_pypi:
217-
name: Upload to PyPI
218-
needs: [check_dist]
219-
runs-on: ubuntu-latest
220-
if: github.event_name == 'push' && github.repository == 'scikit-build/cmake-python-distributions' && startsWith(github.ref, 'refs/tags/')
221-
environment:
222-
name: pypi
223-
url: https://pypi.org/p/cmake
224-
permissions:
225-
id-token: write
226-
steps:
227-
- uses: actions/download-artifact@v3
228-
with:
229-
name: artifact
230-
path: dist
231-
232-
- uses: pypa/gh-action-pypi-publish@release/v1
122+
# build_manylinux2010_wheels:
123+
# name: Build ${{ matrix.arch }} manylinux2010 wheels
124+
# needs: [lint]
125+
# runs-on: ubuntu-22.04
126+
# strategy:
127+
# fail-fast: false
128+
# matrix:
129+
# include:
130+
# - arch: "x86_64"
131+
# - arch: "i686"
132+
133+
# steps:
134+
# - uses: actions/checkout@v3
135+
# with:
136+
# fetch-depth: 0 # required for versioneer to find tags
137+
138+
# - name: Build wheels
139+
# uses: pypa/[email protected]
140+
# env:
141+
# CIBW_ARCHS: "${{ matrix.arch }}"
142+
# CIBW_BUILD: "cp39-manylinux_*"
143+
# CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2010"
144+
# CIBW_MANYLINUX_I686_IMAGE: "manylinux2010"
145+
146+
# - uses: actions/upload-artifact@v3
147+
# with:
148+
# path: ./wheelhouse/*.whl
149+
150+
# build_sdist:
151+
# name: Build source distribution
152+
# needs: [lint]
153+
# runs-on: ubuntu-22.04
154+
# steps:
155+
# - uses: actions/checkout@v3
156+
# with:
157+
# fetch-depth: 0 # required for versioneer to find tags
158+
159+
# - name: Build SDist
160+
# run: pipx run build --sdist
161+
162+
# - uses: actions/upload-artifact@v3
163+
# with:
164+
# path: dist/*.tar.gz
165+
166+
# test_sdist:
167+
# name: Test SDist with python ${{ matrix.python }}
168+
# needs: [build_sdist]
169+
# # 22.04 doesn't have 2.7 or 3.6
170+
# runs-on: ubuntu-20.04
171+
# strategy:
172+
# fail-fast: false
173+
# matrix:
174+
# python: ["2.7", "3.6", "3.11"]
175+
176+
# steps:
177+
# - uses: actions/checkout@v3
178+
# - uses: actions/setup-python@v4
179+
# name: Install Python ${{ matrix.python }}
180+
# with:
181+
# python-version: ${{ matrix.python }}
182+
183+
# - name: Install dependencies
184+
# run: |
185+
# sudo apt-get update
186+
# sudo apt-get install -y --no-install-recommends libssl-dev
187+
# pip install -r requirements-test.txt
188+
189+
# - uses: actions/download-artifact@v3
190+
# with:
191+
# name: artifact
192+
# path: dist
193+
194+
# - name: Install SDist
195+
# env:
196+
# SKBUILD_CONFIGURE_OPTIONS: "-DBUILD_CMAKE_FROM_SOURCE:BOOL=OFF"
197+
# run: |
198+
# pip install dist/*.tar.gz
199+
# rm -rf dist
200+
201+
# - name: Test installed SDist
202+
# run: pytest ./tests
203+
204+
# check_dist:
205+
# name: Check dist
206+
# needs: [build_wheels, build_manylinux2010_wheels, build_sdist, test_sdist]
207+
# runs-on: ubuntu-22.04
208+
# steps:
209+
# - uses: actions/download-artifact@v3
210+
# with:
211+
# name: artifact
212+
# path: dist
213+
214+
# - run: pipx run twine check --strict dist/*
215+
216+
# upload_pypi:
217+
# name: Upload to PyPI
218+
# needs: [check_dist]
219+
# runs-on: ubuntu-latest
220+
# if: github.event_name == 'push' && github.repository == 'scikit-build/cmake-python-distributions' && startsWith(github.ref, 'refs/tags/')
221+
# environment:
222+
# name: pypi
223+
# url: https://pypi.org/p/cmake
224+
# permissions:
225+
# id-token: write
226+
# steps:
227+
# - uses: actions/download-artifact@v3
228+
# with:
229+
# name: artifact
230+
# path: dist
231+
232+
# - uses: pypa/gh-action-pypi-publish@release/v1

‎CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ if(CMakePythonDistributions_SUPERBUILD)
7878
endif()
7979
if(WIN32)
8080
set(binary_archive "win32_binary")
81+
message("---------------------------------------")
82+
message("CMAKE_SIZEOF_VOID_P [${CMAKE_SIZEOF_VOID_P}]")
83+
message("CMAKE_SYSTEM_PROCESSOR [${CMAKE_SYSTEM_PROCESSOR}]")
84+
message("ENV{SETUPTOOLS_EXT_SUFFIX} [$ENV{SETUPTOOLS_EXT_SUFFIX}]")
85+
message("---------------------------------------")
8186
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
8287
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ARM64" OR "$ENV{SETUPTOOLS_EXT_SUFFIX}" MATCHES arm64)
8388
set(binary_achive "winarm64_binary")

0 commit comments

Comments
 (0)