From 358ee318ed3c6e98e25aa7d3d348e482a885cfac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20K=C3=B6hler?= Date: Wed, 26 Oct 2016 15:02:41 +0200 Subject: [PATCH] Import LAPACK: CBLAS directory --- lapack-netlib/CBLAS/CMakeLists.txt | 4 ++-- lapack-netlib/CBLAS/testing/CMakeLists.txt | 1 - lapack-netlib/CBLAS/testing/Makefile | 2 +- lapack-netlib/CBLAS/testing/c_cblat3.f | 5 +++-- lapack-netlib/CBLAS/testing/c_dblat3.f | 5 +++-- lapack-netlib/CBLAS/testing/c_sblat3.f | 5 +++-- lapack-netlib/CBLAS/testing/c_zblat2.f | 10 +++++----- lapack-netlib/CBLAS/testing/c_zblat3.f | 5 +++-- 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/lapack-netlib/CBLAS/CMakeLists.txt b/lapack-netlib/CBLAS/CMakeLists.txt index 98b481f..95b3bf6 100644 --- a/lapack-netlib/CBLAS/CMakeLists.txt +++ b/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) diff --git a/lapack-netlib/CBLAS/testing/CMakeLists.txt b/lapack-netlib/CBLAS/testing/CMakeLists.txt index c7eb87e..28c5535 100644 --- a/lapack-netlib/CBLAS/testing/CMakeLists.txt +++ b/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=$ -DOUTPUT=${TEST_OUTPUT} diff --git a/lapack-netlib/CBLAS/testing/Makefile b/lapack-netlib/CBLAS/testing/Makefile index 2ad1ad1..b4213e4 100644 --- a/lapack-netlib/CBLAS/testing/Makefile +++ b/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: diff --git a/lapack-netlib/CBLAS/testing/c_cblat3.f b/lapack-netlib/CBLAS/testing/c_cblat3.f index b03d479..62a4364 100644 --- a/lapack-netlib/CBLAS/testing/c_cblat3.f +++ b/lapack-netlib/CBLAS/testing/c_cblat3.f @@ -1365,8 +1365,9 @@ * 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 diff --git a/lapack-netlib/CBLAS/testing/c_dblat3.f b/lapack-netlib/CBLAS/testing/c_dblat3.f index fb9acbb..846ac95 100644 --- a/lapack-netlib/CBLAS/testing/c_dblat3.f +++ b/lapack-netlib/CBLAS/testing/c_dblat3.f @@ -1335,8 +1335,9 @@ * 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 diff --git a/lapack-netlib/CBLAS/testing/c_sblat3.f b/lapack-netlib/CBLAS/testing/c_sblat3.f index 948fd6e..c6b42d5 100644 --- a/lapack-netlib/CBLAS/testing/c_sblat3.f +++ b/lapack-netlib/CBLAS/testing/c_sblat3.f @@ -1339,8 +1339,9 @@ * 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 diff --git a/lapack-netlib/CBLAS/testing/c_zblat2.f b/lapack-netlib/CBLAS/testing/c_zblat2.f index 236088f..12bf0e7 100644 --- a/lapack-netlib/CBLAS/testing/c_zblat2.f +++ b/lapack-netlib/CBLAS/testing/c_zblat2.f @@ -1350,7 +1350,7 @@ * * 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 @@ 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,7 +1465,7 @@ END IF * IF( .NOT.NULL )THEN - IF( SNAME( 4: 5 ).EQ.'mv' )THEN + IF( SNAME( 10: 11 ).EQ.'mv' )THEN * * Check the result. * @@ -1473,7 +1473,7 @@ $ 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 @@ * .. 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 * diff --git a/lapack-netlib/CBLAS/testing/c_zblat3.f b/lapack-netlib/CBLAS/testing/c_zblat3.f index 6e9dbbd..4b278a1 100644 --- a/lapack-netlib/CBLAS/testing/c_zblat3.f +++ b/lapack-netlib/CBLAS/testing/c_zblat3.f @@ -1366,8 +1366,9 @@ * 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 -- 2.7.4