Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite9aabcd

Browse files
committed
Merge branch 'feat/aarch64' into 3.4
2 parentse983793 +37a96da commite9aabcd

File tree

4 files changed

+249
-15
lines changed

4 files changed

+249
-15
lines changed

‎.travis.yml‎

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,21 @@ jobs:
295295
-USE_CCACHE=0
296296
cache:
297297
directories:$HOME/.ccache
298+
-os:linux
299+
arch:arm64
300+
language:generic
301+
dist:xenial
302+
services:docker
303+
env:
304+
-MB_PYTHON_VERSION=3.6
305+
-PLAT=aarch64
306+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
307+
-ENABLE_CONTRIB=0
308+
-ENABLE_HEADLESS=0
309+
-TEST_DEPENDS=numpy==1.19.0
310+
-USE_CCACHE=0
311+
cache:
312+
directories:$HOME/.ccache
298313
-os:linux
299314
language:generic
300315
dist:xenial
@@ -319,6 +334,21 @@ jobs:
319334
-USE_CCACHE=0
320335
cache:
321336
directories:$HOME/.ccache
337+
-os:linux
338+
arch:arm64
339+
language:generic
340+
dist:xenial
341+
services:docker
342+
env:
343+
-MB_PYTHON_VERSION=3.7
344+
-PLAT=aarch64
345+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
346+
-ENABLE_CONTRIB=0
347+
-ENABLE_HEADLESS=0
348+
-TEST_DEPENDS=numpy==1.19.0
349+
-USE_CCACHE=0
350+
cache:
351+
directories:$HOME/.ccache
322352
-os:linux
323353
language:generic
324354
dist:xenial
@@ -343,6 +373,21 @@ jobs:
343373
-USE_CCACHE=0
344374
cache:
345375
directories:$HOME/.ccache
376+
-os:linux
377+
arch:arm64
378+
language:generic
379+
dist:xenial
380+
services:docker
381+
env:
382+
-MB_PYTHON_VERSION=3.8
383+
-PLAT=aarch64
384+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
385+
-ENABLE_CONTRIB=0
386+
-ENABLE_HEADLESS=0
387+
-TEST_DEPENDS=numpy==1.19.0
388+
-USE_CCACHE=0
389+
cache:
390+
directories:$HOME/.ccache
346391
-os:linux
347392
language:generic
348393
dist:xenial
@@ -367,6 +412,21 @@ jobs:
367412
-USE_CCACHE=0
368413
cache:
369414
directories:$HOME/.ccache
415+
-os:linux
416+
arch:arm64
417+
language:generic
418+
dist:xenial
419+
services:docker
420+
env:
421+
-MB_PYTHON_VERSION=3.8
422+
-PLAT=aarch64
423+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
424+
-ENABLE_CONTRIB=0
425+
-ENABLE_HEADLESS=0
426+
-TEST_DEPENDS=numpy==1.19.0
427+
-USE_CCACHE=0
428+
cache:
429+
directories:$HOME/.ccache
370430

371431
# headless builds for Linux
372432
-os:linux
@@ -393,6 +453,21 @@ jobs:
393453
-USE_CCACHE=0
394454
cache:
395455
directories:$HOME/.ccache
456+
-os:linux
457+
arch:arm64
458+
language:generic
459+
dist:xenial
460+
services:docker
461+
env:
462+
-MB_PYTHON_VERSION=3.6
463+
-PLAT=aarch64
464+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
465+
-ENABLE_CONTRIB=0
466+
-ENABLE_HEADLESS=1
467+
-TEST_DEPENDS=numpy==1.19.0
468+
-USE_CCACHE=0
469+
cache:
470+
directories:$HOME/.ccache
396471
-os:linux
397472
language:generic
398473
dist:xenial
@@ -417,6 +492,21 @@ jobs:
417492
-USE_CCACHE=0
418493
cache:
419494
directories:$HOME/.ccache
495+
-os:linux
496+
arch:arm64
497+
language:generic
498+
dist:xenial
499+
services:docker
500+
env:
501+
-MB_PYTHON_VERSION=3.7
502+
-PLAT=aarch64
503+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
504+
-ENABLE_CONTRIB=0
505+
-ENABLE_HEADLESS=1
506+
-TEST_DEPENDS=numpy==1.19.0
507+
-USE_CCACHE=0
508+
cache:
509+
directories:$HOME/.ccache
420510
-os:linux
421511
language:generic
422512
dist:xenial
@@ -441,6 +531,21 @@ jobs:
441531
-USE_CCACHE=0
442532
cache:
443533
directories:$HOME/.ccache
534+
-os:linux
535+
arch:arm64
536+
language:generic
537+
dist:xenial
538+
services:docker
539+
env:
540+
-MB_PYTHON_VERSION=3.8
541+
-PLAT=aarch64
542+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
543+
-ENABLE_CONTRIB=0
544+
-ENABLE_HEADLESS=1
545+
-TEST_DEPENDS=numpy==1.19.0
546+
-USE_CCACHE=0
547+
cache:
548+
directories:$HOME/.ccache
444549
-os:linux
445550
language:generic
446551
dist:xenial
@@ -465,6 +570,21 @@ jobs:
465570
-USE_CCACHE=0
466571
cache:
467572
directories:$HOME/.ccache
573+
-os:linux
574+
arch:arm64
575+
language:generic
576+
dist:xenial
577+
services:docker
578+
env:
579+
-MB_PYTHON_VERSION=3.9
580+
-PLAT=aarch64
581+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
582+
-ENABLE_CONTRIB=0
583+
-ENABLE_HEADLESS=1
584+
-TEST_DEPENDS=numpy==1.19.0
585+
-USE_CCACHE=0
586+
cache:
587+
directories:$HOME/.ccache
468588

469589
# contrib builds for Linux
470590
-os:linux
@@ -491,6 +611,21 @@ jobs:
491611
-USE_CCACHE=0
492612
cache:
493613
directories:$HOME/.ccache
614+
-os:linux
615+
arch:arm64
616+
language:generic
617+
dist:xenial
618+
services:docker
619+
env:
620+
-MB_PYTHON_VERSION=3.6
621+
-PLAT=aarch64
622+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
623+
-ENABLE_CONTRIB=1
624+
-ENABLE_HEADLESS=0
625+
-TEST_DEPENDS=numpy==1.19.0
626+
-USE_CCACHE=0
627+
cache:
628+
directories:$HOME/.ccache
494629
-os:linux
495630
language:generic
496631
dist:xenial
@@ -515,6 +650,21 @@ jobs:
515650
-USE_CCACHE=0
516651
cache:
517652
directories:$HOME/.ccache
653+
-os:linux
654+
arch:arm64
655+
language:generic
656+
dist:xenial
657+
services:docker
658+
env:
659+
-MB_PYTHON_VERSION=3.7
660+
-PLAT=aarch64
661+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
662+
-ENABLE_CONTRIB=1
663+
-ENABLE_HEADLESS=0
664+
-TEST_DEPENDS=numpy==1.19.0
665+
-USE_CCACHE=0
666+
cache:
667+
directories:$HOME/.ccache
518668
-os:linux
519669
language:generic
520670
dist:xenial
@@ -539,6 +689,21 @@ jobs:
539689
-USE_CCACHE=0
540690
cache:
541691
directories:$HOME/.ccache
692+
-os:linux
693+
arch:arm64
694+
language:generic
695+
dist:xenial
696+
services:docker
697+
env:
698+
-MB_PYTHON_VERSION=3.8
699+
-PLAT=aarch64
700+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
701+
-ENABLE_CONTRIB=1
702+
-ENABLE_HEADLESS=0
703+
-TEST_DEPENDS=numpy==1.19.0
704+
-USE_CCACHE=0
705+
cache:
706+
directories:$HOME/.ccache
542707
-os:linux
543708
language:generic
544709
dist:xenial
@@ -563,6 +728,21 @@ jobs:
563728
-USE_CCACHE=0
564729
cache:
565730
directories:$HOME/.ccache
731+
-os:linux
732+
arch:arm64
733+
language:generic
734+
dist:xenial
735+
services:docker
736+
env:
737+
-MB_PYTHON_VERSION=3.9
738+
-PLAT=aarch64
739+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
740+
-ENABLE_CONTRIB=1
741+
-ENABLE_HEADLESS=0
742+
-TEST_DEPENDS=numpy==1.19.0
743+
-USE_CCACHE=0
744+
cache:
745+
directories:$HOME/.ccache
566746

567747

568748
# headless contrib builds for Linux
@@ -590,6 +770,21 @@ jobs:
590770
-USE_CCACHE=0
591771
cache:
592772
directories:$HOME/.ccache
773+
-os:linux
774+
arch:arm64
775+
language:generic
776+
dist:xenial
777+
services:docker
778+
env:
779+
-MB_PYTHON_VERSION=3.6
780+
-PLAT=aarch64
781+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
782+
-ENABLE_CONTRIB=1
783+
-ENABLE_HEADLESS=1
784+
-TEST_DEPENDS=numpy==1.19.0
785+
-USE_CCACHE=0
786+
cache:
787+
directories:$HOME/.ccache
593788
-os:linux
594789
language:generic
595790
dist:xenial
@@ -614,6 +809,21 @@ jobs:
614809
-USE_CCACHE=0
615810
cache:
616811
directories:$HOME/.ccache
812+
-os:linux
813+
arch:arm64
814+
language:generic
815+
dist:xenial
816+
services:docker
817+
env:
818+
-MB_PYTHON_VERSION=3.7
819+
-PLAT=aarch64
820+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
821+
-ENABLE_CONTRIB=1
822+
-ENABLE_HEADLESS=1
823+
-TEST_DEPENDS=numpy==1.19.0
824+
-USE_CCACHE=0
825+
cache:
826+
directories:$HOME/.ccache
617827
-os:linux
618828
language:generic
619829
dist:xenial
@@ -638,6 +848,21 @@ jobs:
638848
-USE_CCACHE=0
639849
cache:
640850
directories:$HOME/.ccache
851+
-os:linux
852+
arch:arm64
853+
language:generic
854+
dist:xenial
855+
services:docker
856+
env:
857+
-MB_PYTHON_VERSION=3.8
858+
-PLAT=aarch64
859+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
860+
-ENABLE_CONTRIB=1
861+
-ENABLE_HEADLESS=1
862+
-TEST_DEPENDS=numpy==1.19.0
863+
-USE_CCACHE=0
864+
cache:
865+
directories:$HOME/.ccache
641866
-os:linux
642867
language:generic
643868
dist:xenial
@@ -662,6 +887,21 @@ jobs:
662887
-USE_CCACHE=0
663888
cache:
664889
directories:$HOME/.ccache
890+
-os:linux
891+
arch:arm64
892+
language:generic
893+
dist:xenial
894+
services:docker
895+
env:
896+
-MB_PYTHON_VERSION=3.9
897+
-PLAT=aarch64
898+
-DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8
899+
-ENABLE_CONTRIB=1
900+
-ENABLE_HEADLESS=1
901+
-TEST_DEPENDS=numpy==1.19.0
902+
-USE_CCACHE=0
903+
cache:
904+
directories:$HOME/.ccache
665905

666906
# The first line is printed in the folding header in Travis output
667907
before_install:|

‎docker/manylinux2014/Dockerfile_aarch64‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,6 @@ RUN curl -O -L https://github.com/ccache/ccache/releases/download/v3.7.9/ccache-
6868
make -j$(getconf _NPROCESSORS_ONLN) && \
6969
make install
7070

71-
RUN curl -O -L https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0.tar.gz && \
72-
tar -xf cmake-3.17.0.tar.gz && \
73-
cd cmake-3.17.0 && \
74-
export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN) && \
75-
./configure --system-curl && \
76-
make && \
77-
make install && \
78-
cd .. && \
79-
rm -rf cmake-3.17.0*
80-
8171
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
8272
ENV LDFLAGS -L/root/ffmpeg_build/lib
8373
ENV PATH "$HOME/bin:$PATH"

‎pyproject.toml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[build-system]
22
requires = [
33
"setuptools","wheel","scikit-build","cmake","pip",
4-
"numpy==1.13.3; python_version=='3.6'",
5-
"numpy==1.14.5; python_version=='3.7'",
6-
"numpy==1.17.3; python_version=='3.8'",
7-
"numpy==1.19.3; python_version>='3.9'"
8-
]
4+
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64'",
5+
"numpy==1.19.0; python_version>='3.6' and sys_platform == 'linux' and platform_machine == 'aarch64'",
6+
"numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64'",
7+
"numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64'",
8+
"numpy==1.19.3; python_version>='3.9' and platform_machine != 'aarch64'"
9+
]

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp