From dfe85d6fd75dd808f89afefd5abec58b97e684e5 Mon Sep 17 00:00:00 2001 From: Nikita Shulga Date: Wed, 2 Jun 2021 16:24:56 -0700 Subject: [PATCH] Revert D28840199: [pytorch][PR] Update version to 1.10 Test Plan: revert-hammer Differential Revision: D28840199 (https://github.com/pytorch/pytorch/commit/3453aa44c1ea5239f9cb8b4811976339da47ed83) Original commit changeset: acc5a93e12a3 fbshipit-source-id: a41eb7c882fe0bf8f9a35ef180e99a7e72f6857d --- .circleci/scripts/binary_populate_env.sh | 4 ++-- android/README.md | 4 ++-- android/gradle.properties | 2 +- android/test_app/app/build.gradle | 4 ++-- torch/csrc/onnx/onnx.h | 2 +- version.txt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/scripts/binary_populate_env.sh b/.circleci/scripts/binary_populate_env.sh index dc21ee30fcd7..b7aa2e31d2d6 100755 --- a/.circleci/scripts/binary_populate_env.sh +++ b/.circleci/scripts/binary_populate_env.sh @@ -73,7 +73,7 @@ PIP_UPLOAD_FOLDER='nightly/' # We put this here so that OVERRIDE_PACKAGE_VERSION below can read from it export DATE="$(date -u +%Y%m%d)" #TODO: We should be pulling semver version from the base version.txt -BASE_BUILD_VERSION="1.10.0.dev$DATE" +BASE_BUILD_VERSION="1.9.0.dev$DATE" # Change BASE_BUILD_VERSION to git tag when on a git tag # Use 'git -C' to make doubly sure we're in the correct directory for checking # the git tag @@ -136,7 +136,7 @@ if [[ "${BUILD_FOR_SYSTEM:-}" == "windows" ]]; then fi export DATE="$DATE" -export NIGHTLIES_DATE_PREAMBLE=1.10.0.dev +export NIGHTLIES_DATE_PREAMBLE=1.9.0.dev export PYTORCH_BUILD_VERSION="$PYTORCH_BUILD_VERSION" export PYTORCH_BUILD_NUMBER="$PYTORCH_BUILD_NUMBER" export OVERRIDE_PACKAGE_VERSION="$PYTORCH_BUILD_VERSION" diff --git a/android/README.md b/android/README.md index 7c5b7866bd30..cea8cc0c2ff1 100644 --- a/android/README.md +++ b/android/README.md @@ -34,8 +34,8 @@ repositories { dependencies { ... - implementation 'org.pytorch:pytorch_android:1.10.0-SNAPSHOT' - implementation 'org.pytorch:pytorch_android_torchvision:1.10.0-SNAPSHOT' + implementation 'org.pytorch:pytorch_android:1.9.0-SNAPSHOT' + implementation 'org.pytorch:pytorch_android_torchvision:1.9.0-SNAPSHOT' ... } ``` diff --git a/android/gradle.properties b/android/gradle.properties index 410add293f89..8e6169fc6920 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,6 +1,6 @@ ABI_FILTERS=armeabi-v7a,arm64-v8a,x86,x86_64 -VERSION_NAME=1.10.0-SNAPSHOT +VERSION_NAME=1.9.0-SNAPSHOT GROUP=org.pytorch MAVEN_GROUP=org.pytorch SONATYPE_STAGING_PROFILE=orgpytorch diff --git a/android/test_app/app/build.gradle b/android/test_app/app/build.gradle index a802b9454989..0fc78945f3f6 100644 --- a/android/test_app/app/build.gradle +++ b/android/test_app/app/build.gradle @@ -149,8 +149,8 @@ dependencies { //nativeBuildImplementation(name: 'pytorch_android_torchvision-release', ext: 'aar') //extractForNativeBuild(name: 'pytorch_android-release', ext: 'aar') - nightlyImplementation 'org.pytorch:pytorch_android:1.10.0-SNAPSHOT' - nightlyImplementation 'org.pytorch:pytorch_android_torchvision:1.10.0-SNAPSHOT' + nightlyImplementation 'org.pytorch:pytorch_android:1.9.0-SNAPSHOT' + nightlyImplementation 'org.pytorch:pytorch_android_torchvision:1.9.0-SNAPSHOT' aarImplementation(name:'pytorch_android', ext:'aar') aarImplementation(name:'pytorch_android_torchvision', ext:'aar') diff --git a/torch/csrc/onnx/onnx.h b/torch/csrc/onnx/onnx.h index 6779fd0282be..d9099a8cf1e1 100644 --- a/torch/csrc/onnx/onnx.h +++ b/torch/csrc/onnx/onnx.h @@ -21,5 +21,5 @@ enum class TrainingMode { // stable. only bump it when it's necessary static const size_t IR_VERSION = 6; // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) -static const char* PRODUCER_VERSION = "1.10"; +static const char* PRODUCER_VERSION = "1.9"; }} // namespace torch::onnx diff --git a/version.txt b/version.txt index f3e69c1a6215..0fe9815eec38 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.10.0a0 +1.9.0a0