Merge pull request #76 from xianyi/develop

rebase
This commit is contained in:
Martin Kroeker 2020-08-11 13:25:12 +02:00 committed by GitHub
commit 62f4c84f27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 34 additions and 21 deletions

9
Jenkinsfile vendored Normal file
View File

@ -0,0 +1,9 @@
node {
stage('Checkout') {
checkout
}
stage('Build') {
sh("make")
}
}

View File

@ -2351,7 +2351,7 @@ $(SGEMMITCOPYOBJ_P) : $(KERNELDIR)/$(SGEMMITCOPY)
endif endif
$(D<GEMMONCOPYOBJ_P) : $(KERNELDIR)/$(DGEMMONCOPY) $(DGEMMONCOPYOBJ_P) : $(KERNELDIR)/$(DGEMMONCOPY)
$(CC) $(PFLAGS) -c -DDOUBLE -UCOMPLEX $< -o $@ $(CC) $(PFLAGS) -c -DDOUBLE -UCOMPLEX $< -o $@
$(DGEMMOTCOPYOBJ_P) : $(KERNELDIR)/$(DGEMMOTCOPY) $(DGEMMOTCOPYOBJ_P) : $(KERNELDIR)/$(DGEMMOTCOPY)

View File

@ -141,8 +141,8 @@ OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLA
i=0; i=0;
ix=0; ix=0;
iy=0; iy=0;
inc_x <<= 1; inc_x *= 2;
inc_y <<= 1; inc_y *= 2;
while(i < n) while(i < n)
{ {

View File

@ -233,9 +233,9 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha_r, FLOAT alpha_i,
if ( m < 1 ) return(0); if ( m < 1 ) return(0);
if ( n < 1 ) return(0); if ( n < 1 ) return(0);
inc_x <<= 1; inc_x *= 2;
inc_y <<= 1; inc_y *= 2;
lda <<= 1; lda *= 2;
lda4 = lda << 2; lda4 = lda << 2;
xbuffer = buffer; xbuffer = buffer;

View File

@ -140,8 +140,8 @@ static void zdot_compute (BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLO
i=0; i=0;
ix=0; ix=0;
iy=0; iy=0;
inc_x <<= 1; inc_x *= 2;
inc_y <<= 1; inc_y *= 2;
while(i < n) while(i < n)
{ {

View File

@ -235,8 +235,8 @@ int CNAME(BLASLONG m, BLASLONG n, BLASLONG dummy1, FLOAT alpha_r, FLOAT alpha_i,
if ( m < 1 ) return(0); if ( m < 1 ) return(0);
if ( n < 1 ) return(0); if ( n < 1 ) return(0);
inc_x <<= 1; inc_x *= 2;
inc_y <<= 1; inc_y *= 2;
lda <<= 1; lda <<= 1;
lda4 = lda << 2; lda4 = lda << 2;

View File

@ -98,7 +98,7 @@ set(ZEIGTST zchkee.f
macro(add_eig_executable name) macro(add_eig_executable name)
add_executable(${name} ${ARGN}) add_executable(${name} ${ARGN})
target_link_libraries(${name} openblas) target_link_libraries(${name} openblas${SUFFIX64_UNDERSCORE})
endmacro() endmacro()
if(BUILD_SINGLE) if(BUILD_SINGLE)

View File

@ -239,7 +239,7 @@ set(ZLINTSTRFP zchkrfp.f zdrvrfp.f zdrvrf1.f zdrvrf2.f zdrvrf3.f zdrvrf4.f zerrr
macro(add_lin_executable name) macro(add_lin_executable name)
add_executable(${name} ${ARGN}) add_executable(${name} ${ARGN})
target_link_libraries(${name} openblas) target_link_libraries(${name} openblas${SUFFIX64_UNDERSCORE})
#${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) #${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
endmacro() endmacro()

View File

@ -372,13 +372,13 @@
END IF END IF
* Compute workspace needed for CGELSY * Compute workspace needed for CGELSY
CALL CGELSY( M, N, NRHS, A, LDA, B, LDB, CALL CGELSY( M, N, NRHS, A, LDA, B, LDB,
$ IWQ, RCOND, CRANK, WQ, -1, RWORK, $ IWQ, RCOND, CRANK, WQ, -1, RWQ,
$ INFO ) $ INFO )
LWORK_CGELSY = INT( WQ( 1 ) ) LWORK_CGELSY = INT( WQ( 1 ) )
LRWORK_CGELSY = 2*N LRWORK_CGELSY = 2*N
* Compute workspace needed for CGELSS * Compute workspace needed for CGELSS
CALL CGELSS( M, N, NRHS, A, LDA, B, LDB, S, CALL CGELSS( M, N, NRHS, A, LDA, B, LDB, S,
$ RCOND, CRANK, WQ, -1, RWORK, INFO ) $ RCOND, CRANK, WQ, -1, RWQ, INFO )
LWORK_CGELSS = INT( WQ( 1 ) ) LWORK_CGELSS = INT( WQ( 1 ) )
LRWORK_CGELSS = 5*MNMIN LRWORK_CGELSS = 5*MNMIN
* Compute workspace needed for CGELSD * Compute workspace needed for CGELSD
@ -564,7 +564,7 @@
CALL CLARNV( 2, ISEED, NCOLS*NRHS, CALL CLARNV( 2, ISEED, NCOLS*NRHS,
$ WORK ) $ WORK )
CALL CSCAL( NCOLS*NRHS, CALL CSCAL( NCOLS*NRHS,
$ ONE / REAL( NCOLS ), WORK, $ CONE / REAL( NCOLS ), WORK,
$ 1 ) $ 1 )
END IF END IF
CALL CGEMM( TRANS, 'No transpose', NROWS, CALL CGEMM( TRANS, 'No transpose', NROWS,

View File

@ -77,7 +77,7 @@
* .. * ..
* .. Local Arrays .. * .. Local Arrays ..
DOUBLE PRECISION A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ), DOUBLE PRECISION A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ),
$ C( NMAX, NMAX ), TAU(NMAX) $ C( NMAX, NMAX ), TAU(NMAX*2)
* .. * ..
* .. External Subroutines .. * .. External Subroutines ..
EXTERNAL ALAESM, CHKXER, DGEQR, EXTERNAL ALAESM, CHKXER, DGEQR,
@ -137,6 +137,8 @@
* *
TAU(1)=1 TAU(1)=1
TAU(2)=1 TAU(2)=1
TAU(3)=1
TAU(4)=1
SRNAMT = 'DGEMQR' SRNAMT = 'DGEMQR'
NB=1 NB=1
INFOT = 1 INFOT = 1

View File

@ -77,7 +77,7 @@
* .. * ..
* .. Local Arrays .. * .. Local Arrays ..
REAL A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ), REAL A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ),
$ C( NMAX, NMAX ), TAU(NMAX) $ C( NMAX, NMAX ), TAU(NMAX*2)
* .. * ..
* .. External Subroutines .. * .. External Subroutines ..
EXTERNAL ALAESM, CHKXER, SGEQR, EXTERNAL ALAESM, CHKXER, SGEQR,
@ -137,6 +137,8 @@
* *
TAU(1)=1 TAU(1)=1
TAU(2)=1 TAU(2)=1
TAU(3)=1
TAU(4)=1
SRNAMT = 'SGEMQR' SRNAMT = 'SGEMQR'
NB=1 NB=1
INFOT = 1 INFOT = 1

View File

@ -372,12 +372,12 @@
END IF END IF
* Compute workspace needed for ZGELSY * Compute workspace needed for ZGELSY
CALL ZGELSY( M, N, NRHS, A, LDA, B, LDB, IWQ, CALL ZGELSY( M, N, NRHS, A, LDA, B, LDB, IWQ,
$ RCOND, CRANK, WQ, -1, RWORK, INFO ) $ RCOND, CRANK, WQ, -1, RWQ, INFO )
LWORK_ZGELSY = INT( WQ( 1 ) ) LWORK_ZGELSY = INT( WQ( 1 ) )
LRWORK_ZGELSY = 2*N LRWORK_ZGELSY = 2*N
* Compute workspace needed for ZGELSS * Compute workspace needed for ZGELSS
CALL ZGELSS( M, N, NRHS, A, LDA, B, LDB, S, CALL ZGELSS( M, N, NRHS, A, LDA, B, LDB, S,
$ RCOND, CRANK, WQ, -1 , RWORK, $ RCOND, CRANK, WQ, -1 , RWQ,
$ INFO ) $ INFO )
LWORK_ZGELSS = INT( WQ( 1 ) ) LWORK_ZGELSS = INT( WQ( 1 ) )
LRWORK_ZGELSS = 5*MNMIN LRWORK_ZGELSS = 5*MNMIN
@ -564,7 +564,7 @@
CALL ZLARNV( 2, ISEED, NCOLS*NRHS, CALL ZLARNV( 2, ISEED, NCOLS*NRHS,
$ WORK ) $ WORK )
CALL ZSCAL( NCOLS*NRHS, CALL ZSCAL( NCOLS*NRHS,
$ ONE / DBLE( NCOLS ), WORK, $ CONE / DBLE( NCOLS ), WORK,
$ 1 ) $ 1 )
END IF END IF
CALL ZGEMM( TRANS, 'No transpose', NROWS, CALL ZGEMM( TRANS, 'No transpose', NROWS,