Merge branch 'master' into improve-make-dataset

Author: pmeier

.github/workflows/tests-schedule.yml

@@ -26,10 +26,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Install PyTorch from the nightlies
-        run: |
-          pip install numpy
-          pip install --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
+      - name: Install torch nightly build
+        run: pip install --pre torch -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
+
+      - name: Install torchvision
+        run: pip install -e .
 
       - name: Install all optional dataset requirements
         run: pip install scipy pandas pycocotools lmdb requests

README.rst

@@ -26,6 +26,8 @@ supported Python versions.
 +==========================+==========================+=================================+
 | ``master`` / ``nightly`` | ``master`` / ``nightly`` | ``>=3.6``                       |
 +--------------------------+--------------------------+---------------------------------+
+| ``1.8.0``                | ``0.9.0``                | ``>=3.6``                       |
++--------------------------+--------------------------+---------------------------------+
 | ``1.7.1``                | ``0.8.2``                | ``>=3.6``                       |
 +--------------------------+--------------------------+---------------------------------+
 | ``1.7.0``                | ``0.8.1``                | ``>=3.6``                       |

android/.gitignore

@@ -1,8 +1,6 @@
 local.properties
 **/*.iml
 .gradle
-gradlew*
-gradle/wrapper
 .idea/*
 .externalNativeBuild
 build

android/build.gradle

@@ -24,10 +24,8 @@ allprojects {
         }
 
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.3.2'
-            classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:${GRADLE_BINTRAY_PLUGIN_VERSION}"
-            classpath "com.github.dcendents:android-maven-gradle-plugin:${ANDROID_MAVEN_GRADLE_PLUGIN_VERSION}"
-            classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8"
+            classpath 'com.android.tools.build:gradle:4.1.2'
+            classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
         }
     }
 

android/gradle.properties

@@ -1,8 +1,9 @@
 ABI_FILTERS=armeabi-v7a,arm64-v8a,x86,x86_64
 
-VERSION_NAME=0.0.1-SNAPSHOT
+VERSION_NAME=0.9.0-SNAPSHOT
 GROUP=org.pytorch
 MAVEN_GROUP=org.pytorch
+SONATYPE_STAGING_PROFILE=orgpytorch
 POM_URL=https://github.com/pytorch/vision/
 POM_SCM_URL=https://github.com/pytorch/vision.git
 POM_SCM_CONNECTION=scm:git:https://github.com/pytorch/vision
@@ -13,11 +14,6 @@ POM_ISSUES_URL=https://github.com/pytorch/vision/issues
 POM_LICENSE_DIST=repo
 POM_DEVELOPER_ID=pytorch
 POM_DEVELOPER_NAME=pytorch
-syncWithMavenCentral=true
-
-GRADLE_BINTRAY_PLUGIN_VERSION=1.8.0
-GRADLE_VERSIONS_PLUGIN_VERSION=0.15.0
-ANDROID_MAVEN_GRADLE_PLUGIN_VERSION=2.1
 
 # Gradle internals
 android.useAndroidX=true

android/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,95 +1,11 @@
-
-import java.nio.file.Files
-import java.nio.file.Paths
-import java.io.FileOutputStream
-import java.util.zip.ZipFile
-
-// Android tasks for Javadoc and sources.jar generation
-
 afterEvaluate { project ->
     if (POM_PACKAGING == 'aar') {
-        task androidJavadoc(type: Javadoc, dependsOn: assembleDebug) {
-            source += files(android.sourceSets.main.java.srcDirs)
-            failOnError false
-            // This task will try to compile *everything* it finds in the above directory and
-            // will choke on text files it doesn't understand.
-            exclude '**/BUCK'
-            exclude '**/*.md'
-        }
-
-        task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-            classifier = 'javadoc'
-            from androidJavadoc.destinationDir
-        }
-
-        task androidSourcesJar(type: Jar) {
-            classifier = 'sources'
-            from android.sourceSets.main.java.srcDirs
-        }
-
-        android.libraryVariants.all { variant ->
-            def name = variant.name.capitalize()
-            task "jar${name}"(type: Jar, dependsOn: variant.javaCompileProvider) {
-                from variant.javaCompileProvider.get().destinationDir
-            }
-
-            androidJavadoc.doFirst {
-                classpath += files(android.bootClasspath)
-                classpath += files(variant.javaCompileProvider.get().classpath.files)
-                // This is generated by `assembleDebug` and holds the JARs generated by the APT.
-                classpath += fileTree(dir: "$buildDir/intermediates/bundles/debug/", include: '**/*.jar')
-
-                // Process AAR dependencies
-                def aarDependencies = classpath.filter { it.name.endsWith('.aar') }
-                classpath -= aarDependencies
-                aarDependencies.each { aar ->
-                    // Extract classes.jar from the AAR dependency, and add it to the javadoc classpath
-                    def outputPath = "$buildDir/tmp/aarJar/${aar.name.replace('.aar', '.jar')}"
-                    classpath += files(outputPath)
-
-                    // Use a task so the actual extraction only happens before the javadoc task is run
-                    dependsOn task(name: "extract ${aar.name}").doLast {
-                        extractEntry(aar, 'classes.jar', outputPath)
-                    }
-                }
-            }
-        }
-
-        artifacts.add('archives', androidJavadocJar)
-        artifacts.add('archives', androidSourcesJar)
-    }
-
-    if (POM_PACKAGING == 'jar') {
-        task javadocJar(type: Jar, dependsOn: javadoc) {
-            classifier = 'javadoc'
-            from javadoc.destinationDir
-        }
-
-        task sourcesJar(type: Jar, dependsOn: classes) {
-            classifier = 'sources'
-            from sourceSets.main.allSource
-        }
-
-        artifacts.add('archives', javadocJar)
-        artifacts.add('archives', sourcesJar)
-    }
-}
-
-// Utility method to extract only one entry in a zip file
-private def extractEntry(archive, entryPath, outputPath) {
-    if (!archive.exists()) {
-        throw new GradleException("archive $archive not found")
-    }
-
-    def zip = new ZipFile(archive)
-    zip.entries().each {
-        if (it.name == entryPath) {
-            def path = Paths.get(outputPath)
-            if (!Files.exists(path)) {
-                Files.createDirectories(path.getParent())
-                Files.copy(zip.getInputStream(it), path)
+        task headersJar(type: Jar) {
+            archiveClassifier.set('headers')
+            from("$rootDir/cxx/") {
+                include '**/*.h'
             }
         }
+        artifacts.add('archives', headersJar)
     }
-    zip.close()
 }

android/gradle_scripts/android_maven_install.gradle

@@ -1,5 +1,3 @@
 apply from: rootProject.file('gradle_scripts/android_tasks.gradle')
 
-apply from: rootProject.file('gradle_scripts/release_bintray.gradle')
-
-apply from: rootProject.file('gradle_scripts/gradle_maven_push.gradle')
+apply plugin: 'com.vanniktech.maven.publish'