Skip to content

Commit 181fc96

Browse files
nihuinihui
committed
p
1 parent 7ea6d28 commit 181fc96

File tree

3 files changed

+46
-113
lines changed

3 files changed

+46
-113
lines changed

‎.github/workflows/release-python.yml‎

Lines changed: 34 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ jobs:
4646
fail-fast: false
4747
matrix:
4848
include:
49-
# - { os: ubuntu-24.04, arch: x86_64, build: 'cp*-manylinux*', build_id: cp-manylinux }
50-
# - { os: ubuntu-24.04, arch: x86_64, build: 'cp*-musllinux*', build_id: cp-musllinux }
51-
# - { os: ubuntu-24.04, arch: x86_64, build: 'pp*', build_id: pp }
52-
# - { os: ubuntu-24.04, arch: i686, build: 'cp*-manylinux*', build_id: cp-manylinux }
53-
# - { os: ubuntu-24.04, arch: i686, build: 'cp*-musllinux*', build_id: cp-musllinux }
54-
# - { os: ubuntu-24.04, arch: i686, build: 'pp*', build_id: pp }
55-
# - { os: windows-2019, arch: x86, build: 'cp*', build_id: cp }
56-
# - { os: windows-2019, arch: AMD64, build: 'cp*', build_id: cp }
57-
# - { os: windows-2019, arch: AMD64, build: 'pp*', build_id: pp }
58-
# - { os: windows-2019, arch: ARM64, build: 'cp*', build_id: cp }
59-
# - { os: macos-13, arch: x86_64, build: 'cp*', build_id: cp }
60-
# - { os: macos-13, arch: x86_64, build: 'pp*', build_id: pp }
61-
# - { os: macos-13, arch: arm64, build: 'cp*', build_id: cp }
49+
- { os: ubuntu-24.04, arch: x86_64, build: 'cp*-manylinux*', build_id: cp-manylinux }
50+
- { os: ubuntu-24.04, arch: x86_64, build: 'cp*-musllinux*', build_id: cp-musllinux }
51+
- { os: ubuntu-24.04, arch: x86_64, build: 'pp*', build_id: pp }
52+
- { os: ubuntu-24.04, arch: i686, build: 'cp*-manylinux*', build_id: cp-manylinux }
53+
- { os: ubuntu-24.04, arch: i686, build: 'cp*-musllinux*', build_id: cp-musllinux }
54+
- { os: ubuntu-24.04, arch: i686, build: 'pp*', build_id: pp }
55+
- { os: windows-2019, arch: x86, build: 'cp*', build_id: cp }
56+
- { os: windows-2019, arch: AMD64, build: 'cp*', build_id: cp }
57+
- { os: windows-2019, arch: AMD64, build: 'pp*', build_id: pp }
58+
- { os: windows-2019, arch: ARM64, build: 'cp*', build_id: cp }
59+
- { os: macos-13, arch: x86_64, build: 'cp*', build_id: cp }
60+
- { os: macos-13, arch: x86_64, build: 'pp*', build_id: pp }
61+
- { os: macos-13, arch: arm64, build: 'cp*', build_id: cp }
6262
- { os: ubuntu-24.04-arm, arch: armv7l, build: 'cp*-manylinux*', build_id: cp-manylinux }
6363
- { os: ubuntu-24.04-arm, arch: armv7l, build: 'cp*-musllinux*', build_id: cp-musllinux }
6464
- { os: ubuntu-24.04-arm, arch: aarch64, build: 'cp*-manylinux*', build_id: cp-manylinux }
@@ -268,74 +268,24 @@ jobs:
268268
name: wheels-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.build_id }}
269269
path: wheelhouse/*.whl
270270

271-
# build_wheels_qemu_cp:
272-
# name: ${{ matrix.arch }} ${{ matrix.build_cp }} ${{ matrix.build_sub }}
273-
# runs-on: ubuntu-24.04
274-
#
275-
# strategy:
276-
# fail-fast: false
277-
# matrix:
278-
# arch: [ppc64le, s390x]
279-
# build_cp: [cp36, cp37, cp38, cp39, cp310, cp311, cp312, cp313]
280-
# build_sub: [manylinux, musllinux]
281-
#
282-
# steps:
283-
# - uses: actions/checkout@v4
284-
# with:
285-
# submodules: true
286-
#
287-
# - uses: actions/setup-python@v5
288-
# with:
289-
# python-version: '3.x'
290-
#
291-
# - name: Set up QEMU
292-
# uses: docker/setup-qemu-action@v3
293-
# with:
294-
# platforms: all
295-
#
296-
# - name: Build wheels for manylinux with qemu
297-
# uses: pypa/[email protected]
298-
# env:
299-
# CIBW_ARCHS_LINUX: ${{ matrix.arch }}
300-
# CIBW_BUILD: ${{ matrix.build_cp }}-${{ matrix.build_sub }}*
301-
# CIBW_BUILD_VERBOSITY: 1
302-
# CIBW_ENVIRONMENT: CMAKE_BUILD_PARALLEL_LEVEL=4
303-
# with:
304-
# output-dir: wheelhouse
305-
#
306-
# - name: Show files
307-
# run: ls -lh wheelhouse
308-
# shell: bash
309-
#
310-
# - name: Verify clean directory
311-
# run: git diff --exit-code
312-
# shell: bash
313-
#
314-
# - name: Upload wheels
315-
# uses: actions/upload-artifact@v4
316-
# with:
317-
# name: wheels_qemu_cp-${{ matrix.arch }}-${{ matrix.build_cp }}-${{ matrix.build_sub }}
318-
# path: wheelhouse/*.whl
319-
320-
# upload_all:
321-
# permissions:
322-
# contents: none
323-
# name: Upload
324-
# # needs: [build_wheels, build_wheels_qemu_cp, build_sdist]
325-
# needs: [build_wheels, build_sdist]
326-
# runs-on: ubuntu-latest
327-
#
328-
# steps:
329-
# - uses: actions/setup-python@v5
330-
# with:
331-
# python-version: '3.x'
332-
#
333-
# - uses: actions/download-artifact@v4
334-
# with:
335-
# path: dist
336-
# merge-multiple: true
337-
#
338-
# - uses: pypa/gh-action-pypi-publish@release/v1
339-
# with:
340-
# user: __token__
341-
# password: ${{ secrets.PYPI_API_TOKEN }}
271+
upload_all:
272+
permissions:
273+
contents: none
274+
name: Upload
275+
needs: [build_wheels, build_sdist]
276+
runs-on: ubuntu-latest
277+
278+
steps:
279+
- uses: actions/setup-python@v5
280+
with:
281+
python-version: '3.x'
282+
283+
- uses: actions/download-artifact@v4
284+
with:
285+
path: dist
286+
merge-multiple: true
287+
288+
- uses: pypa/gh-action-pypi-publish@release/v1
289+
with:
290+
user: __token__
291+
password: ${{ secrets.PYPI_API_TOKEN }}

‎MANIFEST.in‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
recursive-include cmake *
3+
4+
recursive-include glslang *
5+
prune glslang/Test
6+
7+
recursive-include src *
8+
9+
recursive-include python *
10+
prune python/pybind11/tests
11+
12+
include CMakeLists.txt

‎setup.py‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -186,28 +186,6 @@ def build_extension(self, ext):
186186
with io.open("README.md", encoding="utf-8") as h:
187187
long_description = h.read()
188188

189-
def find_all_files(directories, additional_files, exclude):
190-
all_files = []
191-
for d in directories:
192-
for root, _, files in os.walk(d):
193-
skip = False
194-
for e in exclude:
195-
if root.startswith(e):
196-
skip = True
197-
break
198-
if skip:
199-
continue
200-
for file in files:
201-
all_files.append(os.path.join(root, file))
202-
for file in additional_files:
203-
all_files.append(file)
204-
return all_files
205-
206-
directories_to_include = ["cmake", "src", "python", "glslang"]
207-
files_to_include = ["CMakeLists.txt"]
208-
exclude_paths = ["glslang/Test", "python/pybind11/tests"]
209-
all_files = find_all_files(directories_to_include, additional_files=files_to_include, exclude=exclude_paths)
210-
211189
setup(
212190
name="ncnn",
213191
version=find_version(),
@@ -238,13 +216,6 @@ def find_all_files(directories, additional_files, exclude):
238216
python_requires=">=3.5",
239217
packages=find_packages("python"),
240218
package_dir={"": "python"},
241-
include_package_data=True,
242-
package_data={
243-
"": all_files,
244-
},
245-
data_files=[
246-
("", all_files),
247-
],
248219
setup_requires=setup_requires,
249220
install_requires=requirements,
250221
ext_modules=[CMakeExtension("ncnn")],

0 commit comments

Comments
 (0)