From f1ce7f4b7f7e668edca1bf12099ce5cdb5d31d69 Mon Sep 17 00:00:00 2001
From: Nikita Shulga <nshulga@fb.com>
Date: Thu, 3 Jun 2021 07:54:18 -0700
Subject: [PATCH] Update PyTorch version to 0.10.0a (#59345)

Summary:
Also fix `TestProducerVersion` by removing assumption that major and minor are single digit

Pull Request resolved: https://github.com/pytorch/pytorch/pull/59345

Reviewed By: robieta

Differential Revision: D28853720

Pulled By: malfet

fbshipit-source-id: 4b6d03c6b0c9d652a5aef792aaa84eaa522d10e8
---
 .circleci/scripts/binary_populate_env.sh | 4 ++--
 android/README.md                        | 4 ++--
 android/gradle.properties                | 2 +-
 android/test_app/app/build.gradle        | 4 ++--
 test/test_jit.py                         | 2 +-
 torch/csrc/onnx/onnx.h                   | 2 +-
 version.txt                              | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/scripts/binary_populate_env.sh b/.circleci/scripts/binary_populate_env.sh
index b7aa2e31d2d68..dc21ee30fcd7a 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.9.0.dev$DATE"
+BASE_BUILD_VERSION="1.10.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.9.0.dev
+export NIGHTLIES_DATE_PREAMBLE=1.10.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 cea8cc0c2ff1a..7c5b7866bd303 100644
--- a/android/README.md
+++ b/android/README.md
@@ -34,8 +34,8 @@ repositories {
 
 dependencies {
     ...
-    implementation 'org.pytorch:pytorch_android:1.9.0-SNAPSHOT'
-    implementation 'org.pytorch:pytorch_android_torchvision:1.9.0-SNAPSHOT'
+    implementation 'org.pytorch:pytorch_android:1.10.0-SNAPSHOT'
+    implementation 'org.pytorch:pytorch_android_torchvision:1.10.0-SNAPSHOT'
     ...
 }
 ```
diff --git a/android/gradle.properties b/android/gradle.properties
index 8e6169fc6920f..410add293f899 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.9.0-SNAPSHOT
+VERSION_NAME=1.10.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 0fc78945f3f64..a802b94549892 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.9.0-SNAPSHOT'
-    nightlyImplementation 'org.pytorch:pytorch_android_torchvision:1.9.0-SNAPSHOT'
+    nightlyImplementation 'org.pytorch:pytorch_android:1.10.0-SNAPSHOT'
+    nightlyImplementation 'org.pytorch:pytorch_android_torchvision:1.10.0-SNAPSHOT'
 
     aarImplementation(name:'pytorch_android', ext:'aar')
     aarImplementation(name:'pytorch_android_torchvision', ext:'aar')
diff --git a/test/test_jit.py b/test/test_jit.py
index 9da9e2c3f3077..22602f0729d20 100644
--- a/test/test_jit.py
+++ b/test/test_jit.py
@@ -15968,7 +15968,7 @@ class TestProducerVersion(unittest.TestCase):
 
     def test_version(self):
         # issue gh-32561
-        self.assertEqual(torch.onnx.producer_version, torch.__version__[:3])
+        self.assertTrue(torch.__version__.startswith(torch.onnx.producer_version))
 
 
 for test in autograd_method_tests():
diff --git a/torch/csrc/onnx/onnx.h b/torch/csrc/onnx/onnx.h
index d9099a8cf1e1b..6779fd0282be9 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.9";
+static const char* PRODUCER_VERSION = "1.10";
 }} // namespace torch::onnx
diff --git a/version.txt b/version.txt
index 0fe9815eec38b..f3e69c1a6215d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.9.0a0
+1.10.0a0