Merge branch 'master' into generalize-decompression

pytorch · Feb 23, 2021 · 9c58f2d · 9c58f2d
2 parents 563cfa2 + 67b2528
commit 9c58f2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/android/test_app/app/build.gradle b/android/test_app/app/build.gradle
@@ -69,9 +69,6 @@ android {
         aar {
             dimension "build"
         }
-        nightly {
-            dimension "build"
-        }
         local {
             dimension "build"
         }
@@ -106,7 +103,6 @@ dependencies {
 
     implementation 'org.pytorch:pytorch_android:1.8.0-SNAPSHOT'
     implementation 'org.pytorch:pytorch_android_torchvision:1.8.0-SNAPSHOT'
-    implementation 'org.pytorch:torchvision_ops:0.0.1-SNAPSHOT'
 
     aarImplementation(name: 'pytorch_android-release', ext: 'aar')
     aarImplementation(name: 'pytorch_android_torchvision-release', ext: 'aar')

diff --git a/torchvision/transforms/functional.py b/torchvision/transforms/functional.py
@@ -119,9 +119,9 @@ def to_tensor(pic):
             return img
 
     if accimage is not None and isinstance(pic, accimage.Image):
-        nppic = np.zeros([pic.channels, pic.height, pic.width], dtype=default_float_dtype)
+        nppic = np.zeros([pic.channels, pic.height, pic.width], dtype=np.float32)
         pic.copyto(nppic)
-        return torch.from_numpy(nppic)
+        return torch.from_numpy(nppic).to(dtype=default_float_dtype)
 
     # handle PIL Image
     if pic.mode == 'I':