fix tests

Author: marius311

.github/workflows/runtests.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.6', '1.7', '~1.8.0-0']
+        julia-version: ['1.6', '1.7', '1.8']
         os: [ubuntu-latest]
         provider: ['mkl', 'fftw']
       fail-fast: false

src/CMBLensing.jl

@@ -84,7 +84,7 @@ import Random: randn!
 export
     @⌛, @show⌛, @ismain, @namedtuple, @repeated, @unpack, @cpu!, @gpu!, @cu!, @fwdmodel, 
     animate, argmaxf_lnP, argmaxf_logpdf, AzFourier, BandPassOp, BaseDataSet, batch, batch_index, batch_length, 
-    batch_map, batch_pmap, BlockDiagEquiRect, beamCℓs, CachedLenseFlow, camb, cov_to_Cℓ, cpu, Cℓ_2D, 
+    batch_map, batch_pmap, BlockDiagEquiRect, beamCℓs, cache, CachedLenseFlow, camb, cov_to_Cℓ, cpu, Cℓ_2D, 
     Cℓ_to_Cov, DataSet, DerivBasis, diag, Diagonal, DiagOp, dot, EBFourier, EBMap, expnorm, 
     Field, FieldArray, fieldinfo, FieldMatrix, FieldOrOpArray, FieldOrOpMatrix, FieldOrOpRowVector,
     FieldOrOpVector, FieldRowVector, FieldTuple, FieldVector, FieldVector,

src/dataset.jl

@@ -329,7 +329,7 @@ function load_sim(;
 
     if Nbatch != nothing
         d = ds.d *= batch(ones(Int,Nbatch))
-        ds.L = alloc_cache(L(ϕ*batch(ones(Int,Nbatch))), ds.d)
+        ds.L = precompute!!(L(ϕ*batch(ones(Int,Nbatch))), ds.d)
     end
 
     return (;f, f̃, ϕ, d, ds, ds₀=ds(), Cℓ, proj)

src/deprecated.jl

@@ -1,8 +1,8 @@
 
 ### argmaxf_lnP
 
-argmaxf_lnP(ϕ::Field,    ds::DataSet; kwargs...) = argmaxf_lnP(cache(ds.L(ϕ),ds.d), (;), ds; kwargs...)
-argmaxf_lnP(ϕ::Field, θ, ds::DataSet; kwargs...) = argmaxf_lnP(cache(ds.L(ϕ),ds.d),   θ, ds; kwargs...)
+argmaxf_lnP(ϕ::Field,    ds::DataSet; kwargs...) = argmaxf_lnP(precompute!!(ds.L(ϕ),ds.d), (;), ds; kwargs...)
+argmaxf_lnP(ϕ::Field, θ, ds::DataSet; kwargs...) = argmaxf_lnP(precompute!!(ds.L(ϕ),ds.d),   θ, ds; kwargs...)
 
 function argmaxf_lnP(
     Lϕ, 
@@ -107,3 +107,9 @@ Base.@deprecate white_noise(f::Field, rng::AbstractRNG) randn!(rng, f)
 ### Cℓs
 
 Base.@deprecate InterpolatedCℓs(args...) Cℓs(args...)
+
+
+### cache
+
+Base.@deprecate cache(L, f) precompute!!(L, f)
+Base.@deprecate cache!(L, f) precompute!!(L, f)

src/lenseflow.jl

@@ -2,7 +2,7 @@
 abstract type LenseFlowOp{S<:ODESolver,T} <: FlowOpWithAdjoint{T} end
 
 # `L = LenseFlow(ϕ)` just creates a wrapper holding ϕ. Then when you do `L*f` or
-# `cache(L,f)` we create a CachedLenseFlow object which holds all the
+# `precompute!!(L,f)` we create a CachedLenseFlow object which holds all the
 # precomputed quantities and preallocated memory needed to do the lense.
 
 """

test/runtests.jl

@@ -540,7 +540,7 @@ end
                 ## S0
                 Cf = maybegpu(Cℓ_to_Cov(:I, proj, Cℓ.TT))
                 @test (f = @inferred simulate(rng,Cf)) isa FlatS0
-                @test (Lϕ = cache(LenseFlow(ϕ),f)) isa CachedLenseFlow
+                @test (Lϕ = precompute!!(LenseFlow(ϕ),f)) isa CachedLenseFlow
                 @test (@inferred Lϕ*f) isa FlatS0
                 # adjoints
                 f,g = simulate(rng,Cf),simulate(rng,Cf)
@@ -552,7 +552,7 @@ end
                 # S2 lensing
                 Cf = maybegpu(Cℓ_to_Cov(:P, proj, Cℓ.EE, Cℓ.BB))
                 @test (f = @inferred simulate(rng,Cf)) isa FlatS2
-                @test (Lϕ = cache(LenseFlow(ϕ),f)) isa CachedLenseFlow
+                @test (Lϕ = precompute!!(LenseFlow(ϕ),f)) isa CachedLenseFlow
                 @test (@inferred Lϕ*f) isa FlatS2
                 # adjoints
                 f,g = simulate(rng,Cf),simulate(rng,Cf)
@@ -574,7 +574,7 @@ end
 @testset "Posterior" begin
 
     Cℓ = camb()
-    L = LenseFlow{RK4Solver{7}}
+    L = LenseFlow(7)
     T = Float64
 
     @testset "Nside = $Nside" for Nside in Nsides_big