Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make PyTorch partially cross-compilable for Apple M1 #49701

Closed
wants to merge 5 commits into from
Closed

Make PyTorch partially cross-compilable for Apple M1 #49701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2410b1a
Update cpuinfo to include https://github.com/pytorch/cpuinfo/pull/51
malfet Dec 21, 2020
8623bdc
Do not assume NEON is present when cross-compiling for x86_64
malfet Dec 21, 2020
f64302c
Enable PyTorch QNNPACK crosscompilation
malfet Dec 21, 2020
854ff20
Update sleef to support OS X cross compilation
malfet Dec 22, 2020
d657a07
Update XNNPACK
malfet Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -21,6 +21,12 @@ option(PYTORCH_QNNPACK_BUILD_BENCHMARKS "Build QNNPACK benchmarks" ON)
# Enable runtime requantization.
add_definitions(-DPYTORCH_QNNPACK_RUNTIME_QUANTIZATION=1)

# ---[ Target processor
SET(PYTORCH_QNNPACK_TARGET_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64)$")
SET(PYTORCH_QNNPACK_TARGET_PROCESSOR "${CMAKE_OSX_ARCHITECTURES}")
ENDIF()

# ---[ CMake options
if(PYTORCH_QNNPACK_BUILD_TESTS)
enable_testing()
Expand Down Expand Up @@ -244,11 +250,11 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^armv[5-8]" OR IOS_ARCH MATCHES "^armv7")
list(APPEND PYTORCH_QNNPACK_UKERNELS ${PYTORCH_QNNPACK_ARM_NEON_UKERNELS})
list(APPEND PYTORCH_QNNPACK_UKERNELS ${PYTORCH_QNNPACK_AARCH32_ASM_UKERNELS})
endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)$" OR IOS_ARCH MATCHES "^arm64.*")
if(PYTORCH_QNNPACK_TARGET_PROCESSOR MATCHES "^(aarch64|arm64)$" OR IOS_ARCH MATCHES "^arm64.*")
list(APPEND PYTORCH_QNNPACK_UKERNELS ${PYTORCH_QNNPACK_ARM_NEON_UKERNELS})
list(APPEND PYTORCH_QNNPACK_UKERNELS ${PYTORCH_QNNPACK_AARCH64_ASM_UKERNELS})
endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3-6]86|x86_64)$" OR IOS_ARCH MATCHES "^(i386|x86_64)$")
if(PYTORCH_QNNPACK_TARGET_PROCESSOR MATCHES "^(i[3-6]86|x86_64)$" OR IOS_ARCH MATCHES "^(i386|x86_64)$")
list(APPEND PYTORCH_QNNPACK_UKERNELS ${PYTORCH_QNNPACK_X86_SSE2_UKERNELS})
endif()

Expand All @@ -271,13 +277,13 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^armv[5-8]" OR IOS_ARCH MATCHES "^armv7")
set_property(SOURCE ${PYTORCH_QNNPACK_AARCH32_ASM_UKERNELS} APPEND_STRING PROPERTY COMPILE_FLAGS " -arch ${IOS_ARCH} ")
endif()
endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)$" OR IOS_ARCH MATCHES "^arm64.*")
if(PYTORCH_QNNPACK_TARGET_PROCESSOR MATCHES "^(aarch64|arm64)$" OR IOS_ARCH MATCHES "^arm64.*")
set_property(SOURCE ${PYTORCH_QNNPACK_ARM_NEON_UKERNELS} APPEND_STRING PROPERTY COMPILE_FLAGS " -O2 ")
if(IOS)
set_property(SOURCE ${PYTORCH_QNNPACK_AARCH64_ASM_UKERNELS} APPEND_STRING PROPERTY COMPILE_FLAGS " -arch ${IOS_ARCH} ")
endif()
endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3-6]86|x86_64)$" OR IOS_ARCH MATCHES "^(i386|x86_64)$")
if(PYTORCH_QNNPACK_TARGET_PROCESSOR MATCHES "^(i[3-6]86|x86_64)$" OR IOS_ARCH MATCHES "^(i386|x86_64)$")
set_property(SOURCE ${PYTORCH_QNNPACK_X86_SSE2_UKERNELS} APPEND_STRING PROPERTY COMPILE_FLAGS " -O2 -msse2 ")
endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^armv[5-8]" OR IOS_ARCH MATCHES "^armv7")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Modules/FindARM.cmake
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
ENDIF (OMAP4_TRUE)

ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" AND NOT CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have to worry about CMAKE_OSX_ARCHITECTURES equalling any other architecture or nah?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory we should, but let's do it one step at a time: so far we can only use the system to cross-build it for another platform.

set(NEON_FOUND true CACHE BOOL "NEON available on ARM64")
ENDIF()
EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE
Expand Down
2 changes: 1 addition & 1 deletion third_party/XNNPACK
Open in desktop
Submodule XNNPACK updated 745 files
2 changes: 1 addition & 1 deletion third_party/cpuinfo
Open in desktop
Submodule cpuinfo updated 16 files
+23 −29 CMakeLists.txt
+23 −0 include/cpuinfo.h
+28 −15 src/arm/linux/aarch32-isa.c
+52 −35 src/arm/linux/aarch64-isa.c
+27 −3 src/arm/linux/api.h
+13 −9 src/arm/linux/hwcap.c
+3 −2 src/arm/linux/init.c
+5 −3 src/arm/mach/init.c
+3 −2 src/arm/midr.h
+3 −0 src/arm/uarch.c
+0 −2 src/init.c
+14 −0 src/x86/uarch.c
+12 −1 src/x86/windows/init.c
+1 −1 test/mock/galaxy-s9-us.cc
+4 −0 tools/cpu-info.c
+4 −0 tools/isa-info.c
2 changes: 1 addition & 1 deletion third_party/sleef
Open in desktop
Submodule sleef updated 72 files
+5 −5 .travis.yml
+0 −100 .travis.yml.org
+72 −2 CMakeLists.txt
+57 −200 Configure.cmake
+96 −13 Jenkinsfile
+4 −4 appveyor.yml
+2 −2 src/arch/helperadvsimd.h
+6 −0 src/arch/helperavx2_128.h
+16 −11 src/arch/helperpower_128.h
+1 −1 src/arch/helperpurec_scalar.h
+3 −0 src/common/CMakeLists.txt
+0 −0 src/common/addSuffix.c
+412 −0 src/common/commonfuncs.h
+9 −5 src/common/dd.h
+9 −5 src/common/df.h
+4 −0 src/common/estrin.h
+652 −0 src/common/keywords.txt
+241 −4 src/common/keywords_cuda.txt
+3 −0 src/common/misc.h
+1 −0 src/dft-tester/CMakeLists.txt
+52 −40 src/dft/CMakeLists.txt
+4 −0 src/dft/vectortype.h
+16 −0 src/libm-benchmarks/Makefile
+1 −1 src/libm-benchmarks/benchsleef.c
+10 −0 src/libm-benchmarks/benchsleef128.c
+98 −32 src/libm-tester/CMakeLists.txt
+2 −2 src/libm-tester/hash_cinz.txt
+2 −2 src/libm-tester/hash_finz.txt
+39 −5 src/libm-tester/iutsimd.c
+1 −1 src/libm-tester/tester2dp.c
+25 −9 src/libm-tester/tester2simddp.c
+21 −5 src/libm-tester/tester2simdsp.c
+1 −1 src/libm-tester/tester2sp.c
+4 −4 src/libm-tester/tester3.c
+223 −20 src/libm/CMakeLists.txt
+158 −0 src/libm/disppower_128.c.org
+2 −6 src/libm/disps390x_128.c.org
+82 −34 src/libm/sleefdp.c
+13 −1 src/libm/sleefinline_header.h.org
+4 −0 src/libm/sleeflibm_header.h.org.in
+139 −230 src/libm/sleefsimddp.c
+116 −46 src/libm/sleefsimdsp.c
+53 −24 src/libm/sleefsp.c
+8 −0 src/libm/tryvsx3.c
+8 −0 src/libm/tryvxe2.c
+39 −1 src/quad-tester/CMakeLists.txt
+324 −0 src/quad-tester/qiutcuda.cu
+144 −52 src/quad-tester/qiutsimd.c
+71 −4 src/quad-tester/qtester.c
+19 −1 src/quad-tester/qtesterutil.c
+5 −5 src/quad-tester/tester2printf.c
+7 −0 src/quad-tester/tester2simdqp.c
+196 −23 src/quad/CMakeLists.txt
+6 −0 src/quad/qfuncproto.h
+4,223 −0 src/quad/sleefquadinline_cuda_header.h.org
+4,239 −0 src/quad/sleefquadinline_header.h.org
+513 −613 src/quad/sleefsimdqp.c
+1 −1 travis/before_script.aarch64-gcc.sh
+1 −1 travis/before_script.arm64-clang-lto.sh
+1 −1 travis/before_script.arm64-clang.sh
+1 −1 travis/before_script.arm64-gcc-lto.sh
+1 −1 travis/before_script.arm64-gcc-sve.sh
+1 −1 travis/before_script.arm64-gcc.sh
+1 −1 travis/before_script.armhf-gcc.sh
+1 −1 travis/before_script.osx-clang.sh
+1 −1 travis/before_script.osx-gcc.sh
+1 −1 travis/before_script.ppc64le-clang.sh
+1 −1 travis/before_script.ppc64le-gcc.sh
+1 −1 travis/before_script.s390x-clang.sh
+1 −1 travis/before_script.s390x-gcc.sh
+1 −1 travis/before_script.x86_64-clang.sh
+1 −1 travis/before_script.x86_64-gcc.sh