Remove AD backend loops

Author: penelopeysm

test/mcmc/abstractmcmc.jl

@@ -112,36 +112,36 @@ end
 
 @testset "External samplers" begin
     @testset "AdvancedHMC.jl" begin
-        @testset "adtype=$adtype" for adtype in ADUtils.adbackends
-            @testset "$(model.f)" for model in DynamicPPL.TestUtils.DEMO_MODELS
-                # Need some functionality to initialize the sampler.
-                # TODO: Remove this once the constructors in the respective packages become "lazy".
-                sampler = initialize_nuts(model)
-                sampler_ext = DynamicPPL.Sampler(
-                    externalsampler(sampler; adtype, unconstrained=true)
+        @testset "$(model.f)" for model in DynamicPPL.TestUtils.DEMO_MODELS
+            adtype = Turing.DEFAULT_ADTYPE
+
+            # Need some functionality to initialize the sampler.
+            # TODO: Remove this once the constructors in the respective packages become "lazy".
+            sampler = initialize_nuts(model)
+            sampler_ext = DynamicPPL.Sampler(
+                externalsampler(sampler; adtype, unconstrained=true)
+            )
+            # FIXME: Once https://github.com/TuringLang/AdvancedHMC.jl/pull/366 goes through, uncomment.
+            # @testset "initial_params" begin
+            #     test_initial_params(model, sampler_ext; n_adapts=0)
+            # end
+
+            sample_kwargs = (
+                n_adapts=1_000,
+                discard_initial=1_000,
+                # FIXME: Remove this once we can run `test_initial_params` above.
+                initial_params=DynamicPPL.VarInfo(model)[:],
+            )
+
+            @testset "inference" begin
+                DynamicPPL.TestUtils.test_sampler(
+                    [model],
+                    sampler_ext,
+                    2_000;
+                    rtol=0.2,
+                    sampler_name="AdvancedHMC",
+                    sample_kwargs...,
                 )
-                # FIXME: Once https://github.com/TuringLang/AdvancedHMC.jl/pull/366 goes through, uncomment.
-                # @testset "initial_params" begin
-                #     test_initial_params(model, sampler_ext; n_adapts=0)
-                # end
-
-                sample_kwargs = (
-                    n_adapts=1_000,
-                    discard_initial=1_000,
-                    # FIXME: Remove this once we can run `test_initial_params` above.
-                    initial_params=DynamicPPL.VarInfo(model)[:],
-                )
-
-                @testset "inference" begin
-                    DynamicPPL.TestUtils.test_sampler(
-                        [model],
-                        sampler_ext,
-                        2_000;
-                        rtol=0.2,
-                        sampler_name="AdvancedHMC",
-                        sample_kwargs...,
-                    )
-                end
             end
         end
     end

test/mcmc/sghmc.jl

@@ -12,35 +12,35 @@ import Mooncake
 using Test: @test, @testset
 using Turing
 
-@testset "Testing sghmc.jl with $adbackend" for adbackend in ADUtils.adbackends
+@testset "Testing sghmc.jl" begin
     @testset "sghmc constructor" begin
-        alg = SGHMC(; learning_rate=0.01, momentum_decay=0.1, adtype=adbackend)
+        alg = SGHMC(; learning_rate=0.01, momentum_decay=0.1, adtype=Turing.DEFAULT_ADTYPE)
         @test alg isa SGHMC
         sampler = Turing.Sampler(alg)
         @test sampler isa Turing.Sampler{<:SGHMC}
 
-        alg = SGHMC(; learning_rate=0.01, momentum_decay=0.1, adtype=adbackend)
+        alg = SGHMC(; learning_rate=0.01, momentum_decay=0.1, adtype=Turing.DEFAULT_ADTYPE)
         @test alg isa SGHMC
         sampler = Turing.Sampler(alg)
         @test sampler isa Turing.Sampler{<:SGHMC}
     end
     @testset "sghmc inference" begin
         rng = StableRNG(123)
 
-        alg = SGHMC(; learning_rate=0.02, momentum_decay=0.5, adtype=adbackend)
+        alg = SGHMC(; learning_rate=0.02, momentum_decay=0.5, adtype=Turing.DEFAULT_ADTYPE)
         chain = sample(rng, gdemo_default, alg, 10_000)
         check_gdemo(chain; atol=0.1)
     end
 end
 
-@testset "Testing sgld.jl with $adbackend" for adbackend in ADUtils.adbackends
+@testset "Testing sgld.jl" begin
     @testset "sgld constructor" begin
-        alg = SGLD(; stepsize=PolynomialStepsize(0.25), adtype=adbackend)
+        alg = SGLD(; stepsize=PolynomialStepsize(0.25), adtype=Turing.DEFAULT_ADTYPE)
         @test alg isa SGLD
         sampler = Turing.Sampler(alg)
         @test sampler isa Turing.Sampler{<:SGLD}
 
-        alg = SGLD(; stepsize=PolynomialStepsize(0.25), adtype=adbackend)
+        alg = SGLD(; stepsize=PolynomialStepsize(0.25), adtype=Turing.DEFAULT_ADTYPE)
         @test alg isa SGLD
         sampler = Turing.Sampler(alg)
         @test sampler isa Turing.Sampler{<:SGLD}