aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjulielangou <julie@cs.utk.edu>2016-12-06 20:43:30 -0800
committerGitHub <noreply@github.com>2016-12-06 20:43:30 -0800
commitbc82eb1ed984a75de77c7e8b2cf75cda45b54310 (patch)
treedb145d6a4b8b817a00eaade19a929c11e8c02e83
parent6dbc7e74ccec519578a4620d5b4689c1df87948e (diff)
parentff429e76a0aed3fcfe980c49f0a64befa7ab287f (diff)
Merge pull request #94 from cmoha/master
fix for some bugs
-rw-r--r--CBLAS/include/cblas_f77.h4
-rw-r--r--LAPACKE/example/example_DGELS_rowmajor.c1
-rw-r--r--LAPACKE/include/lapacke.h4
-rw-r--r--LAPACKE/src/lapacke_chetrf_aa.c6
-rw-r--r--LAPACKE/src/lapacke_csytrf_aa.c6
-rw-r--r--LAPACKE/src/lapacke_dsytrf_aa.c6
-rw-r--r--LAPACKE/src/lapacke_ssytrf_aa.c6
-rw-r--r--LAPACKE/src/lapacke_zhetrf_aa.c6
-rw-r--r--LAPACKE/src/lapacke_zsytrf_aa.c6
9 files changed, 22 insertions, 23 deletions
diff --git a/CBLAS/include/cblas_f77.h b/CBLAS/include/cblas_f77.h
index edda4462..36d4a711 100644
--- a/CBLAS/include/cblas_f77.h
+++ b/CBLAS/include/cblas_f77.h
@@ -89,8 +89,8 @@
/*
* Level 2 BLAS
*/
-#define F77_ssymv F77_GLOBAL(ssymv,SSYMY)
-#define F77_ssbmv F77_GLOBAL(ssbmv,SSMBV)
+#define F77_ssymv F77_GLOBAL(ssymv,SSYMV)
+#define F77_ssbmv F77_GLOBAL(ssbmv,SSBMV)
#define F77_sspmv F77_GLOBAL(sspmv,SSPMV)
#define F77_sger F77_GLOBAL(sger,SGER)
#define F77_ssyr F77_GLOBAL(ssyr,SSYR)
diff --git a/LAPACKE/example/example_DGELS_rowmajor.c b/LAPACKE/example/example_DGELS_rowmajor.c
index 15040262..fe17c5e2 100644
--- a/LAPACKE/example/example_DGELS_rowmajor.c
+++ b/LAPACKE/example/example_DGELS_rowmajor.c
@@ -69,7 +69,6 @@ int main (int argc, const char * argv[])
double A[5][3] = {1,1,1,2,3,4,3,5,2,4,2,5,5,4,3};
double b[5][2] = {-10,-3,12,14,14,12,16,16,18,16};
lapack_int info,m,n,lda,ldb,nrhs;
- int i,j;
/* Initialization */
m = 5;
diff --git a/LAPACKE/include/lapacke.h b/LAPACKE/include/lapacke.h
index a319a469..d7d19172 100644
--- a/LAPACKE/include/lapacke.h
+++ b/LAPACKE/include/lapacke.h
@@ -12679,9 +12679,9 @@ lapack_int LAPACKE_zhetrs_aa_work( int matrix_layout, char uplo, lapack_int n,
// LAPACK 3.7.0
#define LAPACK_ssysv_aa LAPACK_GLOBAL(ssysv_aa,SSYSV_AA)
#define LAPACK_dsysv_aa LAPACK_GLOBAL(dsysv_aa,DSYSV_AA)
-#define LAPACK_csysv_aa LAPACK_GLOBAL(chesv_aa,CHESV_AA)
+#define LAPACK_chesv_aa LAPACK_GLOBAL(chesv_aa,CHESV_AA)
#define LAPACK_zsysv_aa LAPACK_GLOBAL(zsysv_aa,ZSYSV_AA)
-#define LAPACK_chesv_aa LAPACK_GLOBAL(csysv_aa,CSYSV_AA)
+#define LAPACK_csysv_aa LAPACK_GLOBAL(csysv_aa,CSYSV_AA)
#define LAPACK_zhesv_aa LAPACK_GLOBAL(zhesv_aa,ZHESV_AA)
#define LAPACK_ssytrs_aa LAPACK_GLOBAL(ssytrs_aa,SSYTRS_AA)
#define LAPACK_dsytrs_aa LAPACK_GLOBAL(dsytrs_aa,DSYTRS_AA)
diff --git a/LAPACKE/src/lapacke_chetrf_aa.c b/LAPACKE/src/lapacke_chetrf_aa.c
index 5c5d1c25..b3887447 100644
--- a/LAPACKE/src/lapacke_chetrf_aa.c
+++ b/LAPACKE/src/lapacke_chetrf_aa.c
@@ -33,7 +33,7 @@
#include "lapacke_utils.h"
-lapack_int LAPACKE_chetrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int LAPACKE_chetrf_aa( int matrix_layout, char uplo, lapack_int n,
lapack_complex_float* a, lapack_int lda,
lapack_int* ipiv )
{
@@ -42,7 +42,7 @@ lapack_int LAPACKE_chetrf( int matrix_layout, char uplo, lapack_int n,
lapack_complex_float* work = NULL;
lapack_complex_float work_query;
if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
- LAPACKE_xerbla( "LAPACKE_chetrf", -1 );
+ LAPACKE_xerbla( "LAPACKE_chetrf_aa", -1 );
return -1;
}
#ifndef LAPACK_DISABLE_NAN_CHECK
@@ -72,7 +72,7 @@ lapack_int LAPACKE_chetrf( int matrix_layout, char uplo, lapack_int n,
LAPACKE_free( work );
exit_level_0:
if( info == LAPACK_WORK_MEMORY_ERROR ) {
- LAPACKE_xerbla( "LAPACKE_chetrf", info );
+ LAPACKE_xerbla( "LAPACKE_chetrf_aa", info );
}
return info;
}
diff --git a/LAPACKE/src/lapacke_csytrf_aa.c b/LAPACKE/src/lapacke_csytrf_aa.c
index a3bd58f8..53e09d91 100644
--- a/LAPACKE/src/lapacke_csytrf_aa.c
+++ b/LAPACKE/src/lapacke_csytrf_aa.c
@@ -33,7 +33,7 @@
#include "lapacke_utils.h"
-lapack_int LAPACKE_csytrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int LAPACKE_csytrf_aa( int matrix_layout, char uplo, lapack_int n,
lapack_complex_float* a, lapack_int lda,
lapack_int* ipiv )
{
@@ -42,7 +42,7 @@ lapack_int LAPACKE_csytrf( int matrix_layout, char uplo, lapack_int n,
lapack_complex_float* work = NULL;
lapack_complex_float work_query;
if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
- LAPACKE_xerbla( "LAPACKE_csytrf", -1 );
+ LAPACKE_xerbla( "LAPACKE_csytrf_aa", -1 );
return -1;
}
#ifndef LAPACK_DISABLE_NAN_CHECK
@@ -72,7 +72,7 @@ lapack_int LAPACKE_csytrf( int matrix_layout, char uplo, lapack_int n,
LAPACKE_free( work );
exit_level_0:
if( info == LAPACK_WORK_MEMORY_ERROR ) {
- LAPACKE_xerbla( "LAPACKE_csytrf", info );
+ LAPACKE_xerbla( "LAPACKE_csytrf_aa", info );
}
return info;
}
diff --git a/LAPACKE/src/lapacke_dsytrf_aa.c b/LAPACKE/src/lapacke_dsytrf_aa.c
index 972c078e..490bd84b 100644
--- a/LAPACKE/src/lapacke_dsytrf_aa.c
+++ b/LAPACKE/src/lapacke_dsytrf_aa.c
@@ -33,7 +33,7 @@
#include "lapacke_utils.h"
-lapack_int LAPACKE_dsytrf( int matrix_layout, char uplo, lapack_int n, double* a,
+lapack_int LAPACKE_dsytrf_aa( int matrix_layout, char uplo, lapack_int n, double* a,
lapack_int lda, lapack_int* ipiv )
{
lapack_int info = 0;
@@ -41,7 +41,7 @@ lapack_int LAPACKE_dsytrf( int matrix_layout, char uplo, lapack_int n, double* a
double* work = NULL;
double work_query;
if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
- LAPACKE_xerbla( "LAPACKE_dsytrf", -1 );
+ LAPACKE_xerbla( "LAPACKE_dsytrf_aa", -1 );
return -1;
}
#ifndef LAPACK_DISABLE_NAN_CHECK
@@ -70,7 +70,7 @@ lapack_int LAPACKE_dsytrf( int matrix_layout, char uplo, lapack_int n, double* a
LAPACKE_free( work );
exit_level_0:
if( info == LAPACK_WORK_MEMORY_ERROR ) {
- LAPACKE_xerbla( "LAPACKE_dsytrf", info );
+ LAPACKE_xerbla( "LAPACKE_dsytrf_aa", info );
}
return info;
}
diff --git a/LAPACKE/src/lapacke_ssytrf_aa.c b/LAPACKE/src/lapacke_ssytrf_aa.c
index a48ce3be..f98a7b18 100644
--- a/LAPACKE/src/lapacke_ssytrf_aa.c
+++ b/LAPACKE/src/lapacke_ssytrf_aa.c
@@ -33,7 +33,7 @@
#include "lapacke_utils.h"
-lapack_int LAPACKE_ssytrf( int matrix_layout, char uplo, lapack_int n, float* a,
+lapack_int LAPACKE_ssytrf_aa( int matrix_layout, char uplo, lapack_int n, float* a,
lapack_int lda, lapack_int* ipiv )
{
lapack_int info = 0;
@@ -41,7 +41,7 @@ lapack_int LAPACKE_ssytrf( int matrix_layout, char uplo, lapack_int n, float* a,
float* work = NULL;
float work_query;
if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
- LAPACKE_xerbla( "LAPACKE_ssytrf", -1 );
+ LAPACKE_xerbla( "LAPACKE_ssytrf_aa", -1 );
return -1;
}
#ifndef LAPACK_DISABLE_NAN_CHECK
@@ -70,7 +70,7 @@ lapack_int LAPACKE_ssytrf( int matrix_layout, char uplo, lapack_int n, float* a,
LAPACKE_free( work );
exit_level_0:
if( info == LAPACK_WORK_MEMORY_ERROR ) {
- LAPACKE_xerbla( "LAPACKE_ssytrf", info );
+ LAPACKE_xerbla( "LAPACKE_ssytrf_aa", info );
}
return info;
}
diff --git a/LAPACKE/src/lapacke_zhetrf_aa.c b/LAPACKE/src/lapacke_zhetrf_aa.c
index 7282db46..870fd0ea 100644
--- a/LAPACKE/src/lapacke_zhetrf_aa.c
+++ b/LAPACKE/src/lapacke_zhetrf_aa.c
@@ -33,7 +33,7 @@
#include "lapacke_utils.h"
-lapack_int LAPACKE_zhetrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int LAPACKE_zhetrf_aa( int matrix_layout, char uplo, lapack_int n,
lapack_complex_double* a, lapack_int lda,
lapack_int* ipiv )
{
@@ -42,7 +42,7 @@ lapack_int LAPACKE_zhetrf( int matrix_layout, char uplo, lapack_int n,
lapack_complex_double* work = NULL;
lapack_complex_double work_query;
if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
- LAPACKE_xerbla( "LAPACKE_zhetrf", -1 );
+ LAPACKE_xerbla( "LAPACKE_zhetrf_aa", -1 );
return -1;
}
#ifndef LAPACK_DISABLE_NAN_CHECK
@@ -72,7 +72,7 @@ lapack_int LAPACKE_zhetrf( int matrix_layout, char uplo, lapack_int n,
LAPACKE_free( work );
exit_level_0:
if( info == LAPACK_WORK_MEMORY_ERROR ) {
- LAPACKE_xerbla( "LAPACKE_zhetrf", info );
+ LAPACKE_xerbla( "LAPACKE_zhetrf_aa", info );
}
return info;
}
diff --git a/LAPACKE/src/lapacke_zsytrf_aa.c b/LAPACKE/src/lapacke_zsytrf_aa.c
index 28c0b9ec..f24b13f5 100644
--- a/LAPACKE/src/lapacke_zsytrf_aa.c
+++ b/LAPACKE/src/lapacke_zsytrf_aa.c
@@ -33,7 +33,7 @@
#include "lapacke_utils.h"
-lapack_int LAPACKE_zsytrf( int matrix_layout, char uplo, lapack_int n,
+lapack_int LAPACKE_zsytrf_aa( int matrix_layout, char uplo, lapack_int n,
lapack_complex_double* a, lapack_int lda,
lapack_int* ipiv )
{
@@ -42,7 +42,7 @@ lapack_int LAPACKE_zsytrf( int matrix_layout, char uplo, lapack_int n,
lapack_complex_double* work = NULL;
lapack_complex_double work_query;
if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
- LAPACKE_xerbla( "LAPACKE_zsytrf", -1 );
+ LAPACKE_xerbla( "LAPACKE_zsytrf_aa", -1 );
return -1;
}
#ifndef LAPACK_DISABLE_NAN_CHECK
@@ -72,7 +72,7 @@ lapack_int LAPACKE_zsytrf( int matrix_layout, char uplo, lapack_int n,
LAPACKE_free( work );
exit_level_0:
if( info == LAPACK_WORK_MEMORY_ERROR ) {
- LAPACKE_xerbla( "LAPACKE_zsytrf", info );
+ LAPACKE_xerbla( "LAPACKE_zsytrf_aa", info );
}
return info;
}