Skip to content

Fixes for the NAG Fortran compiler #951

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 4 commits into from
Nov 29, 2023
Merged

Fixes for the NAG Fortran compiler #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26db2da
Fixed Fortran compiler flags check for nagfor compiler and usage in C…
ACSimon33 Nov 29, 2023
8c54a57
Replaced non-standard `IMAG` function with its standard counterpart `…
ACSimon33 Nov 29, 2023
c69a96e
Added missing comma in `FORMAT` expression
ACSimon33 Nov 29, 2023
2a0aea9
Added missing comma in `FORMAT` expression
ACSimon33 Nov 29, 2023
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
4 changes: 4 additions & 0 deletions CBLAS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ if(CMAKE_Fortran_COMPILER)
FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h
MACRO_NAMESPACE "F77_"
SYMBOL_NAMESPACE "F77_")

# Check for any necessary platform specific compiler flags
include(CheckLAPACKCompilerFlags)
CheckLAPACKCompilerFlags()
endif()
if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
message(WARNING "Reverting to pre-defined include/cblas_mangling.h")
Expand Down
1 change: 1 addition & 0 deletions CMAKE/CheckLAPACKCompilerFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "NAG" )
endif()

# Suppress compiler banner and summary
include(CheckFortranCompilerFlag)
check_fortran_compiler_flag("-quiet" _quiet)
if( _quiet AND NOT ("${CMAKE_Fortran_FLAGS}" MATCHES "[-/]quiet") )
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -quiet")
Expand Down
6 changes: 3 additions & 3 deletions SRC/claqp2rk.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ SUBROUTINE CLAQP2RK( M, N, NRHS, IOFFSET, KMAX, ABSTOL, RELTOL,
EXTERNAL CLARF, CLARFG, CSWAP
* ..
* .. Intrinsic Functions ..
INTRINSIC ABS, REAL, CONJG, IMAG, MAX, MIN, SQRT
INTRINSIC ABS, REAL, CONJG, AIMAG, MAX, MIN, SQRT
* ..
* .. External Functions ..
LOGICAL SISNAN
Expand Down Expand Up @@ -599,8 +599,8 @@ SUBROUTINE CLAQP2RK( M, N, NRHS, IOFFSET, KMAX, ABSTOL, RELTOL,
*
IF( SISNAN( REAL( TAU(KK) ) ) ) THEN
TAUNAN = REAL( TAU(KK) )
ELSE IF( SISNAN( IMAG( TAU(KK) ) ) ) THEN
TAUNAN = IMAG( TAU(KK) )
ELSE IF( SISNAN( AIMAG( TAU(KK) ) ) ) THEN
TAUNAN = AIMAG( TAU(KK) )
ELSE
TAUNAN = ZERO
END IF
Expand Down
6 changes: 3 additions & 3 deletions SRC/claqp3rk.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ SUBROUTINE CLAQP3RK( M, N, NRHS, IOFFSET, NB, ABSTOL,
EXTERNAL CGEMM, CGEMV, CLARFG, CSWAP
* ..
* .. Intrinsic Functions ..
INTRINSIC ABS, REAL, CONJG, IMAG, MAX, MIN, SQRT
INTRINSIC ABS, REAL, CONJG, AIMAG, MAX, MIN, SQRT
* ..
* .. External Functions ..
LOGICAL SISNAN
Expand Down Expand Up @@ -739,8 +739,8 @@ SUBROUTINE CLAQP3RK( M, N, NRHS, IOFFSET, NB, ABSTOL,
*
IF( SISNAN( REAL( TAU(K) ) ) ) THEN
TAUNAN = REAL( TAU(K) )
ELSE IF( SISNAN( IMAG( TAU(K) ) ) ) THEN
TAUNAN = IMAG( TAU(K) )
ELSE IF( SISNAN( AIMAG( TAU(K) ) ) ) THEN
TAUNAN = AIMAG( TAU(K) )
ELSE
TAUNAN = ZERO
END IF
Expand Down
2 changes: 1 addition & 1 deletion TESTING/LIN/alahd.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ SUBROUTINE ALAHD( IOUNIT, PATH )
$ 4X, '10. Random, Last columns are zero starting from',
$ ' MINMN/2+1, CNDNUM = 2', /
$ 4X, '11. Random, Half MINMN columns in the middle are',
$ ' zero starting from MINMN/2-(MINMN/2)/2+1,'
$ ' zero starting from MINMN/2-(MINMN/2)/2+1,',
$ ' CNDNUM = 2', /
$ 4X, '12. Random, Odd columns are ZERO, CNDNUM = 2', /
$ 4X, '13. Random, Even columns are ZERO, CNDNUM = 2', /
Expand Down