[iOS]Replace the source link for testing

xta0 · xta0 · commit 692ee5933648 · 2019-09-12T18:53:41.000-07:00
A couple of changes 1. Replace the source link with the newly nightly build address 2. Remove module support for Swift and Objective-C 3. Upload all static libraries instead of archiving them into one single library. This is because those static libraries might contain object files that have the same name, e.g. `init.c.o` in both libcupinfo and libqnnpack. If we archive them into one using this `libtool -static` command, by default, it only picks one object file and discard the others, which could result in undefined symbols when linking the executable.The solution here is to keep all the static libraries and let the linker decide which one to use. - pod spec lint succeed - `pod spec lint --verbose --allow-warnings --no-clean --use-libraries --skip-import-validation` ghstack-source-id: ac1b135 Pull Request resolved: #26089
diff --git a/ios/LibTorch.h b/ios/LibTorch.h
@@ -1,7 +1 @@
-#include <torch/script.h>
-
-#if TARGET_OS_IPHONE
-    #define AT_NNPACK_ENABLED() 1
-    #define USE_NNPACK ON
-    #undef CAFFE2_PERF_WITH_AVX512
-#endif
+#include <torch/script.h>
diff --git a/ios/LibTorch.podspec b/ios/LibTorch.podspec
@@ -4,21 +4,21 @@ Pod::Spec.new do |s|
     s.authors          = 'PyTorch Team'
     s.license          = { :type => 'BSD' }
     s.homepage         = 'https://github.com/pytorch/pytorch'
-    s.source           = { :http => 'http://ossci-macos.s3.amazonaws.com/libtorch_x86_arm64.zip' }
+    s.source           = { :http => 'https://ossci-ios-build.s3.amazonaws.com/libtorch_ios_nightly_build.zip' }
     s.summary          = 'The PyTorch C++ library for iOS'
     s.description      = <<-DESC
         The PyTorch C++ library for iOS.
     DESC
     s.default_subspec = 'Core'
     s.subspec 'Core' do |ss|
         ss.dependency 'LibTorch/Torch'
-        ss.source_files = 'src/*.{h,cpp,cc}'
+        ss.source_files = 'src/*.{h,cpp,c,cc}'
         ss.public_header_files = ['src/LibTorch.h']
     end
     s.subspec 'Torch' do |ss|
         ss.header_mappings_dir = 'install/include/'
         ss.preserve_paths = 'install/include/**/*.{h,cpp,cc,c}' 
-        ss.vendored_libraries = 'install/lib/libtorch.a'
+        ss.vendored_libraries = 'install/lib/*.a'
         ss.libraries = ['c++', 'stdc++']
     end
     s.user_target_xcconfig = {
@@ -27,8 +27,9 @@ Pod::Spec.new do |s|
         'CLANG_CXX_LANGUAGE_STANDARD' => 'c++11',
         'CLANG_CXX_LIBRARY' => 'libc++'
     }
-    s.pod_target_xcconfig = { 'VALID_ARCHS' => 'x86_64 armv7s arm64' }
-    s.module_name='LibTorch'
-    s.module_map = 'src/framework.modulemap'
+    s.pod_target_xcconfig = { 
+        'HEADER_SEARCH_PATHS' => '$(inherited) "$(PODS_ROOT)/LibTorch/install/include/"', 
+        'VALID_ARCHS' => 'x86_64 armv7s arm64' 
+    }
     s.library = ['c++', 'stdc++']
 end
diff --git a/ios/framework.modulemap b/ios/framework.modulemap
