Skip to content

fix local testing, fix nlopt constrained tests #176

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 10 commits into from
Mar 17, 2024
Merged

fix local testing, fix nlopt constrained tests #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee443ff
Merge pull request #147 from StructuralEquationModels/main
Maximilian-Stefan-Ernst Jun 14, 2023
9a23bbf
Merge branch 'main' into devel
aaronpeikert Jan 9, 2024
2f7b3df
Merge pull request #174 from StructuralEquationModels/main
Maximilian-Stefan-Ernst Mar 17, 2024
a06a008
Merge pull request #175 from StructuralEquationModels/main
Maximilian-Stefan-Ernst Mar 17, 2024
271dfba
add environment variable to CI to see if we are on CI
Maximilian-Stefan-Ernst Mar 17, 2024
989ebf6
switch to xtol instead of ftol for constrained NLopt test
Maximilian-Stefan-Ernst Mar 17, 2024
671c722
fix local testing
Maximilian-Stefan-Ernst Mar 17, 2024
2c90149
higher xtol for testing on macos
Maximilian-Stefan-Ernst Mar 17, 2024
f0fe827
add tolerance for inequality constraint and set global instead of loc…
Maximilian-Stefan-Ernst Mar 17, 2024
6544ee9
stop testing on 1.9
Maximilian-Stefan-Ernst Mar 17, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
env:
JULIA_ON_CI: true
JULIA_NUM_THREADS: 8
JULIA_EXTENDED_TESTS: false
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CI_ecosystem.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
env:
JULIA_ON_CI: true
JULIA_NUM_THREADS: 8
JULIA_EXTENDED_TESTS: true
strategy:
fail-fast: false
matrix:
version:
- '1'
- '1.9'
os:
- ubuntu-latest
- macos-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CI_extended.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
env:
JULIA_ON_CI: true
JULIA_NUM_THREADS: 8
JULIA_EXTENDED_TESTS: true
strategy:
fail-fast: false
matrix:
version:
- '1'
- '1.9'
os:
- ubuntu-latest
- macos-latest
Expand Down
8 changes: 3 additions & 5 deletions test/examples/political_democracy/constraints.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@ end
constrained_optimizer = SemOptimizerNLopt(;
algorithm = :AUGLAG,
local_algorithm = :LD_LBFGS,
local_options = Dict(
:ftol_rel => 1e-6
),
options = Dict(:xtol_rel => 1e-4),
# equality_constraints = NLoptConstraint(;f = eq_constraint, tol = 1e-14),
inequality_constraints = NLoptConstraint(;f = ineq_constraint, tol = 0.0),
inequality_constraints = NLoptConstraint(;f = ineq_constraint, tol = 1e-8),
)

model_ml_constrained = Sem(
Expand Down Expand Up @@ -59,7 +57,7 @@ end

@testset "ml_solution_constrained" begin
solution_constrained = sem_fit(model_ml_constrained)
@test solution_constrained.solution[31]*solution_constrained.solution[30] >= 0.6
@test solution_constrained.solution[31]*solution_constrained.solution[30] >= (0.6-1e-8)
@test all(abs.(solution_constrained.solution) .< 10)
@test solution_constrained.optimization_result.result[3] == :FTOL_REACHED skip=true
@test abs(solution_constrained.minimum - 21.21) < 0.01
Expand Down
6 changes: 3 additions & 3 deletions test/examples/political_democracy/political_democracy.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ semoptimizer = SemOptimizerOptim
semoptimizer = SemOptimizerNLopt
@testset "RAMMatrices | constructor | NLopt" begin include("constructor.jl") end

if ENV["JULIA_EXTENDED_TESTS"] == "true"
if !haskey(ENV, "JULIA_EXTENDED_TESTS") || ENV["JULIA_EXTENDED_TESTS"] == "true"
semoptimizer = SemOptimizerOptim
@testset "RAMMatrices | parts | Optim" begin include("by_parts.jl") end
semoptimizer = SemOptimizerNLopt
Expand All @@ -121,7 +121,7 @@ semoptimizer = SemOptimizerOptim
semoptimizer = SemOptimizerNLopt
@testset "RAMMatrices → ParameterTable | constructor | NLopt" begin include("constructor.jl") end

if ENV["JULIA_EXTENDED_TESTS"] == "true"
if !haskey(ENV, "JULIA_EXTENDED_TESTS") || ENV["JULIA_EXTENDED_TESTS"] == "true"
semoptimizer = SemOptimizerOptim
@testset "RAMMatrices → ParameterTable | parts | Optim" begin include("by_parts.jl") end
semoptimizer = SemOptimizerNLopt
Expand Down Expand Up @@ -205,7 +205,7 @@ semoptimizer = SemOptimizerOptim
semoptimizer = SemOptimizerNLopt
@testset "Graph → ParameterTable | constructor | NLopt" begin include("constructor.jl") end

if ENV["JULIA_EXTENDED_TESTS"] == "true"
if !haskey(ENV, "JULIA_EXTENDED_TESTS") || ENV["JULIA_EXTENDED_TESTS"] == "true"
semoptimizer = SemOptimizerOptim
@testset "Graph → ParameterTable | parts | Optim" begin include("by_parts.jl") end
semoptimizer = SemOptimizerNLopt
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ using Test, SafeTestsets
@time @safetestset "Unit Tests" begin include("unit_tests/unit_tests.jl") end
@time @safetestset "Example Models" begin include("examples/examples.jl") end

if ENV["JULIA_EXTENDED_TESTS"] == "true"
if !haskey(ENV, "JULIA_EXTENDED_TESTS") || ENV["JULIA_EXTENDED_TESTS"] == "true"

end
6 changes: 4 additions & 2 deletions test/unit_tests/multithreading.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using Test

@testset "multithreading_enabled" begin
@test Threads.nthreads() == 8
if haskey(ENV, "JULIA_ON_CI")
@testset "multithreading_enabled" begin
@test Threads.nthreads() == 8
end
end