merge kbergstorm's change to branch

Author: guozhong.zhuang

LAPACKE/example/Makefile

@@ -1,26 +1,12 @@
 include ../../make.inc
 
-all: xexample_DGESV_rowmajor \
-     xexample_DGESV_colmajor \
-     xexample_DGELS_rowmajor \
-     xexample_DGELS_colmajor
+all: test_nancheck_DGELS
 
 LIBRARIES = ../../$(LAPACKELIB) ../../$(LAPACKLIB) $(BLASLIB)
 
 # Double Precision Examples
-xexample_DGESV_rowmajor: example_DGESV_rowmajor.o lapacke_example_aux.o $(LIBRARIES)
-	$(LOADER) $(LOADOPTS) -o $@ $^
-	./$@
-
-xexample_DGESV_colmajor: example_DGESV_colmajor.o lapacke_example_aux.o $(LIBRARIES)
-	$(LOADER) $(LOADOPTS) -o $@ $^
-	./$@
-
-xexample_DGELS_rowmajor: example_DGELS_rowmajor.o lapacke_example_aux.o $(LIBRARIES)
-	$(LOADER) $(LOADOPTS) -o $@ $^
-	./$@
 
-xexample_DGELS_colmajor: example_DGELS_colmajor.o lapacke_example_aux.o $(LIBRARIES)
+test_nancheck_DGELS: test_nancheck_DGELS.o lapacke_example_aux.o $(LIBRARIES)
 	$(LOADER) $(LOADOPTS) -o $@ $^
 	./$@
 

LAPACKE/include/lapacke.h

@@ -2398,6 +2398,28 @@ float LAPACKE_clanhe( int matrix_layout, char norm, char uplo, lapack_int n,
 double LAPACKE_zlanhe( int matrix_layout, char norm, char uplo, lapack_int n,
                            const lapack_complex_double* a, lapack_int lda );
 
+lapack_int LAPACKE_clacrm( int matrix_layout, lapack_int m, lapack_int n,
+                          const lapack_complex_float* a,
+                          lapack_int lda, const float* b,
+                          lapack_int ldb, lapack_complex_float* c,
+                          lapack_int ldc );
+lapack_int LAPACKE_zlacrm( int matrix_layout, lapack_int m, lapack_int n,
+                           const lapack_complex_double* a,
+                           lapack_int lda, const double* b,
+                           lapack_int ldb, lapack_complex_double* c,
+                           lapack_int ldc );
+
+lapack_int LAPACKE_clarcm( int matrix_layout, lapack_int m, lapack_int n,
+                          const float* a, lapack_int lda,
+                          const lapack_complex_float* b,
+                          lapack_int ldb, lapack_complex_float* c,
+                          lapack_int ldc );
+lapack_int LAPACKE_zlarcm( int matrix_layout, lapack_int m, lapack_int n,
+                           const double* a, lapack_int lda,
+                           const lapack_complex_double* b,
+                           lapack_int ldb, lapack_complex_double* c,
+                           lapack_int ldc );
+
 float LAPACKE_slansy( int matrix_layout, char norm, char uplo, lapack_int n,
                            const float* a, lapack_int lda );
 double LAPACKE_dlansy( int matrix_layout, char norm, char uplo, lapack_int n,
@@ -7586,6 +7608,28 @@ double LAPACKE_zlanhe_work( int matrix_layout, char norm, char uplo,
                                 lapack_int n, const lapack_complex_double* a,
                                 lapack_int lda, double* work );
 
+lapack_int LAPACKE_clacrm_work( int matrix_layout, lapack_int m, lapack_int n,
+                                const lapack_complex_float* a,
+                                lapack_int lda, const float* b,
+                                lapack_int ldb, lapack_complex_float* c,
+                                lapack_int ldc, float* work );
+lapack_int LAPACKE_zlacrm_work( int matrix_layout, lapack_int m, lapack_int n,
+                                const lapack_complex_double* a,
+                                lapack_int lda, const double* b,
+                                lapack_int ldb, lapack_complex_double* c,
+                                lapack_int ldc, double* work );
+
+lapack_int LAPACKE_clarcm_work( int matrix_layout, lapack_int m, lapack_int n,
+                                const float* a, lapack_int lda,
+                                const lapack_complex_float* b,
+                                lapack_int ldb, lapack_complex_float* c,
+                                lapack_int ldc, float* work );
+lapack_int LAPACKE_zlarcm_work( int matrix_layout, lapack_int m, lapack_int n,
+                                const double* a, lapack_int lda,
+                                const lapack_complex_double* b,
+                                lapack_int ldb, lapack_complex_double* c,
+                                lapack_int ldc, double* work );
+
 float LAPACKE_slansy_work( int matrix_layout, char norm, char uplo,
                                 lapack_int n, const float* a, lapack_int lda,
                                 float* work );
@@ -13347,6 +13391,10 @@ lapack_int LAPACKE_zhegv_2stage_work( int matrix_layout, lapack_int itype, char
 #define LAPACK_zlange LAPACK_GLOBAL(zlange,ZLANGE)
 #define LAPACK_clanhe LAPACK_GLOBAL(clanhe,CLANHE)
 #define LAPACK_zlanhe LAPACK_GLOBAL(zlanhe,ZLANHE)
+#define LAPACK_clarcm LAPACK_GLOBAL(clarcm,CLARCM)
+#define LAPACK_zlarcm LAPACK_GLOBAL(zlarcm,ZLARCM)
+#define LAPACK_clacrm LAPACK_GLOBAL(clacrm,CLACRM)
+#define LAPACK_zlacrm LAPACK_GLOBAL(zlacrm,ZLACRM)
 #define LAPACK_slansy LAPACK_GLOBAL(slansy,SLANSY)
 #define LAPACK_dlansy LAPACK_GLOBAL(dlansy,DLANSY)
 #define LAPACK_clansy LAPACK_GLOBAL(clansy,CLANSY)
@@ -17896,6 +17944,22 @@ float LAPACK_clanhe( char* norm, char* uplo, lapack_int* n,
                     const lapack_complex_float* a, lapack_int* lda, float* work );
 double LAPACK_zlanhe( char* norm, char* uplo, lapack_int* n,
                     const lapack_complex_double* a, lapack_int* lda, double* work );
+void LAPACK_clarcm( lapack_int* m, lapack_int* n, const float* a,
+                    lapack_int* lda, const lapack_complex_float* b,
+                    lapack_int* ldb, lapack_complex_float* c,
+                    lapack_int* ldc, float* work );
+void LAPACK_zlarcm( lapack_int* m, lapack_int* n, const double* a,
+                    lapack_int* lda, const lapack_complex_double* b,
+                    lapack_int* ldb, lapack_complex_double* c,
+                    lapack_int* ldc, double* work );
+void LAPACK_clacrm( lapack_int* m, lapack_int* n, const lapack_complex_float* a,
+                    lapack_int* lda, const float* b,
+                    lapack_int* ldb, lapack_complex_float* c,
+                    lapack_int* ldc, float* work );
+void LAPACK_zlacrm( lapack_int* m, lapack_int* n, const lapack_complex_double* a,
+                    lapack_int* lda, const double* b,
+                    lapack_int* ldb, lapack_complex_double* c,
+                    lapack_int* ldc, double* work );
 float LAPACK_slansy( char* norm, char* uplo, lapack_int* n, const float* a,
                     lapack_int* lda, float* work );
 double LAPACK_dlansy( char* norm, char* uplo, lapack_int* n, const double* a,
@@ -19076,7 +19140,6 @@ void LAPACK_zhegv_2stage( lapack_int* itype, char* jobz, char* uplo, lapack_int*
 void LAPACKE_set_nancheck( int flag );
 int LAPACKE_get_nancheck( );
 
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

LAPACKE/src/CMakeLists.txt

@@ -295,6 +295,8 @@ lapacke_clacp2.c
 lapacke_clacp2_work.c
 lapacke_clacpy.c
 lapacke_clacpy_work.c
+lapacke_clacrm.c
+lapacke_clacrm_work.c
 lapacke_clag2z.c
 lapacke_clag2z_work.c
 lapacke_clange.c
@@ -309,6 +311,8 @@ lapacke_clapmr.c
 lapacke_clapmr_work.c
 lapacke_clapmt.c
 lapacke_clapmt_work.c
+lapacke_clarcm.c
+lapacke_clarcm_work.c
 lapacke_clarfb.c
 lapacke_clarfb_work.c
 lapacke_clarfg.c
@@ -1141,6 +1145,7 @@ lapacke_dtrttp.c
 lapacke_dtrttp_work.c
 lapacke_dtzrzf.c
 lapacke_dtzrzf_work.c
+lapacke_nancheck.c
 lapacke_sbbcsd.c
 lapacke_sbbcsd_work.c
 lapacke_sbdsdc.c
@@ -1987,6 +1992,8 @@ lapacke_zlacp2.c
 lapacke_zlacp2_work.c
 lapacke_zlacpy.c
 lapacke_zlacpy_work.c
+lapacke_zlacrm.c
+lapacke_zlacrm_work.c
 lapacke_zlag2c.c
 lapacke_zlag2c_work.c
 lapacke_zlange.c
@@ -2001,6 +2008,8 @@ lapacke_zlapmr.c
 lapacke_zlapmr_work.c
 lapacke_zlapmt.c
 lapacke_zlapmt_work.c
+lapacke_zlarcm.c
+lapacke_zlarcm_work.c
 lapacke_zlarfb.c
 lapacke_zlarfb_work.c
 lapacke_zlarfg.c

LAPACKE/src/Makefile

@@ -334,6 +334,8 @@ lapacke_clacp2.o \
 lapacke_clacp2_work.o \
 lapacke_clacpy.o \
 lapacke_clacpy_work.o \
+lapacke_clacrm.o \
+lapacke_clacrm_work.o \
 lapacke_clag2z.o \
 lapacke_clag2z_work.o \
 lapacke_clange.o \
@@ -348,6 +350,8 @@ lapacke_clapmr.o \
 lapacke_clapmr_work.o \
 lapacke_clapmt.o \
 lapacke_clapmt_work.o \
+lapacke_clarcm.o \
+lapacke_clarcm_work.o \
 lapacke_clarfb.o \
 lapacke_clarfb_work.o \
 lapacke_clarfg.o \
@@ -1182,7 +1186,7 @@ lapacke_dtrttp.o \
 lapacke_dtrttp_work.o \
 lapacke_dtzrzf.o \
 lapacke_dtzrzf_work.o \
-lapacke_nancheck.o \
+lapacke_nancheck.o  \
 lapacke_sbbcsd.o \
 lapacke_sbbcsd_work.o \
 lapacke_sbdsdc.o \
@@ -2035,6 +2039,8 @@ lapacke_zlacp2.o \
 lapacke_zlacp2_work.o \
 lapacke_zlacpy.o \
 lapacke_zlacpy_work.o \
+lapacke_zlacrm.o \
+lapacke_zlacrm_work.o \
 lapacke_zlag2c.o \
 lapacke_zlag2c_work.o \
 lapacke_zlange.o \
@@ -2049,6 +2055,8 @@ lapacke_zlapmr.o \
 lapacke_zlapmr_work.o \
 lapacke_zlapmt.o \
 lapacke_zlapmt_work.o \
+lapacke_zlarcm.o \
+lapacke_zlarcm_work.o \
 lapacke_zlarfb.o \
 lapacke_zlarfb_work.o \
 lapacke_zlarfg.o \

LAPACKE/src/lapacke_clacrm.c

@@ -0,0 +1,76 @@
+/*****************************************************************************
+  Copyright (c) 2017, Intel Corp.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Intel Corporation nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************
+* Contents: Native high-level C interface to LAPACK function clacrm
+* Author: Intel Corporation
+* Generated June 2017
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int LAPACKE_clacrm(int matrix_layout, lapack_int m,
+                           lapack_int n, const lapack_complex_float* a,
+                           lapack_int lda, const float* b, lapack_int ldb,
+                           lapack_complex_float* c, lapack_int ldc)
+{
+    lapack_int info = 0;
+    float* rwork = NULL;
+
+    if (matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR) {
+        LAPACKE_xerbla("LAPACKE_clacrm", -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 -4;
+        }
+        if( LAPACKE_sge_nancheck( matrix_layout, n, n, b, ldb ) ) {
+            return -6;
+        }
+    }
+#endif
+    /* Allocate memory for work array(s) */
+    rwork = (float*)
+        LAPACKE_malloc(sizeof(float) * MAX(1, 2 * m * n));
+    if (rwork == NULL) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    /* Call middle-level interface */
+    info = LAPACKE_clacrm_work(matrix_layout, m, n, a, lda, b, ldb,
+                                c, ldc, rwork);
+    /* Release memory and exit */
+    LAPACKE_free(rwork);
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        LAPACKE_xerbla( "LAPACKE_clacrm", info );
+    }
+    return info;
+}