Skip to content

Commit

Permalink
240312.112839.HKT revise profile_npt.yml, fix failure of cirrus fortr…
Browse files Browse the repository at this point in the history
…an test
  • Loading branch information
zaikunzhang committed Mar 12, 2024
1 parent 99b9f77 commit c64a547
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ task:
elif [ "$(uname)" == "Darwin" ] ; then
brew update && brew upgrade && brew install gcc git make cmake
elif grep -qi "fedora" /etc/os-release ; then
dnf upgrade -y && dnf -y install gcc git make cmake gfortran gdb
dnf upgrade -y && dnf install -y gcc git make cmake gfortran gdb libasan libubsan
#elif grep -qi "alpine" /etc/os-release ; then
#apk update && apk upgrade && apk add musl-dev gcc git make cmake gfortran gdb
else
Expand Down Expand Up @@ -126,7 +126,7 @@ task:
SOLVER=cobyla
fi
make clean && make gtest_i2.$SOLVER
$MK clean && $MK gtest_i2.$SOLVER
on_failure:
9 changes: 9 additions & 0 deletions .github/workflows/profile_npt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,19 @@ jobs:
options.npt = @(n) ${{ matrix.npt }};
if strcmp('${{ matrix.solver }}', 'lincoa')
if ismember('${{ matrix.npt }}', {'n*sqrt(n)', '0.25*n*n', '0.5*(n+1)*(n+2)'})
options.blacklist = {'AGG', 'SSEBLIN', 'ANTWERP', 'AVION2', 'DALLASS', 'HIMMELBI', 'SPANHYD', 'ARGLALE', 'GMNCASE3', 'GMNCASE2', 'LEVYMONT'};
end
prof('${{ matrix.solver }}', '${{ matrix.dim }}', 'l', '${{ matrix.competitor }}', options);
elseif strcmp('${{ matrix.solver }}', 'bobyqa')
if ismember('${{ matrix.npt }}', {'n*sqrt(n)', '0.25*n*n', '0.5*(n+1)*(n+2)'})
options.blacklist = {'HOLMES', 'CHEBYQAD'};
end
prof('${{ matrix.solver }}', '${{ matrix.dim }}', 'b', '${{ matrix.competitor }}', options);
else
if ismember('${{ matrix.npt }}', {'n*sqrt(n)', '0.25*n*n', '0.5*(n+1)*(n+2)'})
options.blacklist = {'ARGLINB', 'ARGLINC', 'ERRINROS', 'BA-L1LS', 'BA-L1SPLS', 'LUKSAN11LS', 'LUKSAN13LS', 'LUKSAN16LS', 'CHNROSNB', 'SPIN2LS'};
end
prof('${{ matrix.solver }}', '${{ matrix.dim }}', '${{ matrix.competitor }}', options);
end
Expand Down
4 changes: 2 additions & 2 deletions fortran/tests/makefiles/Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ GFORT := $(GFORT) $(GFSTD) -fall-intrinsics -frecursive \
$(FSAN) \
-fPIC -fimplicit-none -fbacktrace -fcheck=all \
-ftrapv
#-finit-real=nan -finit-integer=-9999999 \ # This will hide some warnings on uninitialized variables.
#-finit-real=nan -finit-integer=-9999999 # This will hide some warnings on uninitialized variables.
#-Wrealloc-lhs -Wrealloc-lhs-all

gtest_i2_r4_d1_tst_c gtest_i4_r4_d1_tst_c gtest_i8_r4_d1_tst_c gtest_i2_r4_d0_tst_c gtest_i4_r4_d0_tst_c gtest_i8_r4_d0_tst_c: \
Expand Down Expand Up @@ -886,7 +886,7 @@ $(TESTS_C) $(TESTS_INT_C):
| grep -v "common/preproc.f90:[0-9]*:.*unit_memo.*may be used uninitialized" \
| grep -v "Compiling file\|Module subprogram name" \
| grep -v "An allocatable array function '.*' is an extended feature" \
| grep -v "An allocatable dummy array\ '.*' is an extended feature" \
| grep -v "An allocatable dummy array '.*' is an extended feature" \
| grep -v "WARNING -- When --chk x is specified, it must be used to compile all source files of a program" \
| grep -v "0 Errors, 0 Warnings" \
| grep -v "Encountered 0 errors, 0 warnings, [0-9]* information.* in file" \
Expand Down
2 changes: 1 addition & 1 deletion matlab/mex_gateways/tests/makefiles/Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ GFORT := $(GFORT) -Wall -Wextra -pedantic -fmax-errors=1 -Wampersand -Wconversio
-Wmaybe-uninitialized -Wsurprising -Waliasing -Wimplicit-interface -Wimplicit-procedure \
-Wintrinsics-std -Wunderflow -Wuse-without-only -Wunused-parameter \
-fPIC -fimplicit-none -fbacktrace -fcheck=all
#-finit-real=nan -finit-integer=-9999999 \ # This will hide some warnings on uninitialized variables.
#-finit-real=nan -finit-integer=-9999999 # This will hide some warnings on uninitialized variables.
#-Wrealloc-lhs -Wrealloc-lhs-all

gtest_i2_r4_d1_tst gtest_i4_r4_d1_tst gtest_i8_r4_d1_tst gtest_i2_r4_d0_tst gtest_i4_r4_d0_tst gtest_i8_r4_d0_tst: \
Expand Down

0 comments on commit c64a547

Please sign in to comment.