Merge pull request #6 from Reference-LAPACK/master

rebase

Author: martin-frbg

.travis.yml

@@ -21,12 +21,12 @@ matrix:
     env: CMAKE_BUILD_TYPE=Release
     before_install:
     - brew update > /dev/null
-    - brew install gcc > /dev/null
+    - brew upgrade gcc > /dev/null
   - os: osx
     env: CMAKE_BUILD_TYPE=Coverage
     before_install:
     - brew update > /dev/null
-    - brew install gcc > /dev/null
+    - brew upgrade gcc > /dev/null
 
 script:
   - export PR=https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST

BLAS/SRC/cgemm.f

@@ -215,7 +215,7 @@ SUBROUTINE CGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     ..
 *     .. Local Scalars ..
       COMPLEX TEMP
-      INTEGER I,INFO,J,L,NCOLA,NROWA,NROWB
+      INTEGER I,INFO,J,L,NROWA,NROWB
       LOGICAL CONJA,CONJB,NOTA,NOTB
 *     ..
 *     .. Parameters ..
@@ -228,19 +228,16 @@ SUBROUTINE CGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     Set  NOTA  and  NOTB  as  true if  A  and  B  respectively are not
 *     conjugated or transposed, set  CONJA and CONJB  as true if  A  and
 *     B  respectively are to be  transposed but  not conjugated  and set
-*     NROWA, NCOLA and  NROWB  as the number of rows and  columns  of  A
-*     and the number of rows of  B  respectively.
+*     NROWA and  NROWB  as the number of rows of  A  and  B  respectively.
 *
       NOTA = LSAME(TRANSA,'N')
       NOTB = LSAME(TRANSB,'N')
       CONJA = LSAME(TRANSA,'C')
       CONJB = LSAME(TRANSB,'C')
       IF (NOTA) THEN
           NROWA = M
-          NCOLA = K
       ELSE
           NROWA = K
-          NCOLA = M
       END IF
       IF (NOTB) THEN
           NROWB = K

BLAS/SRC/crotg.f

@@ -27,7 +27,7 @@
 *  Arguments:
 *  ==========
 *
-*> \param[in] CA
+*> \param[in,out] CA
 *> \verbatim
 *>          CA is COMPLEX
 *> \endverbatim

BLAS/SRC/dgemm.f

@@ -215,7 +215,7 @@ SUBROUTINE DGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     ..
 *     .. Local Scalars ..
       DOUBLE PRECISION TEMP
-      INTEGER I,INFO,J,L,NCOLA,NROWA,NROWB
+      INTEGER I,INFO,J,L,NROWA,NROWB
       LOGICAL NOTA,NOTB
 *     ..
 *     .. Parameters ..
@@ -224,17 +224,15 @@ SUBROUTINE DGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     ..
 *
 *     Set  NOTA  and  NOTB  as  true if  A  and  B  respectively are not
-*     transposed and set  NROWA, NCOLA and  NROWB  as the number of rows
-*     and  columns of  A  and the  number of  rows  of  B  respectively.
+*     transposed and set  NROWA and NROWB  as the number of rows of  A
+*     and  B  respectively.
 *
       NOTA = LSAME(TRANSA,'N')
       NOTB = LSAME(TRANSB,'N')
       IF (NOTA) THEN
           NROWA = M
-          NCOLA = K
       ELSE
           NROWA = K
-          NCOLA = M
       END IF
       IF (NOTB) THEN
           NROWB = K

BLAS/SRC/drotg.f

@@ -26,12 +26,12 @@
 *  Arguments:
 *  ==========
 *
-*> \param[in] DA
+*> \param[in,out] DA
 *> \verbatim
 *>          DA is DOUBLE PRECISION
 *> \endverbatim
 *>
-*> \param[in] DB
+*> \param[in,out] DB
 *> \verbatim
 *>          DB is DOUBLE PRECISION
 *> \endverbatim
@@ -86,15 +86,15 @@ SUBROUTINE DROTG(DA,DB,C,S)
 *     .. Intrinsic Functions ..
       INTRINSIC DABS,DSIGN,DSQRT
 *     ..
-      ROE = DB
-      IF (DABS(DA).GT.DABS(DB)) ROE = DA
       SCALE = DABS(DA) + DABS(DB)
       IF (SCALE.EQ.0.0d0) THEN
          C = 1.0d0
          S = 0.0d0
          R = 0.0d0
          Z = 0.0d0
       ELSE
+         ROE = DB
+         IF (DABS(DA).GT.DABS(DB)) ROE = DA
          R = SCALE*DSQRT((DA/SCALE)**2+ (DB/SCALE)**2)
          R = DSIGN(1.0d0,ROE)*R
          C = DA/R

BLAS/SRC/drotmg.f

@@ -152,6 +152,19 @@ SUBROUTINE DROTMG(DD1,DD2,DX1,DY1,DPARAM)
              DD1 = DD1/DU
              DD2 = DD2/DU
              DX1 = DX1*DU
+           ELSE
+*            This code path if here for safety. We do not expect this
+*            condition to ever hold except in edge cases with rounding
+*            errors. See DOI: 10.1145/355841.355847
+             DFLAG = -ONE
+             DH11 = ZERO
+             DH12 = ZERO
+             DH21 = ZERO
+             DH22 = ZERO
+*
+             DD1 = ZERO
+             DD2 = ZERO
+             DX1 = ZERO
            END IF
          ELSE
 

BLAS/SRC/dzasum.f

@@ -24,7 +24,7 @@
 *> \verbatim
 *>
 *>    DZASUM takes the sum of the (|Re(.)| + |Im(.)|)'s of a complex vector and
-*>    returns a single precision result.
+*>    returns a double precision result.
 *> \endverbatim
 *
 *  Arguments:

BLAS/SRC/sgemm.f

@@ -215,7 +215,7 @@ SUBROUTINE SGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     ..
 *     .. Local Scalars ..
       REAL TEMP
-      INTEGER I,INFO,J,L,NCOLA,NROWA,NROWB
+      INTEGER I,INFO,J,L,NROWA,NROWB
       LOGICAL NOTA,NOTB
 *     ..
 *     .. Parameters ..
@@ -224,17 +224,15 @@ SUBROUTINE SGEMM(TRANSA,TRANSB,M,N,K,ALPHA,A,LDA,B,LDB,BETA,C,LDC)
 *     ..
 *
 *     Set  NOTA  and  NOTB  as  true if  A  and  B  respectively are not
-*     transposed and set  NROWA, NCOLA and  NROWB  as the number of rows
-*     and  columns of  A  and the  number of  rows  of  B  respectively.
+*     transposed and set  NROWA and NROWB  as the number of rows of  A
+*     and  B  respectively.
 *
       NOTA = LSAME(TRANSA,'N')
       NOTB = LSAME(TRANSB,'N')
       IF (NOTA) THEN
           NROWA = M
-          NCOLA = K
       ELSE
           NROWA = K
-          NCOLA = M
       END IF
       IF (NOTB) THEN
           NROWB = K

BLAS/SRC/srotg.f

@@ -26,12 +26,12 @@
 *  Arguments:
 *  ==========
 *
-*> \param[in] SA
+*> \param[in,out] SA
 *> \verbatim
 *>          SA is REAL
 *> \endverbatim
 *>
-*> \param[in] SB
+*> \param[in,out] SB
 *> \verbatim
 *>          SB is REAL
 *> \endverbatim
@@ -86,15 +86,15 @@ SUBROUTINE SROTG(SA,SB,C,S)
 *     .. Intrinsic Functions ..
       INTRINSIC ABS,SIGN,SQRT
 *     ..
-      ROE = SB
-      IF (ABS(SA).GT.ABS(SB)) ROE = SA
       SCALE = ABS(SA) + ABS(SB)
       IF (SCALE.EQ.0.0) THEN
          C = 1.0
          S = 0.0
          R = 0.0
          Z = 0.0
       ELSE
+         ROE = SB
+         IF (ABS(SA).GT.ABS(SB)) ROE = SA
          R = SCALE*SQRT((SA/SCALE)**2+ (SB/SCALE)**2)
          R = SIGN(1.0,ROE)*R
          C = SA/R

BLAS/SRC/srotmg.f

@@ -152,6 +152,19 @@ SUBROUTINE SROTMG(SD1,SD2,SX1,SY1,SPARAM)
              SD1 = SD1/SU
              SD2 = SD2/SU
              SX1 = SX1*SU
+           ELSE
+*            This code path if here for safety. We do not expect this
+*            condition to ever hold except in edge cases with rounding
+*            errors. See DOI: 10.1145/355841.355847
+             SFLAG = -ONE
+             SH11 = ZERO
+             SH12 = ZERO
+             SH21 = ZERO
+             SH22 = ZERO
+*
+             SD1 = ZERO
+             SD2 = ZERO
+             SX1 = ZERO
            END IF
          ELSE