Skip to content

Commit 742364e

Browse files
committed
Remove Tracker
1 parent 0156002 commit 742364e

File tree

8 files changed

+16
-45
lines changed

8 files changed

+16
-45
lines changed

src/Turing.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ export @model, # modelling
106106
AutoForwardDiff, # ADTypes
107107
AutoReverseDiff,
108108
AutoZygote,
109-
AutoTracker,
110109
AutoMooncake,
111110
setprogress!, # debugging
112111
Flat,

src/essential/Essential.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using AdvancedVI
1212
using StatsFuns: logsumexp, softmax
1313
@reexport using DynamicPPL
1414
using ADTypes:
15-
ADTypes, AutoForwardDiff, AutoTracker, AutoReverseDiff, AutoZygote, AutoMooncake
15+
ADTypes, AutoForwardDiff, AutoReverseDiff, AutoZygote, AutoMooncake
1616

1717
using AdvancedPS: AdvancedPS
1818

@@ -21,7 +21,6 @@ include("container.jl")
2121
export @model,
2222
@varname,
2323
AutoForwardDiff,
24-
AutoTracker,
2524
AutoZygote,
2625
AutoReverseDiff,
2726
AutoMooncake,

test/Project.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
3333
StatsFuns = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
3434
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
3535
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
36-
Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
3736
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
3837

3938
[compat]
@@ -70,6 +69,5 @@ StableRNGs = "1"
7069
StatsBase = "0.33, 0.34"
7170
StatsFuns = "0.9.5, 1"
7271
TimerOutputs = "0.5"
73-
Tracker = "0.2.11"
7472
Zygote = "0.5.4, 0.6"
7573
julia = "1.3"

test/essential/ad.jl

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,6 @@ end
8888
)
8989
x = map(x -> Float64(x), vi[SampleFromPrior()])
9090

91-
trackerℓ = LogDensityProblemsAD.ADgradient(Turing.AutoTracker(), ℓ)
92-
if isdefined(Base, :get_extension)
93-
@test trackerℓ isa
94-
Base.get_extension(
95-
LogDensityProblemsAD, :LogDensityProblemsADTrackerExt
96-
).TrackerGradientLogDensity
97-
else
98-
@test trackerℓ isa
99-
LogDensityProblemsAD.LogDensityProblemsADTrackerExt.TrackerGradientLogDensity
100-
end
101-
@test trackerℓ.===
102-
∇E1 = LogDensityProblems.logdensity_and_gradient(trackerℓ, x)[2]
103-
@test sort(∇E1) grad_FWAD atol = 1e-9
104-
10591
zygoteℓ = LogDensityProblemsAD.ADgradient(Turing.AutoZygote(), ℓ)
10692
if isdefined(Base, :get_extension)
10793
@test zygoteℓ isa
@@ -149,7 +135,7 @@ end
149135

150136
test_model_ad(wishart_ad(), logp3, [:v])
151137
end
152-
@testset "Simplex Tracker, Zygote and ReverseDiff (with and without caching) AD" begin
138+
@testset "Simplex Zygote and ReverseDiff (with and without caching) AD" begin
153139
@model function dir()
154140
return theta ~ Dirichlet(1 ./ fill(4, 4))
155141
end

test/ext/OptimInterface.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ using Turing
112112
@test isapprox(map1.values.array, map2.values.array)
113113
end
114114

115-
# FIXME: Some models doesn't work for Tracker and ReverseDiff.
115+
# FIXME: Some models don't work for ReverseDiff.
116+
# TODO: Check if above statement is still correct
116117
@testset "MAP for $(model.f)" for model in DynamicPPL.TestUtils.DEMO_MODELS
117118
result_true = DynamicPPL.TestUtils.posterior_optima(model)
118119

test/mcmc/Inference.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@ using Turing
382382
chn = sample(gdemo_default, alg, 1000)
383383
end
384384
@testset "vectorization @." begin
385-
# https://github.com/FluxML/Tracker.jl/issues/119
386385
@model function vdemo1(x)
387386
s ~ InverseGamma(2, 3)
388387
m ~ Normal(0, sqrt(s))

test/optimisation/Optimisation.jl

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module OptimisationTests
22

33
using ..Models: gdemo, gdemo_default
4-
using ..ADUtils: ADTypeCheckContext
4+
using ..ADUtils: ADUtils
55
using Distributions
66
using Distributions.FillArrays: Zeros
77
using DynamicPPL: DynamicPPL
@@ -617,16 +617,14 @@ using Turing
617617
@assert get(result, :c) == (; :c => Array{Float64}[])
618618
end
619619

620-
@testset "ADType" begin
620+
@testset "ADType" for adbackend in ADUtils.adbackends
621621
Random.seed!(222)
622-
for adbackend in (AutoReverseDiff(), AutoForwardDiff(), AutoTracker())
623-
m = DynamicPPL.contextualize(
624-
gdemo_default, ADTypeCheckContext(adbackend, gdemo_default.context)
625-
)
626-
# These will error if the adbackend being used is not the one set.
627-
maximum_likelihood(m; adtype=adbackend)
628-
maximum_a_posteriori(m; adtype=adbackend)
629-
end
622+
m = DynamicPPL.contextualize(
623+
gdemo_default, ADUtils.ADTypeCheckContext(adbackend, gdemo_default.context)
624+
)
625+
# These will error if the adbackend being used is not the one set.
626+
maximum_likelihood(m; adtype=adbackend)
627+
maximum_a_posteriori(m; adtype=adbackend)
630628
end
631629
end
632630

test/test_utils/ad_utils.jl

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ using Random: Random
66
using ReverseDiff: ReverseDiff
77
using Mooncake: Mooncake
88
using Test: Test
9-
using Tracker: Tracker
109
using Turing: Turing
1110
using Turing: DynamicPPL
1211
using Zygote: Zygote
@@ -31,19 +30,10 @@ const eltypes_by_adtype = Dict(
3130
ReverseDiff.TrackedVecOrMat,
3231
ReverseDiff.TrackedVector,
3332
),
33+
Turing.AutoMooncake => (Mooncake.CoDual,),
3434
# Zygote.Dual is actually the same as ForwardDiff.Dual, so can't distinguish between the
3535
# two by element type. However, we have other checks for Zygote, see check_adtype.
3636
Turing.AutoZygote => (Zygote.Dual,),
37-
Turing.AutoTracker => (
38-
Tracker.Tracked,
39-
Tracker.TrackedArray,
40-
Tracker.TrackedMatrix,
41-
Tracker.TrackedReal,
42-
Tracker.TrackedStyle,
43-
Tracker.TrackedVecOrMat,
44-
Tracker.TrackedVector,
45-
),
46-
Turing.AutoMooncake => (Mooncake.CoDual,),
4737
)
4838

4939
"""
@@ -247,7 +237,8 @@ Test.@testset "ADTypeCheckContext" begin
247237
Turing.AutoForwardDiff(),
248238
Turing.AutoReverseDiff(),
249239
Turing.AutoZygote(),
250-
Turing.AutoTracker(),
240+
# TODO: Mooncake
241+
# Turing.AutoMooncake(config=nothing),
251242
)
252243
for actual_adtype in adtypes
253244
sampler = Turing.HMC(0.1, 5; adtype=actual_adtype)
@@ -285,7 +276,7 @@ All the ADTypes on which we want to run the tests.
285276
adbackends = [
286277
Turing.AutoForwardDiff(; chunksize=0),
287278
Turing.AutoReverseDiff(; compile=false),
288-
Turing.AutoMooncake(; config=Mooncake.Config()),
279+
Turing.AutoMooncake(; config=nothing),
289280
]
290281

291282
end

0 commit comments

Comments
 (0)