Skip to content

Commit 78a2913

Browse files
committed
Revert today's commits
1 parent a6d857a commit 78a2913

31 files changed

+42
-218
lines changed

.github/workflows/generate_website.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ on:
77
# If _any_ of the modified files match this filter, it will trigger this
88
# workflow
99
paths:
10-
- '**/*.jl'
10+
- '*.jl'
1111
- '*.toml'
1212
- 'ad.py'
13-
- '.github/workflows/generate_website.yml'
1413
pull_request:
1514
paths:
16-
- '**/*.jl'
15+
- '*.jl'
1716
- '*.toml'
1817
- 'ad.py'
19-
- '.github/workflows/generate_website.yml'
2018
workflow_dispatch:
2119

2220
permissions:

.github/workflows/refresh_website.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ on:
77
# If _all_ the modified files match this filter, it won't trigger this
88
# workflow
99
paths-ignore:
10-
- '**/*.jl'
10+
- '*.jl'
1111
- '*.toml'
1212
- 'ad.py'
13-
- '.github/workflows/refresh_website.yml'
1413
pull_request:
1514
paths:
16-
- '**/*.jl'
15+
- '*.jl'
1716
- '*.toml'
1817
- 'ad.py'
19-
- '.github/workflows/refresh_website.yml'
2018
workflow_dispatch:
2119

2220
permissions:

ad.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,8 @@ def run_ad(args):
8989
try:
9090
output = run_and_capture([*RUN_JULIA_COMMAND, "--run", model_key, adtype])
9191
result = try_float(output.splitlines()[-1])
92-
if not isinstance(result, float):
93-
print(f"Output: {output}")
9492
except sp.CalledProcessError as e:
95-
# Julia crashed
96-
print(f"Julia crashed when running {model_key} with {adtype}.")
97-
print(f"To reproduce, run: `julia --project=. main.jl --run {model_key} {adtype}`")
93+
print(f"Error running {model_key} with {adtype}. Output: {e.output}")
9894
result = "error"
9995

10096
print(f" ... {model_key} with {adtype} ==> {result}")

main.jl

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import Zygote
1313

1414
# AD backends to test.
1515
ADTYPES = Dict(
16-
"FiniteDifferences" => AutoFiniteDifferences(; fdm = central_fdm(5, 1)),
16+
"FiniteDifferences" => AutoFiniteDifferences(; fdm=central_fdm(5, 1)),
1717
"ForwardDiff" => AutoForwardDiff(),
18-
"ReverseDiff" => AutoReverseDiff(; compile = false),
19-
"ReverseDiffCompiled" => AutoReverseDiff(; compile = true),
20-
"Mooncake" => AutoMooncake(; config = nothing),
21-
"EnzymeForward" => AutoEnzyme(; mode = set_runtime_activity(Forward, true)),
22-
"EnzymeReverse" => AutoEnzyme(; mode = set_runtime_activity(Reverse, true)),
18+
"ReverseDiff" => AutoReverseDiff(; compile=false),
19+
"ReverseDiffCompiled" => AutoReverseDiff(; compile=true),
20+
"Mooncake" => AutoMooncake(; config=nothing),
21+
"EnzymeForward" => AutoEnzyme(; mode=set_runtime_activity(Forward, true)),
22+
"EnzymeReverse" => AutoEnzyme(; mode=set_runtime_activity(Reverse, true)),
2323
"Zygote" => AutoZygote(),
2424
)
2525

@@ -35,7 +35,7 @@ end
3535
# These imports tend to get used a lot in models
3636
using DynamicPPL: @model, to_submodel
3737
using Distributions
38-
using LinearAlgebra
38+
using LinearAlgebra: I
3939

4040
include("models/assume_dirichlet.jl")
4141
include("models/assume_lkjcholu.jl")
@@ -44,21 +44,8 @@ include("models/assume_normal.jl")
4444
include("models/assume_submodel.jl")
4545
include("models/assume_wishart.jl")
4646
include("models/control_flow.jl")
47-
include("models/demo_assume_dot_observe_literal.jl")
48-
include("models/demo_assume_dot_observe.jl")
49-
include("models/demo_assume_index_observe.jl")
50-
include("models/demo_assume_matrix_observe_matrix_index.jl")
51-
include("models/demo_assume_multivariate_observe_literal.jl")
52-
include("models/demo_assume_multivariate_observe.jl")
53-
include("models/demo_assume_observe_literal.jl")
54-
include("models/demo_assume_submodel_observe_index_literal.jl")
55-
include("models/demo_dot_assume_observe_index_literal.jl")
56-
include("models/demo_dot_assume_observe_index.jl")
57-
include("models/demo_dot_assume_observe_matrix_index.jl")
58-
include("models/demo_dot_assume_observe_submodel.jl")
59-
include("models/demo_dot_assume_observe.jl")
47+
include("models/dot_assume_observe_index.jl")
6048
include("models/dot_assume.jl")
61-
include("models/demo_dot_assume_observe.jl")
6249
include("models/dot_observe.jl")
6350
include("models/dynamic_constraint.jl")
6451
include("models/multiple_constraints_same_var.jl")
@@ -87,9 +74,9 @@ elseif length(ARGS) == 3 && ARGS[1] == "--run"
8774
# https://github.com/TuringLang/ADTests/issues/4
8875
vi = DynamicPPL.unflatten(VarInfo(model), [0.5, -0.5])
8976
params = [-0.5, 0.5]
90-
result = run_ad(model, adtype; varinfo = vi, params = params, benchmark = true)
77+
result = run_ad(model, adtype; varinfo=vi, params=params, benchmark=true)
9178
else
92-
result = run_ad(model, adtype; benchmark = true)
79+
result = run_ad(model, adtype; benchmark=true)
9380
end
9481
# If reached here - nothing went wrong
9582
@printf("%.3f", result.time_vs_primal)

models/demo_assume_dot_observe.jl

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

models/demo_assume_dot_observe_literal.jl

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

models/demo_assume_index_observe.jl

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

models/demo_assume_matrix_observe_matrix_index.jl

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

models/demo_assume_multivariate_observe.jl

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

models/demo_assume_multivariate_observe_literal.jl

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

0 commit comments

Comments
 (0)