diff --git a/experiments/california_housing.jl b/experiments/california_housing.jl index b4cd94078de759903d10c363a678423ebcfe3b1d..02c7ba856511896208fa52f3d6418121aa71a9bf 100644 --- a/experiments/california_housing.jl +++ b/experiments/california_housing.jl @@ -12,16 +12,12 @@ tuning_params = DEFAULT_GENERATOR_TUNING params = ( n_hidden=32, activation=Flux.relu, - builder=MLJFlux.@builder Flux.Chain( - Dense(n_in, n_hidden, activation), - Dense(n_hidden, n_hidden, activation), - Dense(n_hidden, n_out), - ), - α = [1.0, 1.0, 1e-1], - sampling_batch_size = 10, - sampling_steps = 30, - use_ensembling = true, - opt = Flux.Optimise.Descent(0.05) + builder=default_builder(n_hidden=32, n_layers=3, activation=Flux.relu), + α=[1.0, 1.0, 1e-1], + sampling_batch_size=10, + sampling_steps=30, + use_ensembling=true, + opt=Flux.Optimise.Descent(0.05) ) if !GRID_SEARCH diff --git a/experiments/credit_default.jl b/experiments/credit_default.jl index 059c29c5ed616297fd0ad695e866b99588c48e15..c74dcf4cca1386ea2aa92ad94a5738cb3fcd9a6c 100644 --- a/experiments/credit_default.jl +++ b/experiments/credit_default.jl @@ -10,13 +10,9 @@ tuning_params = DEFAULT_GENERATOR_TUNING # Parameter choices: params = ( - n_hidden = 32, - activation = Flux.relu, - builder = MLJFlux.@builder Flux.Chain( - Dense(n_in, n_hidden, activation), - Dense(n_hidden, n_hidden, activation), - Dense(n_hidden, n_out), - ), + n_hidden=32, + activation=Flux.relu, + builder=default_builder(n_hidden=32, n_layers=3, activation=Flux.relu), α=[1.0, 1.0, 1e-1], sampling_batch_size=10, sampling_steps=30, diff --git a/experiments/german_credit.jl b/experiments/german_credit.jl index e315b97eb7322a6863aceb508c4e5da3facb660e..541890b7fcfa9f7691fa14a32f04141a4ac098a9 100644 --- a/experiments/german_credit.jl +++ b/experiments/german_credit.jl @@ -12,16 +12,12 @@ tuning_params = DEFAULT_GENERATOR_TUNING params = ( n_hidden=32, activation=Flux.relu, - builder=MLJFlux.@builder Flux.Chain( - Dense(n_in, n_hidden, activation), - Dense(n_hidden, n_hidden, activation), - Dense(n_hidden, n_out), - ), - α = [1.0, 1.0, 1e-1], - sampling_batch_size = 10, - sampling_steps = 30, - use_ensembling = true, - opt = Flux.Optimise.Descent(0.05) + builder=default_builder(n_hidden=32, n_layers=3, activation=Flux.relu), + α=[1.0, 1.0, 1e-1], + sampling_batch_size=10, + sampling_steps=30, + use_ensembling=true, + opt=Flux.Optimise.Descent(0.05) ) if !GRID_SEARCH diff --git a/experiments/gmsc.jl b/experiments/gmsc.jl index f41b003e77b7104a68b4868555a8f9253ca4825d..c71bd5ffa9097358791f0d419288aeb3942ccef1 100644 --- a/experiments/gmsc.jl +++ b/experiments/gmsc.jl @@ -13,11 +13,7 @@ tuning_params = DEFAULT_GENERATOR_TUNING params = ( n_hidden=32, activation=Flux.relu, - builder=MLJFlux.@builder Flux.Chain( - Dense(n_in, n_hidden, activation), - Dense(n_hidden, n_hidden, activation), - Dense(n_hidden, n_out), - ), + builder=default_builder(n_hidden=32, n_layers=3, activation=Flux.relu), α = [1.0, 1.0, 1e-1], sampling_batch_size = 10, sampling_steps = 30,