diff --git a/Project.toml b/Project.toml index 0cc0fb480..c75e7699d 100644 --- a/Project.toml +++ b/Project.toml @@ -13,7 +13,6 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" IRTools = "7869d1d1-7146-5819-86e3-90919afe41df" InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890" MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" @@ -31,7 +30,6 @@ DiffRules = "1.0" FillArrays = "0.8, 0.9, 0.10" ForwardDiff = "0.10" IRTools = "0.4" -LoopVectorization = "0.8.15, 0.9" MacroTools = "0.5" NNlib = "0.7" NaNMath = "0.3" diff --git a/src/Zygote.jl b/src/Zygote.jl index f06f00b51..7d2774d80 100644 --- a/src/Zygote.jl +++ b/src/Zygote.jl @@ -11,8 +11,6 @@ using IRTools using MacroTools, Requires using MacroTools: @forward -using LoopVectorization: vmap - export Params, gradient, pullback, pushforward, @code_adjoint include("tools/idset.jl") diff --git a/src/lib/array.jl b/src/lib/array.jl index 9473bc4be..b5e58ecf4 100644 --- a/src/lib/array.jl +++ b/src/lib/array.jl @@ -175,7 +175,7 @@ end _tryreverse(m, x) = x _tryreverse(m::typeof(map), x::Union{AbstractVector, Tuple}) = reverse(x) -for (mapfunc,∇mapfunc) in [(:map,:∇map),(:pmap,:∇pmap),(:vmap,:∇vmap)] +for (mapfunc,∇mapfunc) in [(:map,:∇map),(:pmap,:∇pmap)] @eval function $∇mapfunc(cx, f, args...) ys_and_backs = $mapfunc((args...) -> _pullback(cx, f, args...), args...) if isempty(ys_and_backs) diff --git a/test/gradcheck.jl b/test/gradcheck.jl index ff32b31e0..774b8088b 100644 --- a/test/gradcheck.jl +++ b/test/gradcheck.jl @@ -3,7 +3,6 @@ using Zygote, NNlib, Test, Random, LinearAlgebra, Statistics, FillArrays, using Zygote: gradient using NNlib: conv, ∇conv_data, depthwiseconv, batched_mul using Base.Broadcast: broadcast_shape -using LoopVectorization: vmap using Distributed: pmap import FiniteDifferences @@ -333,7 +332,7 @@ end @test gradtest(kron, rand(5,1), rand(3,1), rand(8,1)) @test gradtest(kron, rand(5,2), rand(3,2), rand(8,2)) -for mapfunc in [map,pmap,vmap] +for mapfunc in [map,pmap] @testset "$mapfunc" begin @test gradtest(xs -> sum(mapfunc(x -> x^2, xs)), rand(2,3)) @test gradtest((xss...) -> sum(mapfunc((xs...) -> sqrt(sum(xs.^2)), xss...)), [rand(5) for _ in 1:6]...)