Merge branch 'master' into compathelper/new_version/2020-06-20-00-18-36-785-540576185

Author: yuehhua

Manifest.toml

@@ -26,9 +26,9 @@ version = "0.0.4"
 
 [[ArrayLayouts]]
 deps = ["FillArrays", "LinearAlgebra"]
-git-tree-sha1 = "a504dca2ac7eda8761c8f7c1ed52427a1be75a3c"
+git-tree-sha1 = "89182776a99b69964e995cc2f1e37b5fc3476d56"
 uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
-version = "0.2.6"
+version = "0.3.4"
 
 [[Base64]]
 uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -62,6 +62,18 @@ git-tree-sha1 = "ac86db2b05fdfec96b011e25a504ffe7476e8a68"
 uuid = "be33ccc6-a3ff-5ff2-a52e-74243cff1e17"
 version = "3.1.0"
 
+[[ChainRules]]
+deps = ["ChainRulesCore", "LinearAlgebra", "Reexport", "Requires", "Statistics"]
+git-tree-sha1 = "85f130f2c5ce208a5a395b550802398d2fcc5ee6"
+uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2"
+version = "0.6.4"
+
+[[ChainRulesCore]]
+deps = ["MuladdMacro"]
+git-tree-sha1 = "32e2c6e44d4fdd985b5688b5e85c1f6892cf3d15"
+uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
+version = "0.8.0"
+
 [[CodeTracking]]
 deps = ["InteractiveUtils", "UUIDs"]
 git-tree-sha1 = "9c173f62af93cce8af2bd3527d160b6ddd6eaf81"
@@ -191,9 +203,9 @@ version = "0.2.0"
 
 [[IRTools]]
 deps = ["InteractiveUtils", "MacroTools", "Test"]
-git-tree-sha1 = "90ee39f9beaaa186e4968417ea2b8ed5673c91c0"
+git-tree-sha1 = "6875ae3cfcb9a50af80553d5cc825f406e8d13bc"
 uuid = "7869d1d1-7146-5819-86e3-90919afe41df"
-version = "0.3.3"
+version = "0.4.0"
 
 [[Inflate]]
 git-tree-sha1 = "f5fc07d4e706b84f72d54eedcc1c13d92fb0871c"
@@ -260,6 +272,11 @@ version = "0.4.3"
 [[Mmap]]
 uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
+[[MuladdMacro]]
+git-tree-sha1 = "c6190f9a7fc5d9d5915ab29f2134421b12d24a68"
+uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221"
+version = "0.2.2"
+
 [[NNlib]]
 deps = ["BinaryProvider", "Libdl", "LinearAlgebra", "Requires", "Statistics"]
 git-tree-sha1 = "d9f196d911f55aeaff11b11f681b135980783824"
@@ -401,10 +418,10 @@ uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 version = "1.2.11+11"
 
 [[Zygote]]
-deps = ["AbstractFFTs", "ArrayLayouts", "DiffRules", "FillArrays", "ForwardDiff", "Future", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "NaNMath", "Random", "Requires", "SpecialFunctions", "Statistics", "ZygoteRules"]
-git-tree-sha1 = "707ceea58e2bd0ff3077ab13a92f8355181d3ee4"
+deps = ["AbstractFFTs", "ArrayLayouts", "ChainRules", "FillArrays", "ForwardDiff", "Future", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NNlib", "Random", "Requires", "Statistics", "ZygoteRules"]
+git-tree-sha1 = "6d0f78976db6dbea9a36865efe068e6e2a5db6ed"
 uuid = "e88e6eb3-aa80-5325-afca-941959d7151f"
-version = "0.4.20"
+version = "0.4.21"
 
 [[ZygoteRules]]
 deps = ["MacroTools"]

Project.toml

@@ -10,7 +10,6 @@ CuArrays = "3a865a2d-5b23-5a0f-bc46-62713ec82fae"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
 Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
-IRTools = "7869d1d1-7146-5819-86e3-90919afe41df"
 LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -28,7 +27,7 @@ CuArrays = "1.7.1, 1.7.2, 2.0"
 DataStructures = "~0.17"
 FillArrays = "^0.8.5"
 Flux = "~0.10"
-IRTools = "~0.3"
+IRTools = "~0.3, 0.4"
 LightGraphs = "1.3"
 Requires = "^1.0.0"
 StaticArrays = "^0.12.1"

src/cuda/pool.jl

@@ -85,7 +85,11 @@ meanpool(cluster::Array{Int}, X::CuArray{T}, c::Integer=length(Set(cluster))) wh
             ind = Tuple(ind)
             inds = filter(x -> x != ind, rev_cluster[cluster[ind...]])
             for i = 1:size(X, 1)
-                ∇X[i, ind...] *= mapreduce(j -> X[i, j...], *, inds; init=one(T))
+                multiplier = one(T)
+                for j = inds
+                    multiplier *= X[i, j...]
+                end
+                ∇X[i, ind...] *= multiplier
             end
         end
         (nothing, ∇X)
@@ -101,7 +105,11 @@ end
             ind = Tuple(ind)
             inds = filter(x -> x != ind, rev_cluster[cluster[ind...]])
             for i = 1:size(X, 1)
-                ∇X[i, ind...] /= mapreduce(j -> X[i, j...], *, inds; init=one(T))
+                denom = one(T)
+                for j = inds
+                    denom *= X[i, j...]
+                end
+                ∇X[i, ind...] /= denom
             end
         end
         (nothing, ∇X)

src/cuda/scatter.jl

@@ -122,7 +122,11 @@ end
             ind = Tuple(ind)
             inds = filter(x -> x != ind, rev_xs[xs[ind...]])
             for i = 1:size(us, 1)
-                Δu[i, ind...] *= mapreduce(j -> us[i, j...], *, inds; init=one(T))
+                multiplier = one(T)
+                for j = inds
+                    multiplier *= us[i, j...]
+                end
+                Δu[i, ind...] *= multiplier
             end
         end
         (Δy, Δu, nothing)
@@ -143,7 +147,11 @@ end
             ind = Tuple(ind)
             inds = filter(x -> x != ind, rev_xs[xs[ind...]])
             for i = 1:size(us, 1)
-                Δu[i, ind...] /= mapreduce(j -> us[i, j...], *, inds; init=one(T))
+                denom = one(T)
+                for j = inds
+                    denom *= us[i, j...]
+                end
+                Δu[i, ind...] /= denom
             end
         end
         (Δy, Δu, nothing)

test/cuda/pool.jl

@@ -123,12 +123,14 @@ X = CuArray(reshape(1:24, 2, 3, 4))
             end
 
             @testset "divpool" begin
+                # It seems that y have to convert to CuArray to avoid error,
+                # instead of broadcastly casting an array
                 y = 1 ./ [1729, 4480, 27, 40, 315, 352, 55, 72, 391, 432]
                 y = reshape(y, 2, 5)
-                @test divpool(CuArray{Int64}(cluster), T.(X)) ≈ T.(y)
-                @test pool(:div, CuArray{Int64}(cluster), T.(X)) ≈ T.(y)
-                @test divpool(cluster, T.(X)) ≈ T.(y)
-                @test pool(:div, cluster, T.(X)) ≈ T.(y)
+                @test divpool(CuArray{Int64}(cluster), T.(X)) ≈ CuArray{T}(y)
+                @test pool(:div, CuArray{Int64}(cluster), T.(X)) ≈ CuArray{T}(y)
+                @test divpool(cluster, T.(X)) ≈ CuArray{T}(y)
+                @test pool(:div, cluster, T.(X)) ≈ CuArray{T}(y)
             end
 
             @testset "meanpool" begin