update codebase to 1.0 and 1.x (continue #27)

src/Augmentor.jl

@@ -73,6 +73,7 @@ export
 
     testpattern
 
+include("compat.jl")
 include("utils.jl")
 include("types.jl")
 include("operation.jl")
@@ -103,7 +104,10 @@ include("augment.jl")
 include("augmentbatch.jl")
 
 function __init__()
-    rand_mutex[] = Threads.Mutex()
+    if VERSION < v"1.3"
+        # see compat.jl
+        rand_mutex[] = Threads.Mutex()
+    end
 end
 
 end # module

src/compat.jl

@@ -0,0 +1,22 @@
+if VERSION >= v"1.3"
+    const safe_rand = rand
+else
+    # rand is thread safe after julia 1.3
+    # TODO: delete this when we decide to drop 1.0 compatibility
+
+    # --------------------------------------------------------------------
+    # rand() is not threadsafe (https://discourse.julialang.org/t/4683)
+
+    # Because we only require random numbers to sample parameters
+    # and not the actual expensive computation, this seems like a better
+    # approach than using separate RNG per thread.
+    const rand_mutex = Ref{Threads.Mutex}()
+
+    # constant overhead of about 80 ns compared to unsafe rand
+    function safe_rand(args...)
+        lock(rand_mutex[])
+        result = rand(args...)
+        unlock(rand_mutex[])
+        result
+    end
+end

src/utils.jl

@@ -15,22 +15,6 @@ function use_testpattern()
     testpattern()
 end
 
-# --------------------------------------------------------------------
-# rand() is not threadsafe (https://discourse.julialang.org/t/4683)
-
-# Because we only require random numbers to sample parameters
-# and not the actual expensive computation, this seems like a better
-# approach than using separate RNG per thread.
-const rand_mutex = Ref{Threads.Mutex}()
-
-# constant overhead of about 80 ns compared to unsafe rand
-function safe_rand(args...)
-    lock(rand_mutex[])
-    result = rand(args...)
-    unlock(rand_mutex[])
-    result
-end
-
 # --------------------------------------------------------------------
 """
     contiguous(A::AbstractArray)

test/runtests.jl

@@ -24,6 +24,7 @@ checkers = Gray{N0f8}[1 0 1 0 1; 0 1 0 1 0; 1 0 1 0 1]
 rgb_rect = rand(RGB{N0f8}, 2, 3)
 
 tests = [
+    "tst_compat.jl",
     "tst_utils.jl",
     "operations/tst_channels.jl",
     "operations/tst_dims.jl",

test/tst_compat.jl

@@ -0,0 +1,16 @@
+# TODO: remove this testset when we dicide to drop 1.0 compatibility
+if VERSION < v"1.3"
+    @testset "safe_rand" begin
+        mutex = Augmentor.rand_mutex[]
+        typeof(mutex) <: Threads.Mutex
+        # check that its not a null pointer
+        @test reinterpret(Int, mutex.handle) > 0
+
+        num = @inferred Augmentor.safe_rand()
+        @test 0 <= num <= 1
+        @test typeof(num) <: Float64
+        num = @inferred Augmentor.safe_rand(2)
+        @test all(0 .<= num .<= 1)
+        @test typeof(num) <: Vector{Float64}
+    end
+end

test/tst_utils.jl

@@ -7,22 +7,6 @@
     @test tp == tp2
 end
 
-@testset "rand_mutex" begin
-    mutex = Augmentor.rand_mutex[]
-    typeof(mutex) <: Threads.Mutex
-    # check that its not a null pointer
-    @test reinterpret(Int, mutex.handle) > 0
-end
-
-@testset "safe_rand" begin
-    num = @inferred Augmentor.safe_rand()
-    @test 0 <= num <= 1
-    @test typeof(num) <: Float64
-    num = @inferred Augmentor.safe_rand(2)
-    @test all(0 .<= num .<= 1)
-    @test typeof(num) <: Vector{Float64}
-end
-
 @testset "contiguous" begin
     A = [1 2 3; 4 5 6; 7 8 9]
     Ao = OffsetArray(A, (-2,-1))