Change the source link in podspec (#26089)

xta0 · facebook-github-bot · commit b5a3a8b42782 · 2019-09-13T15:00:31.000-07:00
Summary: Pull Request resolved: #26089 ### Summary 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. Expose 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.a` and `libqnnpack.a`. If we archive them into one using this `libtool -static` command, by default, it only picks one object file and discards the others, which could result in undefined symbols when linking the executable. The change here is to expose all the static libraries and let the linker decide which one to use. ### Test Plan - pod spec lint succeed - `pod spec lint --verbose --allow-warnings --no-clean --use-libraries --skip-import-validation` Test Plan: Imported from OSS Differential Revision: D17363037 Pulled By: xta0 fbshipit-source-id: ba77b0001b58e6e2353d8379d932db598166d37d
diff --git a/ios/LibTorch.h b/ios/LibTorch.h
@@ -1,7 +1,6 @@
+#ifndef LibTorch_h
+#define LibTorch_h
+
 #include <torch/script.h>
 
-#if TARGET_OS_IPHONE
-    #define AT_NNPACK_ENABLED() 1
-    #define USE_NNPACK ON
-    #undef CAFFE2_PERF_WITH_AVX512
 #endif
diff --git a/ios/LibTorch.podspec b/ios/LibTorch.podspec
@@ -1,24 +1,24 @@
 Pod::Spec.new do |s|
     s.name             = 'LibTorch'
-    s.version          = '0.0.1'
+    s.version          = '0.0.2'
     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
