Skip to content

Commit

Permalink
Debug the issue with SBLS
Browse files Browse the repository at this point in the history
  • Loading branch information
amontoison committed Jan 9, 2025
1 parent d56eb41 commit b86579e
Show file tree
Hide file tree
Showing 12 changed files with 486 additions and 181 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
os: ['windows-latest']
arch: ['x64']
compiler: ['gcc']
version: ['11']
version: ['11', '12', '13']
int: ['32', '64']
steps:
- name: Checkout repository
Expand All @@ -38,7 +38,7 @@ jobs:
os: ['ubuntu-latest', 'macos-13']
arch: ['x64']
compiler: ['gcc']
version: ['13']
version: ['11', '12', '13']
int: ['32', '64']
steps:
- name: Checkout repository
Expand Down
110 changes: 55 additions & 55 deletions GALAHAD.jl/test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,60 @@ using Quadmath

@info("GALAHAD_INSTALLATION : $(GALAHAD.GALAHAD_INSTALLATION)")
# @info("GALAHAD_VERSION : $(version_galahad())")
include("test_structures.jl")
# include("test_structures.jl")

include("test_arc.jl")
include("test_bgo.jl")
include("test_blls.jl")
include("test_bllsb.jl")
# include("test_bnls.jl")
include("test_bqp.jl")
include("test_bqpb.jl")
include("test_bsc.jl")
include("test_ccqp.jl")
include("test_clls.jl")
include("test_convert.jl")
include("test_cqp.jl")
include("test_cro.jl")
include("test_dgo.jl")
include("test_dps.jl")
include("test_dqp.jl")
include("test_eqp.jl")
include("test_fdc.jl")
include("test_fit.jl")
include("test_glrt.jl")
include("test_gls.jl")
include("test_gltr.jl")
include("test_hash.jl")
include("test_ir.jl")
include("test_l2rt.jl")
include("test_lhs.jl")
include("test_llsr.jl")
include("test_llst.jl")
include("test_lms.jl")
include("test_lpa.jl")
include("test_lpb.jl")
include("test_lsqp.jl")
include("test_lsrt.jl")
include("test_lstr.jl")
include("test_nls.jl")
include("test_presolve.jl")
include("test_psls.jl")
include("test_qpa.jl")
include("test_qpb.jl")
include("test_roots.jl")
include("test_rpd.jl")
include("test_rqs.jl")
# include("test_arc.jl")
# include("test_bgo.jl")
# include("test_blls.jl")
# include("test_bllsb.jl")
# # include("test_bnls.jl")
# include("test_bqp.jl")
# include("test_bqpb.jl")
# include("test_bsc.jl")
# include("test_ccqp.jl")
# include("test_clls.jl")
# include("test_convert.jl")
# include("test_cqp.jl")
# include("test_cro.jl")
# include("test_dgo.jl")
# include("test_dps.jl")
# include("test_dqp.jl")
# include("test_eqp.jl")
# include("test_fdc.jl")
# include("test_fit.jl")
# include("test_glrt.jl")
# include("test_gls.jl")
# include("test_gltr.jl")
# include("test_hash.jl")
# include("test_ir.jl")
# include("test_l2rt.jl")
# include("test_lhs.jl")
# include("test_llsr.jl")
# include("test_llst.jl")
# include("test_lms.jl")
# include("test_lpa.jl")
# include("test_lpb.jl")
# include("test_lsqp.jl")
# include("test_lsrt.jl")
# include("test_lstr.jl")
# include("test_nls.jl")
# include("test_presolve.jl")
# include("test_psls.jl")
# include("test_qpa.jl")
# include("test_qpb.jl")
# include("test_roots.jl")
# include("test_rpd.jl")
# include("test_rqs.jl")
include("test_sbls.jl")
include("test_scu.jl")
include("test_sec.jl")
include("test_sha.jl")
include("test_sils.jl")
include("test_slls.jl")
include("test_sls.jl")
include("test_trb.jl")
include("test_trs.jl")
include("test_tru.jl")
include("test_ugo.jl")
include("test_uls.jl")
include("test_wcp.jl")
# include("test_scu.jl")
# include("test_sec.jl")
# include("test_sha.jl")
# include("test_sils.jl")
# include("test_slls.jl")
# include("test_sls.jl")
# include("test_trb.jl")
# include("test_trs.jl")
# include("test_tru.jl")
# include("test_ugo.jl")
# include("test_uls.jl")
# include("test_wcp.jl")
7 changes: 5 additions & 2 deletions GALAHAD.jl/test/test_sbls.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ function test_sbls(::Type{T}, ::Type{INT}) where {T,INT}
@reset control[].preconditioner = INT(2)
@reset control[].factorization = INT(2)
@reset control[].get_norm_residual = true
@reset control[].symmetric_linear_solver = galahad_linear_solver("sytr")
@reset control[].definite_linear_solver = galahad_linear_solver("sytr")

# Debug
@reset control[].print_level = INT(1)
@reset control[].sls_control.print_level = INT(1)

# Set user-defined control options
@reset control[].f_indexing = true # fortran sparse matrix indexing
Expand Down Expand Up @@ -166,6 +168,7 @@ function test_sbls(::Type{T}, ::Type{INT}) where {T,INT}
if status[] != 0
sbls_information(T, INT, data, inform, status)
@printf("%c: SBLS_solve factorization exit status = %1i\n", st, inform[].status)
@printf("inform.sls_inform.bad_alloc = %s\n", prod(Char.(inform[].sls_inform.bad_alloc)))
return 1
end

Expand Down
178 changes: 89 additions & 89 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -353,101 +353,101 @@ endif
subdir('bin')
subdir('include')
subdir('src/amd')
subdir('src/ampl')
subdir('src/arc')
subdir('src/band')
subdir('src/bgo')
subdir('src/blls')
subdir('src/bllsb')
# subdir('src/bnls')
subdir('src/bqp')
subdir('src/bqpb')
subdir('src/bsc')
subdir('src/buildspec')
subdir('src/ccqp')
subdir('src/cdqp')
subdir('src/check')
subdir('src/checkpoint')
subdir('src/clls')
# subdir('src/ampl')
# subdir('src/arc')
# subdir('src/band')
# subdir('src/bgo')
# subdir('src/blls')
# subdir('src/bllsb')
# # subdir('src/bnls')
# subdir('src/bqp')
# subdir('src/bqpb')
# subdir('src/bsc')
# subdir('src/buildspec')
# subdir('src/ccqp')
# subdir('src/cdqp')
# subdir('src/check')
# subdir('src/checkpoint')
# subdir('src/clls')
subdir('src/clock')
subdir('src/common')
subdir('src/convert')
# subdir('src/convert')
subdir('src/copyright')
subdir('src/cqp')
subdir('src/cro')
subdir('src/cutest_functions')
subdir('src/demo')
subdir('src/dgo')
subdir('src/dlp')
subdir('src/dps')
subdir('src/dqp')
# subdir('src/cqp')
# subdir('src/cro')
# subdir('src/cutest_functions')
# subdir('src/demo')
# subdir('src/dgo')
# subdir('src/dlp')
# subdir('src/dps')
# subdir('src/dqp')
subdir('src/dum')
subdir('src/eqp')
subdir('src/extend')
# subdir('src/eqp')
# subdir('src/extend')
subdir('src/external')
subdir('src/fdc')
subdir('src/fdh')
subdir('src/filter')
subdir('src/filtrane')
subdir('src/fit')
subdir('src/glrt')
# subdir('src/fdc')
# subdir('src/fdh')
# subdir('src/filter')
# subdir('src/filtrane')
# subdir('src/fit')
# subdir('src/glrt')
subdir('src/gls')
subdir('src/gltr')
subdir('src/hash')
subdir('src/icfs')
subdir('src/ir')
# subdir('src/gltr')
# subdir('src/hash')
# subdir('src/icfs')
# subdir('src/ir')
subdir('src/kinds')
subdir('src/l1qp')
subdir('src/l2rt')
subdir('src/lancelot')
subdir('src/lancelot_simple')
# subdir('src/l1qp')
# subdir('src/l2rt')
# subdir('src/lancelot')
# subdir('src/lancelot_simple')
subdir('src/lapack')
subdir('src/lhs')
subdir('src/lls')
subdir('src/llsr')
subdir('src/llst')
# subdir('src/lhs')
# subdir('src/lls')
# subdir('src/llsr')
# subdir('src/llst')
subdir('src/lms')
subdir('src/lmt')
subdir('src/lpa')
subdir('src/lpb')
subdir('src/lpqp')
subdir('src/lqr')
subdir('src/lqt')
subdir('src/lsp')
subdir('src/lsqp')
subdir('src/lsrb')
subdir('src/lsrt')
subdir('src/lstr')
# subdir('src/lpa')
# subdir('src/lpb')
# subdir('src/lpqp')
# subdir('src/lqr')
# subdir('src/lqt')
# subdir('src/lsp')
# subdir('src/lsqp')
# subdir('src/lsrb')
# subdir('src/lsrt')
# subdir('src/lstr')
subdir('src/metis')
subdir('src/miqr')
subdir('src/mop')
subdir('src/nlpt')
subdir('src/nls')
# subdir('src/miqr')
# subdir('src/mop')
# subdir('src/nlpt')
# subdir('src/nls')
subdir('src/norms')
subdir('src/oblivion')
subdir('src/opt')
subdir('src/presolve')
subdir('src/problem')
subdir('src/psls')
subdir('src/ptrans')
subdir('src/qp')
subdir('src/qpa')
subdir('src/qpb')
subdir('src/qpc')
subdir('src/qpd')
subdir('src/qpp')
# subdir('src/oblivion')
# subdir('src/opt')
# subdir('src/presolve')
# subdir('src/problem')
# subdir('src/psls')
# subdir('src/ptrans')
# subdir('src/qp')
# subdir('src/qpa')
# subdir('src/qpb')
# subdir('src/qpc')
# subdir('src/qpd')
# subdir('src/qpp')
subdir('src/qpt')
subdir('src/rand')
subdir('src/roots')
subdir('src/rpd')
subdir('src/rqs')
# subdir('src/rpd')
# subdir('src/rqs')
subdir('src/sbls')
subdir('src/scale')
subdir('src/scu')
subdir('src/sec')
subdir('src/sha')
# subdir('src/scale')
# subdir('src/scu')
# subdir('src/sec')
# subdir('src/sha')
subdir('src/sils')
subdir('src/slls')
# subdir('src/slls')
subdir('src/sls')
subdir('src/smt')
subdir('src/sort')
Expand All @@ -456,19 +456,19 @@ subdir('src/specfile')
subdir('src/spral')
subdir('src/ssids')
subdir('src/string')
subdir('src/svt')
# subdir('src/svt')
subdir('src/symbols')
subdir('src/tools')
subdir('src/trans')
subdir('src/trb')
subdir('src/trs')
subdir('src/tru')
subdir('src/ugo')
# subdir('src/tools')
# subdir('src/trans')
# subdir('src/trb')
# subdir('src/trs')
# subdir('src/tru')
# subdir('src/ugo')
subdir('src/uls')
subdir('src/userdata')
subdir('src/version')
subdir('src/warm')
subdir('src/wcp')
# subdir('src/userdata')
# subdir('src/version')
# subdir('src/warm')
# subdir('src/wcp')

# Libraries
if build_single
Expand Down
2 changes: 1 addition & 1 deletion src/glrt/C/glrtt.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ int main(void) {
} else {
control.unitm = true;
}
control.print_level = 1;
//control.print_level = 1;
glrt_import_control( &control, &data, &status );
// resolve with a larger weight ?
for( ipc_ new_weight=0; new_weight <= 1; new_weight++){
Expand Down
Loading

0 comments on commit b86579e

Please sign in to comment.