Skip to content

Commit c51ef87

Browse files
bgctwbgctw
committed
remove HybridProblemInterpreters
1 parent e52206e commit c51ef87

8 files changed

Lines changed: 55 additions & 202 deletions

‎src/HybridSolver.jl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ function CommonSolve.solve(prob::AbstractHybridProblem, solver::HybridPosteriorS
191191
(; transP, transM) = get_hybridproblem_transforms(prob; scenario)
192192
pbm_covars = get_hybridproblem_pbmpar_covars(prob; scenario)
193193
n_site, n_batch = get_hybridproblem_n_site_and_batch(prob; scenario)
194-
hpints = HybridProblemInterpreters(prob; scenario)
195194
ϕq = get_hybridproblem_ϕq(prob; scenario)
196195
(; ϕ, interpreters) = init_hybrid_params(ϕg0, ϕq)
197196
int_ϕq = interpreters.ϕq

‎src/HybridVariationalInference.jl‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@ export AbstractHybridProblem, get_hybridproblem_MLapplicator, get_hybridproblem_
7979
init_hybrid_ϕq
8080
include("AbstractHybridProblem.jl")
8181

82-
export AbstractHybridProblemInterpreters, HybridProblemInterpreters,
83-
get_int_P, get_int_M,
84-
get_int_Ms_batch, get_int_Ms_site, get_int_Mst_batch, get_int_Mst_site,
85-
get_int_PMs_batch, get_int_PMs_site, get_int_PMst_batch, get_int_PMst_site
86-
include("hybridprobleminterpreters.jl")
87-
8882
export HybridProblem
8983
export get_quantile_transformed
9084
include("HybridProblem.jl")

‎src/elbo.jl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,6 @@ function sample_posterior(rng, prob::AbstractHybridProblem, xM::AbstractMatrix;
390390
(; transP, transM) = get_hybridproblem_transforms(prob; scenario)
391391
pbm_covars = get_hybridproblem_pbmpar_covars(prob; scenario)
392392
pbm_covar_indices = get_pbm_covar_indices(par_templates.θP, pbm_covars)
393-
hpints = HybridProblemInterpreters(prob; scenario)
394-
# TODO remove par_templates from init_hybrid_params - might not get updated θP
395393
(; ϕ, interpreters) = init_hybrid_params(ϕg0, ϕq)
396394
int_ϕg_ϕq = interpreters.ϕg_ϕq
397395
int_ϕq = interpreters.ϕq

‎src/hybridprobleminterpreters.jl‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎src/init_hybrid_params.jl‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -32,53 +32,53 @@ function init_hybrid_params(ϕg::AbstractVector{FT}, ϕq::AbstractVector{FT}) wh
3232
(; ϕ, interpreters)
3333
end
3434

35-
function init_hybrid_params_old(θP::AbstractVector{FT}, θM::AbstractVector{FT},
36-
cor_ends::NamedTuple, ϕg::AbstractVector{FT}, hpints::HybridProblemInterpreters;
37-
transP = elementwise(identity), transM = elementwise(identity),
38-
ϕunc0 = init_hybrid_ϕunc(cor_ends, zero(FT))) where {FT}
39-
n_θP = length(θP)
40-
n_θM = length(θM)
41-
@assert cor_ends.P[end] == n_θP
42-
@assert cor_ends.M[end] == n_θM
43-
n_ϕg = length(ϕg)
44-
# check translating parameters - can match length?
45-
_ = Bijectors.inverse(transP)(θP)
46-
_ = Bijectors.inverse(transM)(θM)
47-
# TODO add and test θP
48-
ϕq = update_μP_by_θP(ϕunc0, θP, transP)
49-
ϕ = CA.ComponentVector(; ϕg, ϕq)
50-
#
51-
# get_transPMs = let transP = transP, transM = transM, n_θP = n_θP, n_θM = n_θM
52-
# function get_transPMs_inner(n_site)
53-
# transMs = ntuple(i -> transM, n_site)
54-
# ranges = vcat(
55-
# [1:n_θP], [(n_θP + i0 * n_θM) .+ (1:n_θM) for i0 in 0:(n_site - 1)])
56-
# transPMs = Stacked((transP, transMs...), ranges)
57-
# transPMs
58-
# end
59-
# end
60-
get_transPMs = transPMs_batch = Val(Symbol("deprecated , use stack_ca_int(intPMs)"))
61-
#transPMs_batch = get_transPMs(n_batch)
62-
# ranges = (P = 1:n_θP, ϕg = n_θP .+ (1:n_ϕg), unc = (n_θP + n_ϕg) .+ (1:length(ϕunc0)))
63-
# inv_trans_gu = Stacked(
64-
# (inverse(transP), elementwise(identity), elementwise(identity)), values(ranges))
65-
# ϕ = inv_trans_gu(CA.getdata(ϕt))
66-
get_ca_int_PMs = Val(Symbol("deprecated , use get_int_PMst_site(HybridProblemInterpreters(prob; scenario))"))
67-
# get_ca_int_PMs = let
68-
# function get_ca_int_PMs_inner(n_site)
69-
# ComponentArrayInterpreter(CA.ComponentVector(; P = θP,
70-
# Ms = CA.ComponentMatrix(
71-
# zeros(n_θM, n_site), first(CA.getaxes(θM)), CA.Shaped1DAxis((n_site,)))))
72-
# end
73-
# end
74-
interpreters = map(get_concrete,
75-
(;
76-
ϕg_ϕq = ComponentArrayInterpreter(ϕ),
77-
PMs = get_int_PMst_batch(hpints),
78-
ϕq = ComponentArrayInterpreter(ϕq)
79-
))
80-
(; ϕ, transPMs_batch, interpreters, get_transPMs, get_ca_int_PMs)
81-
end
35+
# function init_hybrid_params_old(θP::AbstractVector{FT}, θM::AbstractVector{FT},
36+
# cor_ends::NamedTuple, ϕg::AbstractVector{FT}, hpints::HybridProblemInterpreters;
37+
# transP = elementwise(identity), transM = elementwise(identity),
38+
# ϕunc0 = init_hybrid_ϕunc(cor_ends, zero(FT))) where {FT}
39+
# n_θP = length(θP)
40+
# n_θM = length(θM)
41+
# @assert cor_ends.P[end] == n_θP
42+
# @assert cor_ends.M[end] == n_θM
43+
# n_ϕg = length(ϕg)
44+
# # check translating parameters - can match length?
45+
# _ = Bijectors.inverse(transP)(θP)
46+
# _ = Bijectors.inverse(transM)(θM)
47+
# # TODO add and test θP
48+
# ϕq = update_μP_by_θP(ϕunc0, θP, transP)
49+
# ϕ = CA.ComponentVector(; ϕg, ϕq)
50+
# #
51+
# # get_transPMs = let transP = transP, transM = transM, n_θP = n_θP, n_θM = n_θM
52+
# # function get_transPMs_inner(n_site)
53+
# # transMs = ntuple(i -> transM, n_site)
54+
# # ranges = vcat(
55+
# # [1:n_θP], [(n_θP + i0 * n_θM) .+ (1:n_θM) for i0 in 0:(n_site - 1)])
56+
# # transPMs = Stacked((transP, transMs...), ranges)
57+
# # transPMs
58+
# # end
59+
# # end
60+
# get_transPMs = transPMs_batch = Val(Symbol("deprecated , use stack_ca_int(intPMs)"))
61+
# #transPMs_batch = get_transPMs(n_batch)
62+
# # ranges = (P = 1:n_θP, ϕg = n_θP .+ (1:n_ϕg), unc = (n_θP + n_ϕg) .+ (1:length(ϕunc0)))
63+
# # inv_trans_gu = Stacked(
64+
# # (inverse(transP), elementwise(identity), elementwise(identity)), values(ranges))
65+
# # ϕ = inv_trans_gu(CA.getdata(ϕt))
66+
# get_ca_int_PMs = Val(Symbol("deprecated , use get_int_PMst_site(HybridProblemInterpreters(prob; scenario))"))
67+
# # get_ca_int_PMs = let
68+
# # function get_ca_int_PMs_inner(n_site)
69+
# # ComponentArrayInterpreter(CA.ComponentVector(; P = θP,
70+
# # Ms = CA.ComponentMatrix(
71+
# # zeros(n_θM, n_site), first(CA.getaxes(θM)), CA.Shaped1DAxis((n_site,)))))
72+
# # end
73+
# # end
74+
# interpreters = map(get_concrete,
75+
# (;
76+
# ϕg_ϕq = ComponentArrayInterpreter(ϕ),
77+
# PMs = get_int_PMst_batch(hpints),
78+
# ϕq = ComponentArrayInterpreter(ϕq)
79+
# ))
80+
# (; ϕ, transPMs_batch, interpreters, get_transPMs, get_ca_int_PMs)
81+
# end
8282

8383
"""
8484
init_hybrid_ϕunc(cor_ends, ρ0=0f0; logσ2_ζP, coef_logσ2_ζMs, ρsP, ρsM)

‎test/runtests.jl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ const GROUP = get(ENV, "GROUP", "All") # defined in in CI.yml
1515
@time @safetestset "test_util_gpu" include("test_util_gpu.jl")
1616
#@safetestset "test" include("test/test_ComponentArrayInterpreter.jl")
1717
@time @safetestset "test_ComponentArrayInterpreter" include("test_ComponentArrayInterpreter.jl")
18-
#@safetestset "test" include("test/test_hybridprobleminterpreters.jl")
19-
@time @safetestset "test_hybridprobleminterpreters" include("test_hybridprobleminterpreters.jl")
2018
#@safetestset "test" include("test/test_PBMApplicator.jl")
2119
@time @safetestset "test_PBMApplicator" include("test_PBMApplicator.jl")
2220
#@safetestset "test" include("test/test_ModelApplicator.jl")

‎test/test_HybridProblem.jl‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,14 @@ test_with_flux_gpu = (scenario) -> begin
311311
n_sample_pred = 201
312312
(; y, θsP, θsMs) = predict_hvi(rng, probo; scenario = scenf, n_sample_pred);
313313
# to inspect correlations among θP and θMs construct ComponentVector
314-
hpints = HybridProblemInterpreters(prob; scenario)
314+
# TODO redo get_int_PMst_site
315+
# get_ca_int_PMs = let
316+
# function get_ca_int_PMs_inner(n_site)
317+
# ComponentArrayInterpreter(CA.ComponentVector(; P = θP,
318+
# Ms = CA.ComponentMatrix(
319+
# zeros(n_θM, n_site), first(CA.getaxes(θM)), CA.Shaped1DAxis((n_site,)))))
320+
# end
321+
# end
315322
int_mPMs = stack_ca_int(Val((n_sample_pred,)), get_int_PMst_site(hpints))
316323
θs = int_mPMs(CP.flatten_hybrid_pars(θsP, θsMs))
317324
mean_θ = CA.ComponentVector(vec(mean(CA.getdata(θs), dims=1)), last(CA.getaxes(θs)))

‎test/test_hybridprobleminterpreters.jl‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)