7 Commits

Author	SHA1	Message	Date
Nikita Shulga	b9adbb5002	Fix/relax CMake linter rules (#35574) ... Summary: Ignore mixed upper-case/lower-case style for now Fix space between function and its arguments violation Pull Request resolved: https://github.com/pytorch/pytorch/pull/35574 Test Plan: CI Differential Revision: D20712969 Pulled By: malfet fbshipit-source-id: 0012d430aed916b4518599a0b535e82d15721f78	2020-03-27 16:52:33 -07:00
peter	45c9ed825a	Formatting cmake (to lowercase without space for if/elseif/else/endif) (#35521) ... Summary: Running commands: ```bash shopt -s globstar sed -e 's/IF (/if(/g' -e 's/IF(/if(/g' -e 's/if (/if(/g' -e 's/ELSE (/else(/g' -e 's/ELSE(/else(/g' -e 's/else (/else(/g' -e 's/ENDif(/endif(/g' -e 's/ELSEif(/elseif(/g' -i CMakeLists.txt sed -e 's/IF (/if(/g' -e 's/IF(/if(/g' -e 's/if (/if(/g' -e 's/ELSE (/else(/g' -e 's/ELSE(/else(/g' -e 's/else (/else(/g' -e 's/ENDif(/endif(/g' -e 's/ELSEif(/elseif(/g' -i caffe2/**/CMakeLists.txt sed -e 's/IF (/if(/g' -e 's/IF(/if(/g' -e 's/if (/if(/g' -e 's/ELSE (/else(/g' -e 's/ELSE(/else(/g' -e 's/else (/else(/g' -e 's/ENDif(/endif(/g' -e 's/ELSEif(/elseif(/g' -i torch/**/CMakeLists.txt sed -e 's/IF (/if(/g' -e 's/IF(/if(/g' -e 's/if (/if(/g' -e 's/ELSE (/else(/g' -e 's/ELSE(/else(/g' -e 's/else (/else(/g' -e 's/ENDif(/endif(/g' -e 's/ELSEif(/elseif(/g' -i c10/**/CMakeLists.txt sed -e 's/IF (/if(/g' -e 's/IF(/if(/g' -e 's/if (/if(/g' -e 's/ELSE (/else(/g' -e 's/ELSE(/else(/g' -e 's/else (/else(/g' -e 's/ENDif(/endif(/g' -e 's/ELSEif(/elseif(/g' -i cmake/**/*.cmake sed -e 's/IF (/if(/g' -e 's/IF(/if(/g' -e 's/if (/if(/g' -e 's/ELSE (/else(/g' -e 's/ELSE(/else(/g' -e 's/else (/else(/g' -e 's/ENDif(/endif(/g' -e 's/ELSEif(/elseif(/g' -i cmake/**/*.cmake.in ``` We may further convert all the commands into lowercase according to the following issue: 77543bde41. Pull Request resolved: https://github.com/pytorch/pytorch/pull/35521 Differential Revision: D20704382 Pulled By: malfet fbshipit-source-id: 42186b9b1660c34428ab7ceb8d3f7a0ced5d2e80	2020-03-27 14:25:17 -07:00
Tao Xu	9c0625b004	[iOS] Add watchOS support (#33318) ... Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/33318 ### Summary Recently, we have a [discussion](https://discuss.pytorch.org/t/libtorch-on-watchos/69073/14) in the forum about watchOS. This PR adds the support for building watchOS libraries. ### Test Plan - `BUILD_PYTORCH_MOBILE=1 IOS_PLATFORM=WATCHOS ./scripts/build_ios.sh` Test Plan: Imported from OSS Differential Revision: D19896534 Pulled By: xta0 fbshipit-source-id: 7b9286475e895d9fefd998246e7090ac92c4c9b6	2020-02-14 14:02:22 -08:00
Tao Xu	3051e36e05	Remove armv7s build from iOS (#26222) ... Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/26222 ### Summary The last generation of armv7s device is Phone 5C. As discussed with David offline, we decided not to support iOS armv7s devices. ### Test plan - CI finishes successfully - Builds can be run only on X86_64 and arm64 devices Test Plan: Imported from OSS Differential Revision: D17385308 Pulled By: xta0 fbshipit-source-id: f883999aed18224ea3386b1f016964a33270fa34	2019-09-14 11:07:37 -07:00
Tao Xu	14c2492fb5	Fix iOS simulator build (#25633) ... Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/25633 The iOS simulator build (x86_64) is broken right now. To fix it: 1. Fix the bug in iOS.cmake 2. Disable avx2 for mobile x86_64 build Test Plan: 1. The `build_ios.sh` can be run successfully for iOS x86 build. The build script I'm using: ```shell ./scripts/build_ios.sh \ -DBUILD_CAFFE2_MOBILE=OFF \ -DIOS_PLATFORM=SIMULATOR \ -DUSE_NNPACK=OFF \ -DCMAKE_PREFIX_PATH=$(python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())') \ -DPYTHON_EXECUTABLE=$(python -c 'import sys; print(sys.executable)') ``` 2. All generated static libs are x86 libs as shown below ``` > lipo -i *.a Non-fat file: libasmjit.a is architecture: x86_64 Non-fat file: libc10.a is architecture: x86_64 Non-fat file: libcaffe2_protos.a is architecture: x86_64 Non-fat file: libclog.a is architecture: x86_64 Non-fat file: libcpuinfo.a is architecture: x86_64 Non-fat file: libfbgemm.a is architecture: x86_64 Non-fat file: libtorch.a is architecture: x86_64 Differential Revision: D17183803 Pulled By: xta0 fbshipit-source-id: 870d5433a3616b8e7ed9fb7dfab6aebbda26f723	2019-09-04 08:58:25 -07:00
Tao Xu	514285890c	Enable QNNPACK for iOS (#24030) ... Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/24030 The cmake arg - `USE_QNNPACK` was disabled for iOS build due to its lack of support for building multiple archs(armv7;armv7s;arm64) simultaneously.To enable it, we need to specify the value of IOS_ARCH explicitly in the build command: ``` ./scripts/build_ios.sh \ -DIOS_ARCH=arm64 \ -DBUILD_CAFFE2_MOBILE=OFF \ ``` However,the iOS.cmake will overwirte this value according to the value of `IOS_PLATFORM`. This PR is a fix to this problem. Test Plan: - `USE_QNNPACK` should be turned on by cmake. - `libqnnpack.a` can be generated successfully. - `libortch.a` can be compiled and run successfully on iOS devices. <img src="https://github.com/xta0/AICamera-ObjC/blob/master/aicamera.gif?raw=true" width="400"> Differential Revision: D16771014 Pulled By: xta0 fbshipit-source-id: 4cdfd502cb2bcd29611e4c22e2efdcdfe9c920d3	2019-08-13 21:10:59 -07:00
Tao Xu	4c6c9ffaf8	Move iOS.cmake to the cmake folder (#24029) ... Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/24029 The cmake toolchain file for building iOS is currently in `/third-pary/ios-cmake`. Since the upstream is not active anymore, It's better to maintain this file ourselves moving forward.This PR is also the prerequisite for enabling QNNPACK for iOS. Test Plan: - The `libtorch.a` can be generated successfully - The `libtorch.a` can be compiled and run on iOS devices <img src="https://github.com/xta0/AICamera-ObjC/blob/master/aicamera.gif?raw=true" width="400"> Differential Revision: D16770980 Pulled By: xta0 fbshipit-source-id: 1ed7b12b3699bac52b74183fa7583180bb17567e	2019-08-12 14:17:28 -07:00