Skip to content

Fix td3.json and td4 json config files #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 19, 2022
Merged

Fix td3.json and td4 json config files #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbbe98b
Fix td3.json to follow the changed json config format
jerhard Jan 13, 2022
6d8d1a8
Fix td4.json
jerhard Jan 13, 2022
78806c1
Update remaining defs to match new schema.
vesalvojdani Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions index/conf/td3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,17 @@
"dbg": {
"debug": false
},
"exp": {
"solver": {
"td3": {
"restart": {
"wpoint": {
"enabled": false,
"once": true
}
},
"abort": false,
"abort-verify": false
}
"solver": "td3",
"solvers": {
"td3": {
"restart": {
"wpoint": {
"enabled": false,
"once": true
}
},
"abort": false,
"abort-verify": false
}
},
"incremental": {
Expand Down
23 changes: 11 additions & 12 deletions index/conf/td4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,17 @@
"dbg": {
"debug": false
},
"exp": {
"solver": {
"td3": {
"restart": {
"wpoint": {
"enabled": true,
"once": false
}
},
"abort": false,
"abort-verify": false
}
"solver": "td3",
"solvers": {
"td3": {
"restart": {
"wpoint": {
"enabled": true,
"once": false
}
},
"abort": false,
"abort-verify": false
}
},
"incremental": {
Expand Down
4 changes: 2 additions & 2 deletions index/defs/performance.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ incremental: true
FromScratch:
Restart: --enable incremental.restart.sided.enabled
Reluctant: --enable incremental.restart.sided.enabled --enable incremental.reluctant.on
Abort: --enable incremental.restart.sided.enabled --enable exp.solver.td3.abort
Both: --enable incremental.restart.sided.enabled --enable incremental.reluctant.on --enable exp.solver.td3.abort
Abort: --enable incremental.restart.sided.enabled --enable solvers.td3.abort
Both: --enable incremental.restart.sided.enabled --enable incremental.reluctant.on --enable solvers.td3.abort
4 changes: 2 additions & 2 deletions index/defs/precision.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ incremental: true
FromScratch:
Incremental:
RestartGlob: --enable incremental.restart.sided.enabled
RestartLocs: --enable exp.solver.td3.restart.wpoint.enabled
RestartBoth: --enable exp.solver.td3.restart.wpoint.enabled --enable incremental.restart.sided.enabled
RestartLocs: --enable solvers.td3.restart.wpoint.enabled
RestartBoth: --enable solvers.td3.restart.wpoint.enabled --enable incremental.restart.sided.enabled
4 changes: 2 additions & 2 deletions index/defs/restarting.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ compare: true
incremental: true

FromScratch:
Incremental: --disable exp.solver.td3.restart.wpoint.enabled
RestartGlob: --disable exp.solver.td3.restart.wpoint.enabled --enable incremental.restart.sided.enabled
Incremental: --disable solvers.td3.restart.wpoint.enabled
RestartGlob: --disable solvers.td3.restart.wpoint.enabled --enable incremental.restart.sided.enabled
RestartLocs:
RestartBoth: --enable incremental.restart.sided.enabled
10 changes: 5 additions & 5 deletions index/defs/td3and4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ compare: true
incremental: false

TD3:
TD3-Abort: --enable exp.solver.td3.abort
TD3-Verify: --enable exp.solver.td3.abort --enable exp.solver.td3.abort-verify
TD4: --enable exp.solver.td3.restart.wpoint.enabled --disable exp.solver.td3.restart.wpoint.once
TD4-Abort: --enable exp.solver.td3.restart.wpoint.enabled --disable exp.solver.td3.restart.wpoint.once --enable exp.solver.td3.abort
TD4-Verify: --enable exp.solver.td3.restart.wpoint.enabled --disable exp.solver.td3.restart.wpoint.once --enable exp.solver.td3.abort --enable exp.solver.td3.abort-verify
TD3-Abort: --enable solvers.td3.abort
TD3-Verify: --enable solvers.td3.abort --enable solvers.td3.abort-verify
TD4: --enable solvers.td3.restart.wpoint.enabled --disable solvers.td3.restart.wpoint.once
TD4-Abort: --enable solvers.td3.restart.wpoint.enabled --disable solvers.td3.restart.wpoint.once --enable solvers.td3.abort
TD4-Verify: --enable solvers.td3.restart.wpoint.enabled --disable solvers.td3.restart.wpoint.once --enable solvers.td3.abort --enable solvers.td3.abort-verify
2 changes: 1 addition & 1 deletion update_bench_incremental.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def print_res (i)

if ARGV[2].nil?
puts 'You must run command with timout, conf, and at least one benchmark set, e.g.:'
puts './update_bench_incremental.rb 60 index/defs/interactive.yaml index/sets/posix.yaml'
puts './update_bench_incremental.rb 60 index/defs/incremental.yaml index/sets/posix.yaml'
exit 1
end

Expand Down