Skip to content

Commit

Permalink
Merge 3b4587f into 6d6189d
Browse files Browse the repository at this point in the history
  • Loading branch information
sknepper authored May 8, 2023
2 parents 6d6189d + 3b4587f commit 229ed65
Show file tree
Hide file tree
Showing 12 changed files with 455 additions and 1 deletion.
32 changes: 32 additions & 0 deletions LAPACKE/include/lapack.h
Original file line number Diff line number Diff line change
Expand Up @@ -11513,6 +11513,22 @@ void LAPACK_sorgtsqr_row(
float* work, lapack_int const* lwork,
lapack_int* info );

#define LAPACK_dorhr_col LAPACK_GLOBAL(dorhr_col,DORHR_COL)
void LAPACK_dorhr_col(
lapack_int const* m, lapack_int const* n,
lapack_int const* nb, double* A,
lapack_int const* lda, double* T,
lapack_int const* ldt, double* D,
lapack_int* info );

#define LAPACK_sorhr_col LAPACK_GLOBAL(sorhr_col,SORHR_COL)
void LAPACK_sorhr_col(
lapack_int const* m, lapack_int const* n,
lapack_int const* nb, float* A,
lapack_int const* lda, float* T,
lapack_int const* ldt, float* D,
lapack_int* info );

#define LAPACK_dormbr_base LAPACK_GLOBAL(dormbr,DORMBR)
void LAPACK_dormbr_base(
char const* vect, char const* side, char const* trans,
Expand Down Expand Up @@ -22704,6 +22720,22 @@ void LAPACK_zungtsqr_row(
lapack_complex_double* work, lapack_int const* lwork,
lapack_int* info );

#define LAPACK_cunhr_col LAPACK_GLOBAL(cunhr_col,CUNHR_COL)
void LAPACK_cunhr_col(
lapack_int const* m, lapack_int const* n,
lapack_int const* nb, lapack_complex_float* A,
lapack_int const* lda, lapack_complex_float* T,
lapack_int const* ldt, lapack_complex_float* D,
lapack_int* info );

#define LAPACK_zunhr_col LAPACK_GLOBAL(zunhr_col,ZUNHR_COL)
void LAPACK_zunhr_col(
lapack_int const* m, lapack_int const* n,
lapack_int const* nb, lapack_complex_double* A,
lapack_int const* lda, lapack_complex_double* T,
lapack_int const* ldt, lapack_complex_double* D,
lapack_int* info );

#define LAPACK_cunmbr_base LAPACK_GLOBAL(cunmbr,CUNMBR)
void LAPACK_cunmbr_base(
char const* vect, char const* side, char const* trans,
Expand Down
36 changes: 35 additions & 1 deletion LAPACKE/include/lapacke.h
Original file line number Diff line number Diff line change
Expand Up @@ -12727,7 +12727,41 @@ lapack_int LAPACKE_zhetrs_aa_2stage_work( int matrix_layout, char uplo, lapack_i
lapack_int lda, lapack_complex_double* tb,
lapack_int ltb, lapack_int* ipiv, lapack_int* ipiv2,
lapack_complex_double* b, lapack_int ldb );


//LAPACK 3.10.0
lapack_int LAPACKE_sorhr_col( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, float* a,
lapack_int lda, float* t,
lapack_int ldt, float* d );
lapack_int LAPACKE_sorhr_col_work( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, float* a,
lapack_int lda, float* t,
lapack_int ldt, float* d );
lapack_int LAPACKE_dorhr_col( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, double* a,
lapack_int lda, double* t,
lapack_int ldt, double* d );
lapack_int LAPACKE_dorhr_col_work( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, double* a,
lapack_int lda, double* t,
lapack_int ldt, double* d );
lapack_int LAPACKE_cunhr_col( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, lapack_complex_float* a,
lapack_int lda, lapack_complex_float* t,
lapack_int ldt, lapack_complex_float* d );
lapack_int LAPACKE_cunhr_col_work( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, lapack_complex_float* a,
lapack_int lda, lapack_complex_float* t,
lapack_int ldt, lapack_complex_float* d );
lapack_int LAPACKE_zunhr_col( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, lapack_complex_double* a,
lapack_int lda, lapack_complex_double* t,
lapack_int ldt, lapack_complex_double* d );
lapack_int LAPACKE_zunhr_col_work( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, lapack_complex_double* a,
lapack_int lda, lapack_complex_double* t,
lapack_int ldt, lapack_complex_double* d );

/* APIs for set/get nancheck flags */
void LAPACKE_set_nancheck( int flag );
int LAPACKE_get_nancheck( void );
Expand Down
8 changes: 8 additions & 0 deletions LAPACKE/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,8 @@ lapacke_cungtr.c
lapacke_cungtr_work.c
lapacke_cungtsqr_row.c
lapacke_cungtsqr_row_work.c
lapacke_cunhr_col.c
lapacke_cunhr_col_work.c
lapacke_cunmbr.c
lapacke_cunmbr_work.c
lapacke_cunmhr.c
Expand Down Expand Up @@ -863,6 +865,8 @@ lapacke_dorgtr.c
lapacke_dorgtr_work.c
lapacke_dorgtsqr_row.c
lapacke_dorgtsqr_row_work.c
lapacke_dorhr_col.c
lapacke_dorhr_col_work.c
lapacke_dormbr.c
lapacke_dormbr_work.c
lapacke_dormhr.c
Expand Down Expand Up @@ -1442,6 +1446,8 @@ lapacke_sorgtr.c
lapacke_sorgtr_work.c
lapacke_sorgtsqr_row.c
lapacke_sorgtsqr_row_work.c
lapacke_sorhr_col.c
lapacke_sorhr_col_work.c
lapacke_sormbr.c
lapacke_sormbr_work.c
lapacke_sormhr.c
Expand Down Expand Up @@ -2362,6 +2368,8 @@ lapacke_zungtr.c
lapacke_zungtr_work.c
lapacke_zungtsqr_row.c
lapacke_zungtsqr_row_work.c
lapacke_zunhr_col.c
lapacke_zunhr_col_work.c
lapacke_zunmbr.c
lapacke_zunmbr_work.c
lapacke_zunmhr.c
Expand Down
8 changes: 8 additions & 0 deletions LAPACKE/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,8 @@ lapacke_cungtr.o \
lapacke_cungtr_work.o \
lapacke_cungtsqr_row.o \
lapacke_cungtsqr_row_work.o \
lapacke_cunhr_col.o \
lapacke_cunhr_col_work.o \
lapacke_cunmbr.o \
lapacke_cunmbr_work.o \
lapacke_cunmhr.o \
Expand Down Expand Up @@ -910,6 +912,8 @@ lapacke_dorgtr.o \
lapacke_dorgtr_work.o \
lapacke_dorgtsqr_row.o \
lapacke_dorgtsqr_row_work.o \
lapacke_dorhr_col.o \
lapacke_dorhr_col_work.o \
lapacke_dormbr.o \
lapacke_dormbr_work.o \
lapacke_dormhr.o \
Expand Down Expand Up @@ -1484,6 +1488,8 @@ lapacke_sorgtr.o \
lapacke_sorgtr_work.o \
lapacke_sorgtsqr_row.o \
lapacke_sorgtsqr_row_work.o \
lapacke_sorhr_col.o \
lapacke_sorhr_col_work.o \
lapacke_sormbr.o \
lapacke_sormbr_work.o \
lapacke_sormhr.o \
Expand Down Expand Up @@ -2404,6 +2410,8 @@ lapacke_zungtr.o \
lapacke_zungtr_work.o \
lapacke_zungtsqr_row.o \
lapacke_zungtsqr_row_work.o \
lapacke_zunhr_col.o \
lapacke_zunhr_col_work.o \
lapacke_zunmbr.o \
lapacke_zunmbr_work.o \
lapacke_zunmhr.o \
Expand Down
24 changes: 24 additions & 0 deletions LAPACKE/src/lapacke_cunhr_col.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#include "lapacke_utils.h"

lapack_int LAPACKE_cunhr_col( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, lapack_complex_float* a,
lapack_int lda, lapack_complex_float* t,
lapack_int ldt, lapack_complex_float* d)
{
lapack_int info = 0;
if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
LAPACKE_xerbla( "LAPACKE_cunhr_col", -1 );
return -1;
}
#ifndef LAPACK_DISABLE_NAN_CHECK
if( LAPACKE_get_nancheck() ) {
/* Optionally check input matrices for NaNs */
if( LAPACKE_cge_nancheck( matrix_layout, m, n, a, lda ) ) {
return -5;
}
}
#endif
/* Call middle-level interface */
info = LAPACKE_cunhr_col_work( matrix_layout, m, n, nb, a, lda, t, ldt, d );
return info;
}
69 changes: 69 additions & 0 deletions LAPACKE/src/lapacke_cunhr_col_work.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#include "lapacke_utils.h"

lapack_int LAPACKE_cunhr_col_work( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, lapack_complex_float* a,
lapack_int lda, lapack_complex_float* t,
lapack_int ldt, lapack_complex_float* d )
{
lapack_int info = 0;
if( matrix_layout == LAPACK_COL_MAJOR ) {
/* Call LAPACK function and adjust info */
LAPACK_cunhr_col( &m, &n, &nb, a, &lda, t, &ldt, d, &info );
if( info < 0 ) {
info = info - 1;
}
} else if( matrix_layout == LAPACK_ROW_MAJOR ) {
lapack_int lda_t = MAX(1,m);
lapack_int ldt_t = MAX(1,MIN(nb,n));
lapack_complex_float* a_t = NULL;
lapack_complex_float* t_t = NULL;
/* Check leading dimension(s) */
if( lda < n ) {
info = -6;
LAPACKE_xerbla( "LAPACKE_cunhr_col_work", info );
return info;
}
if( ldt < n ) {
info = -8;
LAPACKE_xerbla( "LAPACKE_cunhr_col_work", info );
return info;
}
/* Allocate memory for temporary array(s) */
a_t = (lapack_complex_float*)
LAPACKE_malloc( sizeof(lapack_complex_float) * lda_t * MAX(1,n) );
if( a_t == NULL ) {
info = LAPACK_TRANSPOSE_MEMORY_ERROR;
goto exit_level_0;
}
t_t = (lapack_complex_float*)
LAPACKE_malloc( sizeof(lapack_complex_float) *
ldt_t * MAX(1,n) );
if( t_t == NULL ) {
info = LAPACK_TRANSPOSE_MEMORY_ERROR;
goto exit_level_1;
}
/* Transpose input matrices */
LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
/* Call LAPACK function and adjust info */
LAPACK_cunhr_col( &m, &n, &nb, a_t, &lda_t, t_t, &ldt_t, d, &info );
if( info < 0 ) {
info = info - 1;
}
/* Transpose output matrices */
LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
LAPACKE_cge_trans( LAPACK_COL_MAJOR, ldt, n, t_t, ldt_t, t,
ldt );
/* Release memory and exit */
LAPACKE_free( t_t );
exit_level_1:
LAPACKE_free( a_t );
exit_level_0:
if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
LAPACKE_xerbla( "LAPACKE_cunhr_col_work", info );
}
} else {
info = -1;
LAPACKE_xerbla( "LAPACKE_cunhr_col_work", info );
}
return info;
}
24 changes: 24 additions & 0 deletions LAPACKE/src/lapacke_dorhr_col.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#include "lapacke_utils.h"

lapack_int LAPACKE_dorhr_col( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, double* a,
lapack_int lda, double* t,
lapack_int ldt, double* d)
{
lapack_int info = 0;
if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
LAPACKE_xerbla( "LAPACKE_dorhr_col", -1 );
return -1;
}
#ifndef LAPACK_DISABLE_NAN_CHECK
if( LAPACKE_get_nancheck() ) {
/* Optionally check input matrices for NaNs */
if( LAPACKE_dge_nancheck( matrix_layout, m, n, a, lda ) ) {
return -5;
}
}
#endif
/* Call middle-level interface */
info = LAPACKE_dorhr_col_work( matrix_layout, m, n, nb, a, lda, t, ldt, d );
return info;
}
69 changes: 69 additions & 0 deletions LAPACKE/src/lapacke_dorhr_col_work.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#include "lapacke_utils.h"

lapack_int LAPACKE_dorhr_col_work( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, double* a,
lapack_int lda, double* t,
lapack_int ldt, double* d )
{
lapack_int info = 0;
if( matrix_layout == LAPACK_COL_MAJOR ) {
/* Call LAPACK function and adjust info */
LAPACK_dorhr_col( &m, &n, &nb, a, &lda, t, &ldt, d, &info );
if( info < 0 ) {
info = info - 1;
}
} else if( matrix_layout == LAPACK_ROW_MAJOR ) {
lapack_int lda_t = MAX(1,m);
lapack_int ldt_t = MAX(1,MIN(nb,n));
double* a_t = NULL;
double* t_t = NULL;
/* Check leading dimension(s) */
if( lda < n ) {
info = -6;
LAPACKE_xerbla( "LAPACKE_dorhr_col_work", info );
return info;
}
if( ldt < n ) {
info = -8;
LAPACKE_xerbla( "LAPACKE_dorhr_col_work", info );
return info;
}
/* Allocate memory for temporary array(s) */
a_t = (double*)
LAPACKE_malloc( sizeof(double) * lda_t * MAX(1,n) );
if( a_t == NULL ) {
info = LAPACK_TRANSPOSE_MEMORY_ERROR;
goto exit_level_0;
}
t_t = (double*)
LAPACKE_malloc( sizeof(double) *
ldt_t * MAX(1,n) );
if( t_t == NULL ) {
info = LAPACK_TRANSPOSE_MEMORY_ERROR;
goto exit_level_1;
}
/* Transpose input matrices */
LAPACKE_dge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
/* Call LAPACK function and adjust info */
LAPACK_dorhr_col( &m, &n, &nb, a_t, &lda_t, t_t, &ldt_t, d, &info );
if( info < 0 ) {
info = info - 1;
}
/* Transpose output matrices */
LAPACKE_dge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
LAPACKE_dge_trans( LAPACK_COL_MAJOR, ldt, n, t_t, ldt_t, t,
ldt );
/* Release memory and exit */
LAPACKE_free( t_t );
exit_level_1:
LAPACKE_free( a_t );
exit_level_0:
if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
LAPACKE_xerbla( "LAPACKE_dorhr_col_work", info );
}
} else {
info = -1;
LAPACKE_xerbla( "LAPACKE_dorhr_col_work", info );
}
return info;
}
24 changes: 24 additions & 0 deletions LAPACKE/src/lapacke_sorhr_col.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#include "lapacke_utils.h"

lapack_int LAPACKE_sorhr_col( int matrix_layout, lapack_int m, lapack_int n,
lapack_int nb, float* a,
lapack_int lda, float* t,
lapack_int ldt, float* d)
{
lapack_int info = 0;
if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
LAPACKE_xerbla( "LAPACKE_sorhr_col", -1 );
return -1;
}
#ifndef LAPACK_DISABLE_NAN_CHECK
if( LAPACKE_get_nancheck() ) {
/* Optionally check input matrices for NaNs */
if( LAPACKE_sge_nancheck( matrix_layout, m, n, a, lda ) ) {
return -5;
}
}
#endif
/* Call middle-level interface */
info = LAPACKE_sorhr_col_work( matrix_layout, m, n, nb, a, lda, t, ldt, d );
return info;
}
Loading

0 comments on commit 229ed65

Please sign in to comment.