Import LAPACK: CBLAS directory

Author: grisuthedragon

lapack-netlib/CBLAS/CMakeLists.txt

@@ -65,9 +65,9 @@ if(ALL_TARGETS)
   list(GET ALL_TARGETS 0 _cblas_config_build_guard_target)
 endif()
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-version.cmake.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
   ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-build.cmake.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
 
 

lapack-netlib/CBLAS/testing/CMakeLists.txt

@@ -16,7 +16,6 @@ macro(add_cblas_test output input target)
       -DINTDIR=${CMAKE_CFG_INTDIR}
       -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
     else()
-      string(REPLACE "." "_" input_name ${input})
       add_test(NAME CBLAS-${testName} COMMAND "${CMAKE_COMMAND}" 
         -DTEST=$<TARGET_FILE:${target}>
         -DOUTPUT=${TEST_OUTPUT} 

lapack-netlib/CBLAS/testing/Makefile

@@ -41,7 +41,7 @@ all2: stest2 dtest2 ctest2 ztest2
 all3: stest3 dtest3 ctest3 ztest3
 
 clean:
-	rm -f core *.o a.out x*
+	rm -f core *.o *.out x*
 cleanobj:
 	rm -f core *.o a.out 
 cleanexe:

lapack-netlib/CBLAS/testing/c_cblat3.f

@@ -1365,8 +1365,9 @@ SUBROUTINE CCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
   150 CONTINUE
       WRITE( NOUT, FMT = 9996 )SNAME
-      CALL CPRCN3( NTRA, NC, SNAME, IORDER, SIDE, UPLO, TRANSA, DIAG,
-     $      M, N, ALPHA, LDA, LDB)
+      IF( TRACE )
+     $   CALL CPRCN3( NTRA, NC, SNAME, IORDER, SIDE, UPLO, TRANSA, DIAG,
+     $         M, N, ALPHA, LDA, LDB)
 *
   160 CONTINUE
       RETURN

lapack-netlib/CBLAS/testing/c_dblat3.f

@@ -1335,8 +1335,9 @@ SUBROUTINE DCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
   150 CONTINUE
       WRITE( NOUT, FMT = 9996 )SNAME
-      CALL DPRCN3( NTRA, NC, SNAME, IORDER, SIDE, UPLO, TRANSA, DIAG,
-     $      M, N, ALPHA, LDA, LDB)
+      IF( TRACE )
+     $   CALL DPRCN3( NTRA, NC, SNAME, IORDER, SIDE, UPLO, TRANSA, DIAG,
+     $         M, N, ALPHA, LDA, LDB)
 *
   160 CONTINUE
       RETURN

lapack-netlib/CBLAS/testing/c_sblat3.f

@@ -1339,8 +1339,9 @@ SUBROUTINE SCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
   150 CONTINUE
       WRITE( NOUT, FMT = 9996 )SNAME
-      CALL SPRCN3( NTRA, NC, SNAME, IORDER, SIDE, UPLO, TRANSA, DIAG,
-     $      M, N, ALPHA, LDA, LDB)
+      IF( TRACE )
+     $   CALL SPRCN3( NTRA, NC, SNAME, IORDER, SIDE, UPLO, TRANSA, DIAG,
+     $         M, N, ALPHA, LDA, LDB)
 *
   160 CONTINUE
       RETURN

lapack-netlib/CBLAS/testing/c_zblat2.f

@@ -1350,7 +1350,7 @@ SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
 *                       Call the subroutine.
 *
-                        IF( SNAME( 4: 5 ).EQ.'mv' )THEN
+                        IF( SNAME( 10: 11 ).EQ.'mv' )THEN
                            IF( FULL )THEN
                               IF( TRACE )
      $                           WRITE( NTRA, FMT = 9993 )NC, SNAME,
@@ -1376,7 +1376,7 @@ SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
                               CALL CZTPMV( IORDER, UPLO, TRANS, DIAG,
      $                                    N, AA, XX, INCX )
                            END IF
-                        ELSE IF( SNAME( 4: 5 ).EQ.'sv' )THEN
+                        ELSE IF( SNAME( 10: 11 ).EQ.'sv' )THEN
                            IF( FULL )THEN
                               IF( TRACE )
      $                           WRITE( NTRA, FMT = 9993 )NC, SNAME,
@@ -1465,15 +1465,15 @@ SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
                         END IF
 *
                         IF( .NOT.NULL )THEN
-                           IF( SNAME( 4: 5 ).EQ.'mv' )THEN
+                           IF( SNAME( 10: 11 ).EQ.'mv' )THEN
 *
 *                             Check the result.
 *
                               CALL ZMVCH( TRANS, N, N, ONE, A, NMAX, X,
      $                                    INCX, ZERO, Z, INCX, XT, G,
      $                                    XX, EPS, ERR, FATAL, NOUT,
      $                                    .TRUE. )
-                           ELSE IF( SNAME( 4: 5 ).EQ.'sv' )THEN
+                           ELSE IF( SNAME( 10: 11 ).EQ.'sv' )THEN
 *
 *                             Compute approximation to original vector.
 *
@@ -1611,7 +1611,7 @@ SUBROUTINE ZCHK4( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *     .. Common blocks ..
       COMMON             /INFOC/INFOT, NOUTC, OK
 *     .. Executable Statements ..
-      CONJ = SNAME( 5: 5 ).EQ.'c'
+      CONJ = SNAME( 11: 11 ).EQ.'c'
 *     Define the number of arguments.
       NARGS = 9
 *

lapack-netlib/CBLAS/testing/c_zblat3.f

@@ -1366,8 +1366,9 @@ SUBROUTINE ZCHK3( SNAME, EPS, THRESH, NOUT, NTRA, TRACE, REWI,
 *
   150 CONTINUE
       WRITE( NOUT, FMT = 9996 )SNAME
-      CALL ZPRCN3( NTRA, NC, SNAME, IORDER, SIDE, UPLO, TRANSA, DIAG,
-     $      M, N, ALPHA, LDA, LDB)
+      IF( TRACE )
+     $   CALL ZPRCN3( NTRA, NC, SNAME, IORDER, SIDE, UPLO, TRANSA, DIAG,
+     $         M, N, ALPHA, LDA, LDB)
 *
   160 CONTINUE
       RETURN