diff --git a/.circleci/scripts/binary_populate_env.sh b/.circleci/scripts/binary_populate_env.sh index d4c31cefc7e5..ec7651823536 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.7.0.dev$DATE" +BASE_BUILD_VERSION="1.8.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 @@ -130,7 +130,7 @@ if [[ "${BUILD_FOR_SYSTEM:-}" == "windows" ]]; then fi export DATE="$DATE" -export NIGHTLIES_DATE_PREAMBLE=1.7.0.dev +export NIGHTLIES_DATE_PREAMBLE=1.8.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 bf5fa02e6cf4..e67b2e6ec071 100644 --- a/android/README.md +++ b/android/README.md @@ -15,8 +15,8 @@ repositories { } dependencies { - implementation 'org.pytorch:pytorch_android:1.5.0' - implementation 'org.pytorch:pytorch_android_torchvision:1.5.0' + implementation 'org.pytorch:pytorch_android:1.6.0' + implementation 'org.pytorch:pytorch_android_torchvision:1.6.0' } ``` @@ -34,12 +34,12 @@ repositories { dependencies { ... - implementation 'org.pytorch:pytorch_android:1.7.0-SNAPSHOT' - implementation 'org.pytorch:pytorch_android_torchvision:1.7.0-SNAPSHOT' + implementation 'org.pytorch:pytorch_android:1.8.0-SNAPSHOT' + implementation 'org.pytorch:pytorch_android_torchvision:1.8.0-SNAPSHOT' ... } ``` -The current nightly(snapshots) version is the value of `VERSION_NAME` in `gradle.properties` in current folder, at this moment it is `1.7.0-SNAPSHOT`. +The current nightly(snapshots) version is the value of `VERSION_NAME` in `gradle.properties` in current folder, at this moment it is `1.8.0-SNAPSHOT`. ## Building PyTorch Android from Source diff --git a/android/gradle.properties b/android/gradle.properties index 6e0dc0ac86b0..0ab42c56396d 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.7.0-SNAPSHOT +VERSION_NAME=1.8.0-SNAPSHOT GROUP=org.pytorch MAVEN_GROUP=org.pytorch POM_URL=https://github.com/pytorch/pytorch/tree/master/android diff --git a/android/test_app/app/build.gradle b/android/test_app/app/build.gradle index 9be0ad2d7aa6..37bdb35e2f19 100644 --- a/android/test_app/app/build.gradle +++ b/android/test_app/app/build.gradle @@ -131,7 +131,7 @@ android { tasks.all { task -> // Disable externalNativeBuild for all but nativeBuild variant - if (task.name.startsWith('externalNativeBuild') + if (task.name.startsWith('externalNativeBuild') && !task.name.contains('NativeBuild')) { task.enabled = false } @@ -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.7.0-SNAPSHOT' - nightlyImplementation 'org.pytorch:pytorch_android_torchvision:1.7.0-SNAPSHOT' + nightlyImplementation 'org.pytorch:pytorch_android:1.8.0-SNAPSHOT' + nightlyImplementation 'org.pytorch:pytorch_android_torchvision:1.8.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 900de0ea57c2..9daced8a3e4d 100644 --- a/torch/csrc/onnx/onnx.h +++ b/torch/csrc/onnx/onnx.h @@ -20,5 +20,5 @@ enum class TrainingMode { // onnx::IR_VERSION. with this change, the test_operators.py will be more // stable. only bump it when it's necessary static const size_t IR_VERSION = 6; -static const char* PRODUCER_VERSION = "1.7"; +static const char* PRODUCER_VERSION = "1.8"; }} // namespace torch::onnx diff --git a/version.txt b/version.txt index 56fee0696648..52d893bfbb54 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.7.0a0 +1.8.0a0