Skip to content

Fix argument mismatches for implicitly defined functions (gcc-10 compat) #26

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
julielangou merged 2 commits into from
Jun 26, 2020
Merged

Fix argument mismatches for implicitly defined functions (gcc-10 compat) #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c909f0
fix argument mismatches in the SRC
dev-zero Jun 25, 2020
189c840
use -std=legacy for tests with GCC-10+
dev-zero Jun 25, 2020
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
10 changes: 7 additions & 3 deletions BLACS/TESTING/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
set(FTestObj
set(FTestObj
blacstest.f btprim.f tools.f)

if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
set_source_files_properties(blacstest.f PROPERTIES COMPILE_FLAGS "-std=legacy")
endif()

add_executable(xFbtest ${FTestObj})
target_link_libraries(xFbtest scalapack)

set(CTestObj
set(CTestObj
Cbt.c)

set_property(
Expand Down Expand Up @@ -46,4 +50,4 @@ add_test(xFbtest
-DRUNTIMEDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-DSOURCEDIR=${CMAKE_CURRENT_SOURCE_DIR}
-P ${CMAKE_CURRENT_SOURCE_DIR}/runtest.cmake
)
)
7 changes: 4 additions & 3 deletions PBLAS/TESTING/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set (zpbtcom pzblastst.f dlamch.f ${pbtcom})

set_property(
SOURCE ${PblasErrorHandler}
APPEND PROPERTY COMPILE_DEFINITIONS TestingPblas
APPEND PROPERTY COMPILE_DEFINITIONS TestingPblas
)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/PBLAS/TESTING)
Expand Down Expand Up @@ -74,5 +74,6 @@ add_test(dpb3tst ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./dpb3tst)
add_test(cpb3tst ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./cpb3tst)
add_test(zpb3tst ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./zpb3tst)



if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy" ) # local to this directory
endif()
5 changes: 3 additions & 2 deletions PBLAS/TIMING/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,6 @@ add_test(dpb3tim ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./dpb3tim)
add_test(cpb3tim ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./cpb3tim)
add_test(zpb3tim ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./zpb3tim)



if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy" ) # local to this directory
endif()
80 changes: 40 additions & 40 deletions SRC/pclarf.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
$ IOFFV, IPW, IROFF, IVCOL, IVROW, JJC, JJV, LDC,
$ LDV, MYCOL, MYROW, MP, NCC, NCV, NPCOL, NPROW,
$ NQ, RDEST
COMPLEX TAULOC
COMPLEX TAULOC( 1 )
* ..
* .. External Subroutines ..
EXTERNAL BLACS_GRIDINFO, CCOPY, CGEBR2D, CGEBS2D,
Expand Down Expand Up @@ -336,7 +336,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
CALL CGEBS2D( ICTXT, 'Columnwise', ' ', 1, 1,
$ TAU( IIV ), 1 )
TAULOC = TAU( IIV )
TAULOC( 1 ) = TAU( IIV )
*
ELSE
*
Expand All @@ -345,7 +345,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
END IF
*
IF( TAULOC.NE.ZERO ) THEN
IF( TAULOC( 1 ).NE.ZERO ) THEN
*
* w := sub( C )' * v
*
Expand All @@ -363,8 +363,8 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
* sub( C ) := sub( C ) - v * w'
*
CALL CGERC( MP, NQ, -TAULOC, WORK, 1, WORK( IPW ),
$ 1, C( IOFFC ), LDC )
CALL CGERC( MP, NQ, -TAULOC( 1 ), WORK, 1,
$ WORK( IPW ), 1, C( IOFFC ), LDC )
END IF
*
END IF
Expand All @@ -379,9 +379,9 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
IF( MYCOL.EQ.ICCOL ) THEN
*
TAULOC = TAU( JJV )
TAULOC( 1 ) = TAU( JJV )
*
IF( TAULOC.NE.ZERO ) THEN
IF( TAULOC( 1 ).NE.ZERO ) THEN
*
* w := sub( C )' * v
*
Expand All @@ -398,7 +398,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
* sub( C ) := sub( C ) - v * w'
*
CALL CGERC( MP, NQ, -TAULOC, V( IOFFV ), 1,
CALL CGERC( MP, NQ, -TAULOC( 1 ), V( IOFFV ), 1,
$ WORK, 1, C( IOFFC ), LDC )
END IF
*
Expand All @@ -421,9 +421,9 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
IPW = MP+1
CALL CGERV2D( ICTXT, IPW, 1, WORK, IPW, MYROW,
$ IVCOL )
TAULOC = WORK( IPW )
TAULOC( 1 ) = WORK( IPW )
*
IF( TAULOC.NE.ZERO ) THEN
IF( TAULOC( 1 ).NE.ZERO ) THEN
*
* w := sub( C )' * v
*
Expand All @@ -441,7 +441,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
* sub( C ) := sub( C ) - v * w'
*
CALL CGERC( MP, NQ, -TAULOC, WORK, 1,
CALL CGERC( MP, NQ, -TAULOC( 1 ), WORK, 1,
$ WORK( IPW ), 1, C( IOFFC ), LDC )
END IF
*
Expand Down Expand Up @@ -471,7 +471,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
CALL CGEBS2D( ICTXT, 'Columnwise', ' ', 1, 1,
$ TAU( IIV ), 1 )
TAULOC = TAU( IIV )
TAULOC( 1 ) = TAU( IIV )
*
ELSE
*
Expand All @@ -480,7 +480,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
END IF
*
IF( TAULOC.NE.ZERO ) THEN
IF( TAULOC( 1 ).NE.ZERO ) THEN
*
* w := sub( C )' * v
*
Expand All @@ -500,8 +500,8 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
* sub( C ) := sub( C ) - v * w'
*
IF( IOFFC.GT.0 )
$ CALL CGERC( MP, NQ, -TAULOC, WORK, 1, WORK( IPW ),
$ 1, C( IOFFC ), LDC )
$ CALL CGERC( MP, NQ, -TAULOC( 1 ), WORK, 1,
$ WORK( IPW ), 1, C( IOFFC ), LDC )
END IF
*
ELSE
Expand All @@ -516,18 +516,18 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
WORK(IPW) = TAU( JJV )
CALL CGEBS2D( ICTXT, 'Rowwise', ROWBTOP, IPW, 1,
$ WORK, IPW )
TAULOC = TAU( JJV )
TAULOC( 1 ) = TAU( JJV )
*
ELSE
*
IPW = MP+1
CALL CGEBR2D( ICTXT, 'Rowwise', ROWBTOP, IPW, 1, WORK,
$ IPW, MYROW, IVCOL )
TAULOC = WORK( IPW )
TAULOC( 1 ) = WORK( IPW )
*
END IF
*
IF( TAULOC.NE.ZERO ) THEN
IF( TAULOC( 1 ).NE.ZERO ) THEN
*
* w := sub( C )' * v
*
Expand All @@ -547,8 +547,8 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
* sub( C ) := sub( C ) - v * w'
*
IF( IOFFC.GT.0 )
$ CALL CGERC( MP, NQ, -TAULOC, WORK, 1, WORK( IPW ),
$ 1, C( IOFFC ), LDC )
$ CALL CGERC( MP, NQ, -TAULOC( 1 ), WORK, 1,
$ WORK( IPW ), 1, C( IOFFC ), LDC )
END IF
*
END IF
Expand Down Expand Up @@ -577,9 +577,9 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
IF( MYROW.EQ.ICROW ) THEN
*
TAULOC = TAU( IIV )
TAULOC( 1 ) = TAU( IIV )
*
IF( TAULOC.NE.ZERO ) THEN
IF( TAULOC( 1 ).NE.ZERO ) THEN
*
* w := sub( C ) * v
*
Expand All @@ -597,7 +597,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
* sub( C ) := sub( C ) - w * v'
*
IF( IOFFV.GT.0 .AND. IOFFC.GT.0 )
$ CALL CGERC( MP, NQ, -TAULOC, WORK, 1,
$ CALL CGERC( MP, NQ, -TAULOC( 1 ), WORK, 1,
$ V( IOFFV ), LDV, C( IOFFC ),
$ LDC )
END IF
Expand All @@ -621,9 +621,9 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
IPW = NQ+1
CALL CGERV2D( ICTXT, IPW, 1, WORK, IPW, IVROW,
$ MYCOL )
TAULOC = WORK( IPW )
TAULOC( 1 ) = WORK( IPW )
*
IF( TAULOC.NE.ZERO ) THEN
IF( TAULOC( 1 ).NE.ZERO ) THEN
*
* w := sub( C ) * v
*
Expand All @@ -641,8 +641,8 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
* sub( C ) := sub( C ) - w * v'
*
CALL CGERC( MP, NQ, -TAULOC, WORK( IPW ), 1,
$ WORK, 1, C( IOFFC ), LDC )
CALL CGERC( MP, NQ, -TAULOC( 1 ), WORK( IPW ),
$ 1, WORK, 1, C( IOFFC ), LDC )
END IF
*
END IF
Expand All @@ -667,7 +667,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
CALL CGEBS2D( ICTXT, 'Rowwise', ' ', 1, 1,
$ TAU( JJV ), 1 )
TAULOC = TAU( JJV )
TAULOC( 1 ) = TAU( JJV )
*
ELSE
*
Expand All @@ -676,7 +676,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
END IF
*
IF( TAULOC.NE.ZERO ) THEN
IF( TAULOC( 1 ).NE.ZERO ) THEN
*
* w := sub( C ) * v
*
Expand All @@ -694,8 +694,8 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
* sub( C ) := sub( C ) - w * v'
*
CALL CGERC( MP, NQ, -TAULOC, WORK( IPW ), 1, WORK,
$ 1, C( IOFFC ), LDC )
CALL CGERC( MP, NQ, -TAULOC( 1 ), WORK( IPW ), 1,
$ WORK, 1, C( IOFFC ), LDC )
END IF
*
END IF
Expand All @@ -720,18 +720,18 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
WORK(IPW) = TAU( IIV )
CALL CGEBS2D( ICTXT, 'Columnwise', COLBTOP, IPW, 1,
$ WORK, IPW )
TAULOC = TAU( IIV )
TAULOC( 1 ) = TAU( IIV )
*
ELSE
*
IPW = NQ+1
CALL CGEBR2D( ICTXT, 'Columnwise', COLBTOP, IPW, 1,
$ WORK, IPW, IVROW, MYCOL )
TAULOC = WORK( IPW )
TAULOC( 1 ) = WORK( IPW )
*
END IF
*
IF( TAULOC.NE.ZERO ) THEN
IF( TAULOC( 1 ).NE.ZERO ) THEN
*
* w := sub( C ) * v
*
Expand All @@ -750,8 +750,8 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
* sub( C ) := sub( C ) - w * v'
*
IF( IOFFC.GT.0 )
$ CALL CGERC( MP, NQ, -TAULOC, WORK( IPW ), 1, WORK,
$ 1, C( IOFFC ), LDC )
$ CALL CGERC( MP, NQ, -TAULOC( 1 ), WORK( IPW ), 1,
$ WORK, 1, C( IOFFC ), LDC )
END IF
*
ELSE
Expand All @@ -770,7 +770,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
CALL CGEBS2D( ICTXT, 'Rowwise', ' ', 1, 1, TAU( JJV ),
$ 1 )
TAULOC = TAU( JJV )
TAULOC( 1 ) = TAU( JJV )
*
ELSE
*
Expand All @@ -779,7 +779,7 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
END IF
*
IF( TAULOC.NE.ZERO ) THEN
IF( TAULOC( 1 ).NE.ZERO ) THEN
*
* w := sub( C ) * v
*
Expand All @@ -797,8 +797,8 @@ SUBROUTINE PCLARF( SIDE, M, N, V, IV, JV, DESCV, INCV, TAU,
*
* sub( C ) := sub( C ) - w * v'
*
CALL CGERC( MP, NQ, -TAULOC, WORK( IPW ), 1, WORK, 1,
$ C( IOFFC ), LDC )
CALL CGERC( MP, NQ, -TAULOC( 1 ), WORK( IPW ), 1,
$ WORK, 1, C( IOFFC ), LDC )
END IF
*
END IF
Expand Down
Loading