Merge pull request #40 from lorenzoh/lorenzoh/fix-rotate-type

Fix `Rotate` type instability

Author: lorenzoh

src/projective/affine.jl

@@ -107,11 +107,14 @@ Rotate(γ) = Rotate(Uniform(-abs(γ), abs(γ)))
 
 getrandstate(tfm::Rotate) = rand(tfm.dist)
 
-function getprojection(tfm::Rotate, bounds; randstate = getrandstate(tfm))
+function getprojection(
+        tfm::Rotate,
+        bounds::AbstractArray{<:SVector{N, T}};
+        randstate = getrandstate(tfm)) where {N, T}
     γ = randstate
     middlepoint = sum(bounds) ./ length(bounds)
     r = γ / 360 * 2pi
-    return recenter(RotMatrix(r), middlepoint)
+    return recenter(RotMatrix(convert(T, r)), middlepoint)
 end
 
 

src/projective/base.jl

@@ -49,6 +49,7 @@ Default implementation falls back to `project`.
 function project!(bufitem, P, item, indices)
     titem = project(P, item, indices)
     copyitemdata!(bufitem, titem)
+
     return bufitem
 end
 
@@ -82,8 +83,8 @@ function apply!(
     bounds = getbounds(item)
     P = getprojection(tfm, bounds; randstate = randstate)
     indices = cropindices(tfm, P, bounds; randstate = randstate)
-    project!(bufitem, P, item, indices)
-    return bufitem
+    res = project!(bufitem, P, item, indices)
+    return res
 end
 
 

src/projective/warp.jl

@@ -42,5 +42,5 @@ function threepointwarpaffine(
     c = (X \ Y)'
     A = SMatrix{2, 2, V}(c[:, 1:2])
     b = SVector{2, V}(c[:, 3])
-    AffineMap(A, b)
+    return AffineMap(A, b)
 end

test/projective/affine.jl

@@ -99,7 +99,9 @@ include("../imports.jl")
         tfm = Rotate(10)
         image = Image(rand(RGB, 50, 50))
         @test_nowarn apply(tfm, image)
-
+        P = DataAugmentation.getprojection(tfm, getbounds(image))
+        @test P isa AffineMap
+        @test P.linear.mat[1] isa Float32
     end
 
     @testset ExtendedTestSet "Rotate" begin
@@ -144,16 +146,20 @@ end
             Image(rand(RGB, sz)),
             Keypoints(rand(SVector{2, Float32}, 50), sz),
             MaskBinary(rand(Bool, sz)),
-            MaskMulti(rand(1:8, sz)),
+            MaskMulti(UInt8.(rand(1:8, sz)), 1:8),
         )
 
         tfms = compose(
             Rotate(10),
             FlipX(), FlipY(),
             ScaleRatio((.8, .8)),
             RandomResizeCrop((50, 50)),
+            WarpAffine(0.1),
+            Zoom((1., 1.2))
         )
         @test_nowarn apply(tfms, items)
+        titems = apply(tfms, items)
+        @test all(typeof.(titems) == typeof.(items))
     end
 
     @testset ExtendedTestSet "3D" begin
@@ -170,5 +176,7 @@ end
             RandomResizeCrop((25, 25, 25)),
         )
         @test_nowarn apply(tfms, items)
+        titems = apply(tfms, items)
+        @test all(typeof.(titems) == typeof.(items))
     end
 end