Skip to content

Commit 97f760a

Browse files
committed
Add an option test_counters
1 parent 6ca54c8 commit 97f760a

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
with:
4545
version: ${{ matrix.version }}
4646
arch: ${{ matrix.arch }}
47-
- uses: actions/cache@v1
47+
- uses: actions/cache@v4
4848
env:
4949
cache-name: cache-artifacts
5050
with:

src/nlp/consistency.jl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ function consistent_nlps(
2121
test_slack = true,
2222
test_qn = true,
2323
test_derivative = true,
24+
test_counters = true,
2425
rtol = 1.0e-8,
2526
)
26-
consistent_counters(nlps, linear_api = linear_api, reimplemented = reimplemented)
27+
test_counters && consistent_counters(nlps, linear_api = linear_api, reimplemented = reimplemented)
2728
test_meta && consistent_meta(nlps, rtol = rtol)
2829
consistent_functions(nlps, linear_api = linear_api, rtol = rtol, exclude = exclude)
29-
consistent_counters(nlps, linear_api = linear_api, reimplemented = reimplemented)
30+
test_counters && consistent_counters(nlps, linear_api = linear_api, reimplemented = reimplemented)
3031
for nlp in nlps
3132
reset!(nlp)
3233
end
33-
consistent_counters(nlps, linear_api = linear_api, reimplemented = reimplemented)
34+
test_counters && consistent_counters(nlps, linear_api = linear_api, reimplemented = reimplemented)
3435
if test_derivative
3536
for nlp in nlps
3637
@test length(gradient_check(nlp)) == 0
@@ -51,7 +52,7 @@ function consistent_nlps(
5152
linear_api = linear_api,
5253
exclude = [hess, hess_coord, hprod, jth_hess, jth_hess_coord, jth_hprod, ghjvprod] exclude,
5354
)
54-
consistent_counters([nlps; qnmodels], linear_api = linear_api, reimplemented = reimplemented)
55+
test_counters && consistent_counters([nlps; qnmodels], linear_api = linear_api, reimplemented = reimplemented)
5556
end
5657

5758
if test_slack && has_inequalities(nlps[1])
@@ -62,7 +63,7 @@ function consistent_nlps(
6263
linear_api = linear_api,
6364
exclude = [jth_hess, jth_hess_coord, jth_hprod] exclude,
6465
)
65-
consistent_counters(slack_nlps, linear_api = linear_api, reimplemented = reimplemented)
66+
test_counters && consistent_counters(slack_nlps, linear_api = linear_api, reimplemented = reimplemented)
6667
end
6768
end
6869

@@ -95,7 +96,7 @@ function consistent_counters(nlps; linear_api = false, reimplemented = String[])
9596
end
9697
end
9798
end
98-
if linear_api
99+
if linear_api && test_counters
99100
V = [sum_counters(nlp) for nlp in nlps]
100101
@test (reimplemented != []) | all(V .== V[1])
101102
for field in setdiff(collect(fieldnames(Counters)), check_fields)

src/nlp/coord-memory.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export coord_memory_nlp
22

33
"""
4-
coord_memory_nlp(nlp; exclude = [])
4+
coord_memory_nlp(nlp; linear_api = false, exclude = [])
55
66
Check that the allocated memory for in place coord methods is
77
sufficiently smaller than their allocating counter parts.

src/nls/consistency.jl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ function consistent_nlss(
2020
linear_api = false,
2121
test_slack = true,
2222
test_ff = true,
23+
test_counters = true,
2324
)
2425
consistent_nls_counters(nlss)
25-
consistent_counters(nlss, linear_api = linear_api)
26+
test_counters && consistent_counters(nlss, linear_api = linear_api)
2627
consistent_nls_functions(nlss, exclude = exclude)
2728
consistent_nls_counters(nlss)
28-
consistent_counters(nlss, linear_api = linear_api)
29+
test_counters && consistent_counters(nlss, linear_api = linear_api)
2930
for nls in nlss
3031
reset!(nls)
3132
end
@@ -35,8 +36,8 @@ function consistent_nlss(
3536
reset!.(nlss)
3637
slack_nlss = SlackNLSModel.(nlss)
3738
consistent_nls_functions(slack_nlss, exclude = exclude)
38-
consistent_nls_counters(slack_nlss)
39-
consistent_counters(slack_nlss, linear_api = linear_api)
39+
test_counters && consistent_nls_counters(slack_nlss)
40+
test_counters && consistent_counters(slack_nlss, linear_api = linear_api)
4041
consistent_functions(
4142
slack_nlss,
4243
linear_api = linear_api,
@@ -48,8 +49,8 @@ function consistent_nlss(
4849
reset!.(nlss)
4950
ff_nlss = FeasibilityFormNLS.(nlss)
5051
consistent_nls_functions(ff_nlss, exclude = exclude)
51-
consistent_nls_counters(ff_nlss)
52-
consistent_counters(ff_nlss, linear_api = false)
52+
test_counters && consistent_nls_counters(ff_nlss)
53+
test_counters && consistent_counters(ff_nlss, linear_api = false)
5354
consistent_functions(
5455
ff_nlss,
5556
linear_api = false,

0 commit comments

Comments
 (0)