Skip to content

Commit 5716511

Browse files
committed
Revert "Refactor take2 (#238)"
This reverts commit 9d7ac6b.
1 parent 9d7ac6b commit 5716511

31 files changed

Lines changed: 1204 additions & 2267 deletions

β€ŽAGENTS.mdβ€Ž

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@ like `[0]` (present), `[1]` (future), `[-1]` (past), and `[x]` (shock).
3030

3131
## Tests
3232

33-
Before running tests, activate the test environment and instantiate dependencies:
34-
35-
```julia
36-
using Pkg
37-
Pkg.activate("test")
38-
Pkg.instantiate()
39-
```
40-
4133
Tests are organized by test sets specified via `TEST_SET`:
4234

4335
```bash

β€ŽAGENT_PROGRESS.mdβ€Ž

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

β€ŽCLAUDE.mdβ€Ž

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ MacroModelling.jl is a Julia package for developing and solving Dynamic Stochast
1313

1414
### Running Tests
1515

16-
Before running tests, activate the test environment and instantiate dependencies:
17-
18-
```julia
19-
using Pkg
20-
Pkg.activate("test")
21-
Pkg.instantiate()
22-
```
23-
2416
Tests are organized by test sets specified via the `TEST_SET` environment variable:
2517

2618
```bash

β€Žbenchmark/benchmarks.jlβ€Ž

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ function run_benchmarks!(𝓂::β„³, SUITE::BenchmarkGroup)
4343

4444
SUITE[𝓂.model_name]["qme"] = BenchmarkGroup()
4545

46-
sol, qme_sol, solved = calculate_first_order_solution(βˆ‡β‚, 𝓂.caches; opts = merge_calculation_options(quadratic_matrix_equation_algorithm = :schur))
46+
sol, qme_sol, solved = calculate_first_order_solution(βˆ‡β‚; T = 𝓂.timings, opts = merge_calculation_options(quadratic_matrix_equation_algorithm = :schur))
4747

4848
clear_solution_caches!(𝓂, :first_order)
4949

50-
SUITE[𝓂.model_name]["qme"]["schur"] = @benchmarkable calculate_first_order_solution($βˆ‡β‚, $𝓂.caches; opts = merge_calculation_options(quadratic_matrix_equation_algorithm = :schur)) setup = clear_solution_caches!($𝓂, :first_order)
50+
SUITE[𝓂.model_name]["qme"]["schur"] = @benchmarkable calculate_first_order_solution($βˆ‡β‚; T = $𝓂.timings, opts = merge_calculation_options(quadratic_matrix_equation_algorithm = :schur)) setup = clear_solution_caches!($𝓂, :first_order)
5151

52-
SUITE[𝓂.model_name]["qme"]["doubling"] = @benchmarkable calculate_first_order_solution($βˆ‡β‚, $𝓂.caches; opts = merge_calculation_options(quadratic_matrix_equation_algorithm = :doubling)) setup = clear_solution_caches!($𝓂, :first_order)
52+
SUITE[𝓂.model_name]["qme"]["doubling"] = @benchmarkable calculate_first_order_solution($βˆ‡β‚; T = $𝓂.timings, opts = merge_calculation_options(quadratic_matrix_equation_algorithm = :doubling)) setup = clear_solution_caches!($𝓂, :first_order)
5353

5454

55-
A = @views sol[:, 1:𝓂.caches.timings.nPast_not_future_and_mixed] * β„’.diagm(ones(𝓂.caches.timings.nVars))[𝓂.caches.timings.past_not_future_and_mixed_idx,:]
55+
A = @views sol[:, 1:𝓂.timings.nPast_not_future_and_mixed] * β„’.diagm(ones(𝓂.timings.nVars))[𝓂.timings.past_not_future_and_mixed_idx,:]
5656

57-
C = @views sol[:, 𝓂.caches.timings.nPast_not_future_and_mixed+1:end]
57+
C = @views sol[:, 𝓂.timings.nPast_not_future_and_mixed+1:end]
5858

5959
CC = C * C'
6060

@@ -103,7 +103,7 @@ run_benchmarks!(Smets_Wouters_2007, SUITE)
103103
# end
104104
# end
105105

106-
# If a caches of tuned parameters already exists, use it, otherwise, tune and caches
106+
# If a cache of tuned parameters already exists, use it, otherwise, tune and cache
107107
# the benchmark parameters. Reusing cached parameters is faster and more reliable
108108
# than re-tuning `SUITE` every time the file is included.
109109
# paramspath = joinpath(dirname(@__FILE__), "params.json")

0 commit comments

Comments
Β (0)