From: Alban Desmaison Date: Fri, 13 Aug 2021 13:36:27 +0000 (-0700) Subject: Revert D30090760: [iOS] Add podspec for libTorch-lite nightly build X-Git-Tag: accepted/tizen/8.0/unified/20231005.095509~1051 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa665e1ab820594359ea653c96ce2ce5e5977327;p=platform%2Fupstream%2Fpytorch.git Revert D30090760: [iOS] Add podspec for libTorch-lite nightly build Test Plan: revert-hammer Differential Revision: D30090760 (https://github.com/pytorch/pytorch/commit/e182b459d94fe77c1d9f623c94fc2621c8cc55de) Original commit changeset: 361aa2ed24a1 fbshipit-source-id: 9c0dfee80a80eb012b142d3928204d6eb8025b0a --- diff --git a/.circleci/scripts/binary_ios_test.sh b/.circleci/scripts/binary_ios_test.sh index 8dc0b3f..7038b89 100644 --- a/.circleci/scripts/binary_ios_test.sh +++ b/.circleci/scripts/binary_ios_test.sh @@ -26,4 +26,4 @@ if ! [ -x "$(command -v xcodebuild)" ]; then exit 1 fi PROFILE=PyTorch_CI_2021 -+ruby ${PROJ_ROOT}/scripts/xcode_build.rb -i ${PROJ_ROOT}/build_ios/install -x ${PROJ_ROOT}/ios/TestApp/TestApp.xcodeproj -p ${IOS_PLATFORM} -c ${PROFILE} -t ${IOS_DEV_TEAM_ID} -f Accelerate,MetalPerformanceShaders,CoreML +ruby ${PROJ_ROOT}/scripts/xcode_build.rb -i ${PROJ_ROOT}/build_ios/install -x ${PROJ_ROOT}/ios/TestApp/TestApp.xcodeproj -p ${IOS_PLATFORM} -c ${PROFILE} -t ${IOS_DEV_TEAM_ID} -f Accelerate,MetalPerformanceShaders diff --git a/.circleci/scripts/binary_ios_upload.sh b/.circleci/scripts/binary_ios_upload.sh index b0b0fe1..c4d4475 100644 --- a/.circleci/scripts/binary_ios_upload.sh +++ b/.circleci/scripts/binary_ios_upload.sh @@ -28,13 +28,12 @@ cp ${PROJ_ROOT}/ios/LibTorch-Lite.h ${ZIP_DIR}/src/ cp ${PROJ_ROOT}/LICENSE ${ZIP_DIR}/ # zip the library export DATE="$(date -u +%Y%m%d)" -export IOS_NIGHTLY_BUILD_VERSION="1.10.0.${DATE}" -# libtorch_lite_ios_nightly_1.10.0.20210810.zip -ZIPFILE="libtorch_lite_ios_nightly_${IOS_NIGHTLY_BUILD_VERSION}.zip" +# libtorch_lite_ios_nightly_1.10.0dev20210810.zip +ZIPFILE="libtorch_lite_ios_nightly_1.10.0.dev$DATE.zip" cd ${ZIP_DIR} #for testing touch version.txt -echo "${IOS_NIGHTLY_BUILD_VERSION}" > version.txt +echo "$DATE" > version.txt zip -r ${ZIPFILE} install src version.txt LICENSE # upload to aws # Install conda then 'conda install' awscli @@ -51,14 +50,3 @@ set +x # echo "AWS KEY: ${AWS_ACCESS_KEY_ID}" # echo "AWS SECRET: ${AWS_SECRET_ACCESS_KEY}" aws s3 cp ${ZIPFILE} s3://ossci-ios-build/ --acl public-read - -# create a new LibTorch-Lite-Nightly.podspec from the template -echo "cp ${PROJ_ROOT}/ios/LibTorch-Lite-Nightly.podspec.template ${PROJ_ROOT}/ios/LibTorch-Lite-Nightly.podspec" -cp ${PROJ_ROOT}/ios/LibTorch-Lite-Nightly.podspec.template ${PROJ_ROOT}/ios/LibTorch-Lite-Nightly.podspec - -# update pod version -sed -i '' -e "s/IOS_NIGHTLY_BUILD_VERSION/${IOS_NIGHTLY_BUILD_VERSION}/g" ${PROJ_ROOT}/ios/LibTorch-Lite-Nightly.podspec -cat ${PROJ_ROOT}/ios/LibTorch-Lite-Nightly.podspec - -# push the new LibTorch-Lite-Nightly.podspec to CocoaPods -pod trunk push --verbose --allow-warnings --use-libraries --skip-import-validation ${PROJ_ROOT}/ios/LibTorch-Lite-Nightly.podspec diff --git a/ios/LibTorch-Lite-Nightly.podspec.template b/ios/LibTorch-Lite-Nightly.podspec.template deleted file mode 100644 index 542a43b..0000000 --- a/ios/LibTorch-Lite-Nightly.podspec.template +++ /dev/null @@ -1,37 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'LibTorch-Lite-Nightly' - s.version = 'IOS_NIGHTLY_BUILD_VERSION' - s.authors = 'PyTorch Team' - s.license = { :type => 'BSD' } - s.homepage = 'https://github.com/pytorch/pytorch' - s.source = { :http => "https://ossci-ios-build.s3.amazonaws.com/libtorch_lite_ios_nightly_#{s.version}.zip" } - s.summary = 'The nightly build version of PyTorch C++ library for iOS' - s.description = <<-DESC - The nightly build version of PyTorch C++ library for iOS. - DESC - s.ios.deployment_target = '12.0' - s.default_subspec = 'Core' - s.subspec 'Core' do |ss| - ss.dependency 'LibTorch-Lite-Nightly/Torch' - ss.source_files = 'src/*.{h,cpp,c,cc}' - ss.public_header_files = ['src/LibTorch-Lite.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/*.a' - ss.libraries = ['c++', 'stdc++'] - end - s.user_target_xcconfig = { - 'HEADER_SEARCH_PATHS' => '$(inherited) "$(PODS_ROOT)/LibTorch-Lite-Nightly/install/include/"', - 'OTHER_LDFLAGS' => '-force_load "$(PODS_ROOT)/LibTorch-Lite-Nightly/install/lib/libtorch.a" -force_load "$(PODS_ROOT)/LibTorch-Lite-Nightly/install/lib/libtorch_cpu.a"', - 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', - 'CLANG_CXX_LIBRARY' => 'libc++' - } - s.pod_target_xcconfig = { - 'HEADER_SEARCH_PATHS' => '$(inherited) "$(PODS_ROOT)/LibTorch-Lite-Nightly/install/include/"', - 'VALID_ARCHS' => 'x86_64 arm64' - } - s.library = ['c++', 'stdc++'] - s.frameworks = 'Accelerate', 'MetalPerformanceShaders', 'CoreML' -end \ No newline at end of file