Migrated 'bl2' prefix to 'bli'.

Details:
- Changed all filename and function prefixes from 'bl2' to 'bli'.
- Changed the "blis2.h" header filename to "blis.h" and changed all
  corresponding #include statements accordingly.
- Fixed incorrect association for Fran in CREDITS file.

CREDITS

@@ -23,7 +23,7 @@ but many others have contributed input and feedback, including:
 Thanks go the following individuals for porting very early versions of
 BLIS to new architectures as proofs-of-concept:
 
-  Francisco Igual             (The University of Texas at Austin)
+  Francisco Igual             (Universidad Complutense de Madrid)
   Tyler Smith                 (The University of Texas at Austin)
 
 BLIS's development was partially funded by grants from Microsoft and the

INSTALL

@@ -38,27 +38,27 @@ When creating your configuration sub-directory, you can use the reference
 configuration as a template:
 
   > ls config/reference
-  bl2_config.h  bl2_kernel.h  make_defs.mk
+  bli_config.h  bli_kernel.h  make_defs.mk
   > cp -r config/reference config/x86-64opt
   > ls config/x86-64opt
-  bl2_config.h  bl2_kernel.h  make_defs.mk
+  bli_config.h  bli_kernel.h  make_defs.mk
 
 Then you would edit each of these three files. Here are some special notes
 about each file:
 
-  o bl2_config.h
+  o bli_config.h
     - This is where you specify most of the parameters of your BLIS
       configuration, including (but not limited to) such things as register
       and cache blocksizes used by the micro-kernel(s).
 
-  o bl2_kernel.h
+  o bli_kernel.h
     - This file defines C preprocessor macros associated with various kernels
       and micro-kernels. The reference configuration defines all kernels to
       use reference implementations (which are provided as part of the BLIS
       framework). If you end up writing your own optimized kernel for some
       operation, be sure and enable its use here. Notice that you only have to
       set ONE definition for each operation, as BLIS prepends s,d,c,z (as well
-      as the BLIS function prefix, currently 'bl2_') to the names to create
+      as the BLIS function prefix, currently 'bli_') to the names to create
       the actual datatype instances.
     - IMPORTANT: If you add your own kernels, OR if you use kernels provided
       with the BLIS framework distribution (i.e., in the 'kernels' directory),
@@ -70,12 +70,12 @@ about each file:
         > pwd
         /home/field/google_code/blis/config/x86-64opt
         > ls
-        bl2_config.h  bl2_kernel.h  make_defs.mk
+        bli_config.h  bli_kernel.h  make_defs.mk
         > ls ../../kernels
         x86  x86_64
         > ln -s ../../kernels/x86_64 kernels
         > ls
-        bl2_config.h  bl2_kernel.h  kernels  make_defs.mk
+        bli_config.h  bli_kernel.h  kernels  make_defs.mk
         > ls -l kernels
         lrwxrwxrwx 1 field dept 20 Dec  1 18:13 kernels -> ../../kernels/x86_64
 
@@ -169,14 +169,14 @@ a library by running 'make':
 
 Running 'make' will result in output similar to:
 
-  Compiling frame/1/axpyv/bl2_axpyv.c
-  Compiling frame/1/axpyv/bl2_axpyv_check.c
-  Compiling frame/1/axpyv/bl2_axpyv_unb_var1.c
-  Compiling frame/1/copynzv/bl2_copynzv.c
-  Compiling frame/1/copynzv/bl2_copynzv_check.c
-  Compiling frame/1/copynzv/bl2_copynzv_unb_var1.c
-  Compiling frame/1/copyv/bl2_copyv.c
-  Compiling frame/1/copyv/bl2_copyv_check.c
+  Compiling frame/1/axpyv/bli_axpyv.c
+  Compiling frame/1/axpyv/bli_axpyv_check.c
+  Compiling frame/1/axpyv/bli_axpyv_unb_var1.c
+  Compiling frame/1/copynzv/bli_copynzv.c
+  Compiling frame/1/copynzv/bli_copynzv_check.c
+  Compiling frame/1/copynzv/bli_copynzv_unb_var1.c
+  Compiling frame/1/copyv/bli_copyv.c
+  Compiling frame/1/copyv/bli_copyv_check.c
 
 If you want to see the individual command line invocations of the compiler,
 edit your configuration's make_defs.mk to contain:
@@ -201,12 +201,12 @@ STEP 4: INSTALLATION
 
 Toward the end of compilation, you should get output similar to:
 
-  Compiling frame/util/randv/bl2_randv.c
-  Compiling frame/util/randv/bl2_randv_unb_var1.c
-  Compiling frame/util/sets/bl2_sets.c
-  Compiling frame/base/noopt/bl2_dlamch.c (NOTE: optimizations disabled)
-  Compiling frame/base/noopt/bl2_lsame.c (NOTE: optimizations disabled)
-  Compiling frame/base/noopt/bl2_slamch.c (NOTE: optimizations disabled)
+  Compiling frame/util/randv/bli_randv.c
+  Compiling frame/util/randv/bli_randv_unb_var1.c
+  Compiling frame/util/sets/bli_sets.c
+  Compiling frame/base/noopt/bli_dlamch.c (NOTE: optimizations disabled)
+  Compiling frame/base/noopt/bli_lsame.c (NOTE: optimizations disabled)
+  Compiling frame/base/noopt/bli_slamch.c (NOTE: optimizations disabled)
   Archiving lib/reference/libblis.a
 
 Now you have a BLIS library sitting in the 'lib/<configname>/' directory. To

config/clarksville/bli_kernel.h

@@ -199,9 +199,9 @@
 
 // -- LEVEL-3 KERNEL DEFINITIONS -----------------------------------------------
 
-#include "bl2_gemm_opt_d4x4.h"
-#include "bl2_gemmtrsm_l_opt_d4x4.h"
-#include "bl2_gemmtrsm_u_opt_d4x4.h"
+#include "bli_gemm_opt_d4x4.h"
+#include "bli_gemmtrsm_l_opt_d4x4.h"
+#include "bli_gemmtrsm_u_opt_d4x4.h"
 
 // -- dupl --
 
@@ -249,11 +249,11 @@
 
 // -- LEVEL-1F KERNEL DEFINITIONS ----------------------------------------------
 
-#include "bl2_axpy2v_opt_var1.h"
-#include "bl2_dotaxpyv_opt_var1.h"
-#include "bl2_axpyf_opt_var1.h"
-#include "bl2_dotxf_opt_var1.h"
-#include "bl2_dotxaxpyf_opt_var1.h"
+#include "bli_axpy2v_opt_var1.h"
+#include "bli_dotaxpyv_opt_var1.h"
+#include "bli_axpyf_opt_var1.h"
+#include "bli_dotxf_opt_var1.h"
+#include "bli_dotxaxpyf_opt_var1.h"
 
 // -- axpy2v --
 
@@ -279,8 +279,8 @@
 
 // -- LEVEL-1V KERNEL DEFINITIONS ----------------------------------------------
 
-#include "bl2_axpyv_opt_var1.h"
-#include "bl2_dotv_opt_var1.h"
+#include "bli_axpyv_opt_var1.h"
+#include "bli_dotv_opt_var1.h"
 
 // -- addv --
 

config/reference/bli_config.h

@@ -102,7 +102,7 @@
 // -- MISCELLANEOUS OPTIONS ----------------------------------------------------
 
 // Stay initialized after auto-initialization, unless and until the user
-// explicitly calls bl2_finalize().
+// explicitly calls bli_finalize().
 #define BLIS_ENABLE_STAY_AUTO_INITIALIZED
 
 

frame/0/absqsc/bli_absqsc.c

@@ -32,19 +32,19 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
 // Define object-based interface.
 //
-void bl2_absqsc( obj_t* chi,
+void bli_absqsc( obj_t* chi,
                  obj_t* absq )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_absqsc_check( chi, absq );
+	if ( bli_error_checking_is_enabled() )
+		bli_absqsc_check( chi, absq );
 
-	bl2_absqsc_unb_var1( chi, absq );
+	bli_absqsc_unb_var1( chi, absq );
 }
 
 

frame/0/absqsc/bli_absqsc.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_absqsc_check.h"
-#include "bl2_absqsc_unb_var1.h"
+#include "bli_absqsc_check.h"
+#include "bli_absqsc_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_absqsc( obj_t* chi,
+void bli_absqsc( obj_t* chi,
                  obj_t* absq );
 
 

frame/0/absqsc/bli_absqsc_check.c

@@ -32,40 +32,40 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_absqsc_check( obj_t* chi,
+void bli_absqsc_check( obj_t* chi,
                        obj_t* absq )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_noninteger_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( absq );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( absq );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_real_object( absq );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_real_object( absq );
+	bli_check_error_code( e_val );
 
 /*
 	// FGVZ: FIXME. This is a hack. We should have a _check_datatype_real_proj()
 	// or something similar.
-	if ( !bl2_obj_is_const( *chi ) &&
-	     bl2_obj_datatype( *absq ) !=
-	     bl2_obj_datatype_proj_to_real( *chi ) ) bl2_abort();
+	if ( !bli_obj_is_const( *chi ) &&
+	     bli_obj_datatype( *absq ) !=
+	     bli_obj_datatype_proj_to_real( *chi ) ) bli_abort();
 */
-	e_val = bl2_check_object_real_proj_of( chi, absq );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_object_real_proj_of( chi, absq );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( absq );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( absq );
+	bli_check_error_code( e_val );
 }
 

frame/0/absqsc/bli_absqsc_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_absqsc_check( obj_t* chi,
+void bli_absqsc_check( obj_t* chi,
                        obj_t* absq );

frame/0/absqsc/bli_absqsc_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T absqsc_fp
 
@@ -44,22 +44,22 @@ typedef void (*FUNCPTR_T)(
 static FUNCPTR_T GENARRAY(ftypes,absqsc_unb_var1);
 
 
-void bl2_absqsc_unb_var1( obj_t* chi,
+void bli_absqsc_unb_var1( obj_t* chi,
                           obj_t* absq )
 {
 	num_t     dt_chi;
-	num_t     dt_absq_c  = bl2_obj_datatype_proj_to_complex( *absq );
+	num_t     dt_absq_c  = bli_obj_datatype_proj_to_complex( *absq );
 
 	void*     buf_chi;
 
-	void*     buf_absq   = bl2_obj_buffer_at_off( *absq );
+	void*     buf_absq   = bli_obj_buffer_at_off( *absq );
 
 	FUNCPTR_T f;
 
 	// If chi is a scalar constant, use dt_absq_c to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the chi object and extract the buffer at the chi offset.
-	bl2_set_scalar_dt_buffer( chi, dt_absq_c, dt_chi, buf_chi );
+	bli_set_scalar_dt_buffer( chi, dt_absq_c, dt_chi, buf_chi );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.

frame/0/absqsc/bli_absqsc_unb_var1.h

@@ -33,7 +33,7 @@
 */
 
 
-void bl2_absqsc_unb_var1( obj_t* chi,
+void bli_absqsc_unb_var1( obj_t* chi,
                           obj_t* absq );
 
 

frame/0/addsc/bli_addsc.c

@@ -32,19 +32,19 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
 // Define object-based interface.
 //
-void bl2_addsc( obj_t* chi,
+void bli_addsc( obj_t* chi,
                 obj_t* psi )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_addsc_check( chi, psi );
+	if ( bli_error_checking_is_enabled() )
+		bli_addsc_check( chi, psi );
 
-	bl2_addsc_unb_var1( chi, psi );
+	bli_addsc_unb_var1( chi, psi );
 }
 
 

frame/0/addsc/bli_addsc.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_addsc_check.h"
-#include "bl2_addsc_unb_var1.h"
+#include "bli_addsc_check.h"
+#include "bli_addsc_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_addsc( obj_t* chi,
+void bli_addsc( obj_t* chi,
                 obj_t* psi );
 
 

frame/0/addsc/bli_addsc_check.c

@@ -32,30 +32,30 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_divsc_check( obj_t* chi,
+void bli_addsc_check( obj_t* chi,
                       obj_t* psi )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_noninteger_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_noninteger_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( psi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( psi );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( psi );
+	bli_check_error_code( e_val );
 }
 

frame/0/addsc/bli_addsc_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_divsc_check( obj_t* chi,
+void bli_addsc_check( obj_t* chi,
                       obj_t* psi );

frame/0/addsc/bli_addsc_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T addsc_fp
 
@@ -55,13 +55,13 @@ static FUNCPTR_T GENARRAY2_MIN(ftypes,addsc_unb_var1);
 #endif
 
 
-void bl2_addsc_unb_var1( obj_t*  chi,
+void bli_addsc_unb_var1( obj_t*  chi,
                          obj_t*  psi )
 {
-	conj_t    conjchi   = bl2_obj_conj_status( *chi );
+	conj_t    conjchi   = bli_obj_conj_status( *chi );
 
-	num_t     dt_psi     = bl2_obj_datatype( *psi );
-	void*     buf_psi    = bl2_obj_buffer_at_off( *psi );
+	num_t     dt_psi     = bli_obj_datatype( *psi );
+	void*     buf_psi    = bli_obj_buffer_at_off( *psi );
 
 	num_t     dt_chi;
 	void*     buf_chi;
@@ -71,7 +71,7 @@ void bl2_addsc_unb_var1( obj_t*  chi,
 	// If beta is a scalar constant, use dt_chi_r to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the beta object and extract the buffer at the beta offset.
-	bl2_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
+	bli_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.

frame/0/addsc/bli_addsc_unb_var1.h

@@ -33,7 +33,7 @@
 */
 
 
-void bl2_addsc_unb_var1( obj_t*  chi,
+void bli_addsc_unb_var1( obj_t*  chi,
                          obj_t*  psi );
 
 

frame/0/copysc/bli_copysc.c

@@ -32,19 +32,19 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
 // Define object-based interface.
 //
-void bl2_copysc( obj_t* chi,
+void bli_copysc( obj_t* chi,
                  obj_t* psi )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_copysc_check( chi, psi );
+	if ( bli_error_checking_is_enabled() )
+		bli_copysc_check( chi, psi );
 
-	bl2_copysc_unb_var1( chi, psi );
+	bli_copysc_unb_var1( chi, psi );
 }
 
 

frame/0/copysc/bli_copysc.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_copysc_check.h"
-#include "bl2_copysc_unb_var1.h"
+#include "bli_copysc_check.h"
+#include "bli_copysc_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_copysc( obj_t* chi,
+void bli_copysc( obj_t* chi,
                  obj_t* psi );
 
 

frame/0/copysc/bli_copysc_check.c

@@ -32,30 +32,30 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_copysc_check( obj_t* chi,
+void bli_copysc_check( obj_t* chi,
                        obj_t* psi )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_noninteger_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_noninteger_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( psi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( psi );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( psi );
+	bli_check_error_code( e_val );
 }
 

frame/0/copysc/bli_copysc_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_sqrtsc_check( obj_t* chi,
+void bli_copysc_check( obj_t* chi,
                        obj_t* psi );

frame/0/copysc/bli_copysc_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T copysc_fp
 
@@ -57,14 +57,14 @@ static FUNCPTR_T GENARRAY2_ALL(ftypes,copysc_unb_var1);
 //#endif
 
 
-void bl2_copysc_unb_var1( obj_t*  chi,
+void bli_copysc_unb_var1( obj_t*  chi,
                           obj_t*  psi )
 {
 
-	conj_t    conjchi   = bl2_obj_conj_status( *chi );
+	conj_t    conjchi   = bli_obj_conj_status( *chi );
 
-	num_t     dt_psi    = bl2_obj_datatype( *psi );
-	void*     buf_psi   = bl2_obj_buffer_at_off( *psi );
+	num_t     dt_psi    = bli_obj_datatype( *psi );
+	void*     buf_psi   = bli_obj_buffer_at_off( *psi );
 
 	num_t     dt_chi;
 	void*     buf_chi;
@@ -74,7 +74,7 @@ void bl2_copysc_unb_var1( obj_t*  chi,
 	// If chi is a scalar constant, use dt_psi to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the chi object and extract the buffer at the chi offset.
-	bl2_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
+	bli_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
 
 //printf( "copysc_unb_var1(): datatypes of chi (%u) and psi (%u)\n", dt_chi, dt_psi );
 //return;
@@ -102,7 +102,7 @@ void PASTEMAC2(chx,chy,varname)( \
 	ctype_x* chi1 = chi; \
 	ctype_y* psi1 = psi; \
 \
-	if ( bl2_is_conj( conjchi ) ) \
+	if ( bli_is_conj( conjchi ) ) \
 	{ \
 		PASTEMAC2(chx,chy,copyjs)( *chi1, *psi1 ); \
 	} \

frame/0/copysc/bli_copysc_unb_var1.h

@@ -32,7 +32,7 @@
 
 */
 
-void bl2_copysc_unb_var1( obj_t* chi,
+void bli_copysc_unb_var1( obj_t* chi,
                           obj_t* psi );
 
 

frame/0/divsc/bli_divsc.c

@@ -32,19 +32,19 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
 // Define object-based interface.
 //
-void bl2_divsc( obj_t* chi,
+void bli_divsc( obj_t* chi,
                 obj_t* psi )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_divsc_check( chi, psi );
+	if ( bli_error_checking_is_enabled() )
+		bli_divsc_check( chi, psi );
 
-	bl2_divsc_unb_var1( chi, psi );
+	bli_divsc_unb_var1( chi, psi );
 }
 
 

frame/0/divsc/bli_divsc.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_divsc_check.h"
-#include "bl2_divsc_unb_var1.h"
+#include "bli_divsc_check.h"
+#include "bli_divsc_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_divsc( obj_t* chi,
+void bli_divsc( obj_t* chi,
                 obj_t* psi );
 
 

frame/0/divsc/bli_divsc_check.c

@@ -32,30 +32,30 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_subsc_check( obj_t* chi,
+void bli_divsc_check( obj_t* chi,
                       obj_t* psi )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_noninteger_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_noninteger_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( psi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( psi );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( psi );
+	bli_check_error_code( e_val );
 }
 

frame/0/divsc/bli_divsc_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_mulsc_check( obj_t* chi,
+void bli_divsc_check( obj_t* chi,
                       obj_t* psi );

frame/0/divsc/bli_divsc_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T divsc_fp
 
@@ -55,13 +55,13 @@ static FUNCPTR_T GENARRAY2_MIN(ftypes,divsc_unb_var1);
 #endif
 
 
-void bl2_divsc_unb_var1( obj_t*  chi,
+void bli_divsc_unb_var1( obj_t*  chi,
                          obj_t*  psi )
 {
-	conj_t    conjchi   = bl2_obj_conj_status( *chi );
+	conj_t    conjchi   = bli_obj_conj_status( *chi );
 
-	num_t     dt_psi     = bl2_obj_datatype( *psi );
-	void*     buf_psi    = bl2_obj_buffer_at_off( *psi );
+	num_t     dt_psi     = bli_obj_datatype( *psi );
+	void*     buf_psi    = bli_obj_buffer_at_off( *psi );
 
 	num_t     dt_chi;
 	void*     buf_chi;
@@ -71,7 +71,7 @@ void bl2_divsc_unb_var1( obj_t*  chi,
 	// If beta is a scalar constant, use dt_chi_r to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the beta object and extract the buffer at the beta offset.
-	bl2_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
+	bli_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.

frame/0/divsc/bli_divsc_unb_var1.h

@@ -33,7 +33,7 @@
 */
 
 
-void bl2_divsc_unb_var1( obj_t*  chi,
+void bli_divsc_unb_var1( obj_t*  chi,
                          obj_t*  psi );
 
 

frame/0/fnormsc/bli_fnormsc.c

@@ -32,19 +32,19 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
 // Define object-based interface.
 //
-void bl2_fnormsc( obj_t* chi,
+void bli_fnormsc( obj_t* chi,
                   obj_t* norm )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_fnormsc_check( chi, norm );
+	if ( bli_error_checking_is_enabled() )
+		bli_fnormsc_check( chi, norm );
 
-	bl2_fnormsc_unb_var1( chi, norm );
+	bli_fnormsc_unb_var1( chi, norm );
 }
 
 

frame/0/fnormsc/bli_fnormsc.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_fnormsc_check.h"
-#include "bl2_fnormsc_unb_var1.h"
+#include "bli_fnormsc_check.h"
+#include "bli_fnormsc_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_fnormsc( obj_t* chi,
+void bli_fnormsc( obj_t* chi,
                   obj_t* norm );
 
 

frame/0/fnormsc/bli_fnormsc_check.c

@@ -32,40 +32,40 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_fnormsc_check( obj_t* chi,
+void bli_fnormsc_check( obj_t* chi,
                         obj_t* norm )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_noninteger_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( norm );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( norm );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_real_object( norm );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_real_object( norm );
+	bli_check_error_code( e_val );
 
 /*
 	// FGVZ: FIXME. This is a hack. We should have a _check_datatype_real_proj()
 	// or something similar.
-	if ( !bl2_obj_is_const( *chi ) &&
-	     bl2_obj_datatype( *norm ) !=
-	     bl2_obj_datatype_proj_to_real( *chi ) ) bl2_abort();
+	if ( !bli_obj_is_const( *chi ) &&
+	     bli_obj_datatype( *norm ) !=
+	     bli_obj_datatype_proj_to_real( *chi ) ) bli_abort();
 */
-	e_val = bl2_check_object_real_proj_of( chi, norm );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_object_real_proj_of( chi, norm );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( norm );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( norm );
+	bli_check_error_code( e_val );
 }
 

frame/0/fnormsc/bli_fnormsc_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_fnormsc_check( obj_t* chi,
+void bli_fnormsc_check( obj_t* chi,
                         obj_t* norm );

frame/0/fnormsc/bli_fnormsc_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T fnormsc_fp
 
@@ -44,22 +44,22 @@ typedef void (*FUNCPTR_T)(
 static FUNCPTR_T GENARRAY(ftypes,fnormsc_unb_var1);
 
 
-void bl2_fnormsc_unb_var1( obj_t* chi,
+void bli_fnormsc_unb_var1( obj_t* chi,
                            obj_t* norm )
 {
 	num_t     dt_chi;
-	num_t     dt_norm_c  = bl2_obj_datatype_proj_to_complex( *norm );
+	num_t     dt_norm_c  = bli_obj_datatype_proj_to_complex( *norm );
 
 	void*     buf_chi;
 
-	void*     buf_norm   = bl2_obj_buffer_at_off( *norm );
+	void*     buf_norm   = bli_obj_buffer_at_off( *norm );
 
 	FUNCPTR_T f;
 
 	// If chi is a scalar constant, use dt_norm_c to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the chi object and extract the buffer at the chi offset.
-	bl2_set_scalar_dt_buffer( chi, dt_norm_c, dt_chi, buf_chi );
+	bli_set_scalar_dt_buffer( chi, dt_norm_c, dt_chi, buf_chi );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.
@@ -88,10 +88,10 @@ void PASTEMAC(chx,varname)( \
 	                            chi_r, \
 	                            chi_i ); \
 \
-	if ( bl2_is_real( PASTEMAC(chx,type) ) ) \
+	if ( bli_is_real( PASTEMAC(chx,type) ) ) \
 	{ \
 		/* norm = abs( chi_r ); */ \
-		*norm_cast = bl2_fabs( chi_r ); \
+		*norm_cast = bli_fabs( chi_r ); \
 	} \
 	else \
 	{ \

frame/0/fnormsc/bli_fnormsc_unb_var1.h

@@ -33,7 +33,7 @@
 */
 
 
-void bl2_fnormsc_unb_var1( obj_t* chi,
+void bli_fnormsc_unb_var1( obj_t* chi,
                            obj_t* norm );
 
 

frame/0/getsc/bli_getsc.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T getsc_fp
 
@@ -45,18 +45,18 @@ typedef void (*FUNCPTR_T)(
 static FUNCPTR_T GENARRAY(ftypes,getsc);
 
 
-void bl2_getsc( obj_t*  chi,
+void bli_getsc( obj_t*  chi,
                 double* beta_r,
                 double* beta_i )
 {
-	num_t     dt_chi   = bl2_obj_datatype( *chi );
+	num_t     dt_chi   = bli_obj_datatype( *chi );
 
-	void*     buf_chi  = bl2_obj_buffer_at_off( *chi );
+	void*     buf_chi  = bli_obj_buffer_at_off( *chi );
 
 	FUNCPTR_T f;
 
-	if ( bl2_error_checking_is_enabled() )
-		bl2_getsc_check( chi, beta_r, beta_i );
+	if ( bli_error_checking_is_enabled() )
+		bli_getsc_check( chi, beta_r, beta_i );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.

frame/0/getsc/bli_getsc.h

@@ -32,10 +32,10 @@
 
 */
 
-#include "bl2_getsc_check.h"
+#include "bli_getsc_check.h"
 
 
-void bl2_getsc( obj_t*  chi,
+void bli_getsc( obj_t*  chi,
                 double* beta_r,
                 double* beta_i );
 

frame/0/getsc/bli_getsc_check.c

@@ -32,9 +32,9 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_getsc_check( obj_t*  chi,
+void bli_getsc_check( obj_t*  chi,
                       double* beta_r,
                       double* beta_i )
 {
@@ -42,12 +42,12 @@ void bl2_getsc_check( obj_t*  chi,
 
 	// Check object datatypes.
 
-	e_val = bl2_check_floating_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_floating_object( chi );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 }
 

frame/0/getsc/bli_getsc_check.h

@@ -32,6 +32,6 @@
 
 */
 
-void bl2_getsc_check( obj_t*  chi,
+void bli_getsc_check( obj_t*  chi,
                       double* beta_r,
                       double* beta_i );

frame/0/mulsc/bli_mulsc.c

@@ -32,19 +32,19 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
 // Define object-based interface.
 //
-void bl2_mulsc( obj_t* chi,
+void bli_mulsc( obj_t* chi,
                 obj_t* psi )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_mulsc_check( chi, psi );
+	if ( bli_error_checking_is_enabled() )
+		bli_mulsc_check( chi, psi );
 
-	bl2_mulsc_unb_var1( chi, psi );
+	bli_mulsc_unb_var1( chi, psi );
 }
 
 

frame/0/mulsc/bli_mulsc.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_mulsc_check.h"
-#include "bl2_mulsc_unb_var1.h"
+#include "bli_mulsc_check.h"
+#include "bli_mulsc_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_mulsc( obj_t* chi,
+void bli_mulsc( obj_t* chi,
                 obj_t* psi );
 
 

frame/0/mulsc/bli_mulsc_check.c

@@ -32,30 +32,30 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_addsc_check( obj_t* chi,
+void bli_mulsc_check( obj_t* chi,
                       obj_t* psi )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_noninteger_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_noninteger_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( psi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( psi );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( psi );
+	bli_check_error_code( e_val );
 }
 

frame/0/mulsc/bli_mulsc_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_addsc_check( obj_t* chi,
+void bli_mulsc_check( obj_t* chi,
                       obj_t* psi );

frame/0/mulsc/bli_mulsc_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T mulsc_fp
 
@@ -55,13 +55,13 @@ static FUNCPTR_T GENARRAY2_MIN(ftypes,mulsc_unb_var1);
 #endif
 
 
-void bl2_mulsc_unb_var1( obj_t*  chi,
+void bli_mulsc_unb_var1( obj_t*  chi,
                          obj_t*  psi )
 {
-	conj_t    conjchi   = bl2_obj_conj_status( *chi );
+	conj_t    conjchi   = bli_obj_conj_status( *chi );
 
-	num_t     dt_psi     = bl2_obj_datatype( *psi );
-	void*     buf_psi    = bl2_obj_buffer_at_off( *psi );
+	num_t     dt_psi     = bli_obj_datatype( *psi );
+	void*     buf_psi    = bli_obj_buffer_at_off( *psi );
 
 	num_t     dt_chi;
 	void*     buf_chi;
@@ -71,7 +71,7 @@ void bl2_mulsc_unb_var1( obj_t*  chi,
 	// If beta is a scalar constant, use dt_chi_r to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the beta object and extract the buffer at the beta offset.
-	bl2_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
+	bli_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.

frame/0/mulsc/bli_mulsc_unb_var1.h

@@ -33,7 +33,7 @@
 */
 
 
-void bl2_mulsc_unb_var1( obj_t*  chi,
+void bli_mulsc_unb_var1( obj_t*  chi,
                          obj_t*  psi );
 
 

frame/0/setsc/bli_setsc.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T setsc_fp
 
@@ -45,18 +45,18 @@ typedef void (*FUNCPTR_T)(
 static FUNCPTR_T GENARRAY(ftypes,setsc);
 
 
-void bl2_setsc( double  beta_r,
+void bli_setsc( double  beta_r,
                 double  beta_i,
                 obj_t*  chi )
 {
-	num_t     dt_chi   = bl2_obj_datatype( *chi );
+	num_t     dt_chi   = bli_obj_datatype( *chi );
 
-	void*     buf_chi  = bl2_obj_buffer_at_off( *chi );
+	void*     buf_chi  = bli_obj_buffer_at_off( *chi );
 
 	FUNCPTR_T f;
 
-	if ( bl2_error_checking_is_enabled() )
-		bl2_setsc_check( beta_r, beta_i, chi );
+	if ( bli_error_checking_is_enabled() )
+		bli_setsc_check( beta_r, beta_i, chi );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.

frame/0/setsc/bli_setsc.h

@@ -32,10 +32,10 @@
 
 */
 
-#include "bl2_setsc_check.h"
+#include "bli_setsc_check.h"
 
 
-void bl2_setsc( double beta_r,
+void bli_setsc( double beta_r,
                 double beta_i,
                 obj_t* chi );
 

frame/0/setsc/bli_setsc_check.c

@@ -32,9 +32,9 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_setsc_check( double beta_r,
+void bli_setsc_check( double beta_r,
                       double beta_i,
                       obj_t* chi )
 {
@@ -42,12 +42,12 @@ void bl2_setsc_check( double beta_r,
 
 	// Check object datatypes.
 
-	e_val = bl2_check_floating_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_floating_object( chi );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 }
 

frame/0/setsc/bli_setsc_check.h

@@ -32,6 +32,6 @@
 
 */
 
-void bl2_setsc_check( double beta_r,
+void bli_setsc_check( double beta_r,
                       double beta_i,
                       obj_t* chi );

frame/0/sqrtsc/bli_sqrtsc.c

@@ -32,19 +32,19 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
 // Define object-based interface.
 //
-void bl2_sqrtsc( obj_t* chi,
+void bli_sqrtsc( obj_t* chi,
                  obj_t* psi )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_sqrtsc_check( chi, psi );
+	if ( bli_error_checking_is_enabled() )
+		bli_sqrtsc_check( chi, psi );
 
-	bl2_sqrtsc_unb_var1( chi, psi );
+	bli_sqrtsc_unb_var1( chi, psi );
 }
 
 

frame/0/sqrtsc/bli_sqrtsc.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_sqrtsc_check.h"
-#include "bl2_sqrtsc_unb_var1.h"
+#include "bli_sqrtsc_check.h"
+#include "bli_sqrtsc_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_sqrtsc( obj_t* chi,
+void bli_sqrtsc( obj_t* chi,
                  obj_t* psi );
 
 

frame/0/sqrtsc/bli_sqrtsc_check.c

@@ -32,33 +32,33 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_sqrtsc_check( obj_t* chi,
+void bli_sqrtsc_check( obj_t* chi,
                        obj_t* psi )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_noninteger_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_noninteger_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( psi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( psi );
+	bli_check_error_code( e_val );
 
-	//e_val = bl2_check_consistent_object_datatypes( chi, psi );
-	//bl2_check_error_code( e_val );
+	//e_val = bli_check_consistent_object_datatypes( chi, psi );
+	//bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( psi );
+	bli_check_error_code( e_val );
 }
 

frame/0/sqrtsc/bli_sqrtsc_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_copysc_check( obj_t* chi,
+void bli_sqrtsc_check( obj_t* chi,
                        obj_t* psi );

frame/0/sqrtsc/bli_sqrtsc_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T sqrtsc_fp
 
@@ -54,11 +54,11 @@ static FUNCPTR_T GENARRAY2_MIN(ftypes,sqrtsc_unb_var1);
 #endif
 
 
-void bl2_sqrtsc_unb_var1( obj_t*  chi,
+void bli_sqrtsc_unb_var1( obj_t*  chi,
                           obj_t*  psi )
 {
-	num_t     dt_psi    = bl2_obj_datatype( *psi );
-	void*     buf_psi   = bl2_obj_buffer_at_off( *psi );
+	num_t     dt_psi    = bli_obj_datatype( *psi );
+	void*     buf_psi   = bli_obj_buffer_at_off( *psi );
 
 	num_t     dt_chi;
 	void*     buf_chi;
@@ -68,7 +68,7 @@ void bl2_sqrtsc_unb_var1( obj_t*  chi,
 	// If chi is a scalar constant, use dt_psi to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the chi object and extract the buffer at the chi offset.
-	bl2_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
+	bli_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.

frame/0/sqrtsc/bli_sqrtsc_unb_var1.h

@@ -32,7 +32,7 @@
 
 */
 
-void bl2_sqrtsc_unb_var1( obj_t* chi,
+void bli_sqrtsc_unb_var1( obj_t* chi,
                           obj_t* psi );
 
 

frame/0/subsc/bli_subsc.c

@@ -32,19 +32,19 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
 // Define object-based interface.
 //
-void bl2_subsc( obj_t* chi,
+void bli_subsc( obj_t* chi,
                 obj_t* psi )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_subsc_check( chi, psi );
+	if ( bli_error_checking_is_enabled() )
+		bli_subsc_check( chi, psi );
 
-	bl2_subsc_unb_var1( chi, psi );
+	bli_subsc_unb_var1( chi, psi );
 }
 
 

frame/0/subsc/bli_subsc.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_subsc_check.h"
-#include "bl2_subsc_unb_var1.h"
+#include "bli_subsc_check.h"
+#include "bli_subsc_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_subsc( obj_t* chi,
+void bli_subsc( obj_t* chi,
                 obj_t* psi );
 
 

frame/0/subsc/bli_subsc_check.c

@@ -32,30 +32,30 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_mulsc_check( obj_t* chi,
+void bli_subsc_check( obj_t* chi,
                       obj_t* psi )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_noninteger_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_noninteger_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( psi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( psi );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( psi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( psi );
+	bli_check_error_code( e_val );
 }
 

frame/0/subsc/bli_subsc_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_subsc_check( obj_t* chi,
+void bli_subsc_check( obj_t* chi,
                       obj_t* psi );

frame/0/subsc/bli_subsc_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T subsc_fp
 
@@ -55,13 +55,13 @@ static FUNCPTR_T GENARRAY2_MIN(ftypes,subsc_unb_var1);
 #endif
 
 
-void bl2_subsc_unb_var1( obj_t*  chi,
+void bli_subsc_unb_var1( obj_t*  chi,
                          obj_t*  psi )
 {
-	conj_t    conjchi   = bl2_obj_conj_status( *chi );
+	conj_t    conjchi   = bli_obj_conj_status( *chi );
 
-	num_t     dt_psi     = bl2_obj_datatype( *psi );
-	void*     buf_psi    = bl2_obj_buffer_at_off( *psi );
+	num_t     dt_psi     = bli_obj_datatype( *psi );
+	void*     buf_psi    = bli_obj_buffer_at_off( *psi );
 
 	num_t     dt_chi;
 	void*     buf_chi;
@@ -71,7 +71,7 @@ void bl2_subsc_unb_var1( obj_t*  chi,
 	// If beta is a scalar constant, use dt_chi_r to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the beta object and extract the buffer at the beta offset.
-	bl2_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
+	bli_set_scalar_dt_buffer( chi, dt_psi, dt_chi, buf_chi );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.

frame/0/subsc/bli_subsc_unb_var1.h

@@ -33,7 +33,7 @@
 */
 
 
-void bl2_subsc_unb_var1( obj_t*  chi,
+void bli_subsc_unb_var1( obj_t*  chi,
                          obj_t*  psi );
 
 

frame/0/unzipsc/bli_unzipsc.c

@@ -32,20 +32,20 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
 // Define object-based interface.
 //
-void bl2_unzipsc( obj_t* beta,
+void bli_unzipsc( obj_t* beta,
                   obj_t* chi_r,
                   obj_t* chi_i )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_unzipsc_check( beta, chi_r, chi_i );
+	if ( bli_error_checking_is_enabled() )
+		bli_unzipsc_check( beta, chi_r, chi_i );
 
-	bl2_unzipsc_unb_var1( beta, chi_r, chi_i );
+	bli_unzipsc_unb_var1( beta, chi_r, chi_i );
 }
 
 

frame/0/unzipsc/bli_unzipsc.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_unzipsc_check.h"
-#include "bl2_unzipsc_unb_var1.h"
+#include "bli_unzipsc_check.h"
+#include "bli_unzipsc_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_unzipsc( obj_t* beta,
+void bli_unzipsc( obj_t* beta,
                   obj_t* chi_r,
                   obj_t* chi_i );
 

frame/0/unzipsc/bli_unzipsc_check.c

@@ -32,9 +32,9 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_unzipsc_check( obj_t* beta,
+void bli_unzipsc_check( obj_t* beta,
                         obj_t* chi_r,
                         obj_t* chi_i )
 {
@@ -42,36 +42,36 @@ void bl2_unzipsc_check( obj_t* beta,
 
 	// Check object datatypes.
 
-	e_val = bl2_check_noninteger_object( beta );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( beta );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_real_object( chi_r );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_real_object( chi_r );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_real_object( chi_i );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_real_object( chi_i );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( chi_r );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( chi_r );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( chi_i );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( chi_i );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_object_real_proj_of( beta, chi_r );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_object_real_proj_of( beta, chi_r );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_object_real_proj_of( beta, chi_i );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_object_real_proj_of( beta, chi_i );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( beta );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( beta );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( chi_r );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi_r );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( chi_i );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi_i );
+	bli_check_error_code( e_val );
 }
 

frame/0/unzipsc/bli_unzipsc_check.h

@@ -32,6 +32,6 @@
 
 */
 
-void bl2_unzipsc_check( obj_t* beta,
+void bli_unzipsc_check( obj_t* beta,
                         obj_t* chi_r,
                         obj_t* chi_i );

frame/0/unzipsc/bli_unzipsc_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T unzipsc_fp
 
@@ -45,24 +45,24 @@ typedef void (*FUNCPTR_T)(
 static FUNCPTR_T GENARRAY(ftypes,unzipsc_unb_var1);
 
 
-void bl2_unzipsc_unb_var1( obj_t* beta,
+void bli_unzipsc_unb_var1( obj_t* beta,
                            obj_t* chi_r,
                            obj_t* chi_i )
 {
 	num_t     dt_beta;
-	num_t     dt_chi_c   = bl2_obj_datatype_proj_to_complex( *chi_r );
+	num_t     dt_chi_c   = bli_obj_datatype_proj_to_complex( *chi_r );
 
 	void*     buf_beta;
 
-	void*     buf_chi_r  = bl2_obj_buffer_at_off( *chi_r );
-	void*     buf_chi_i  = bl2_obj_buffer_at_off( *chi_i );
+	void*     buf_chi_r  = bli_obj_buffer_at_off( *chi_r );
+	void*     buf_chi_i  = bli_obj_buffer_at_off( *chi_i );
 
 	FUNCPTR_T f;
 
 	// If beta is a scalar constant, use dt_chi_c to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the beta object and extract the buffer at the beta offset.
-	bl2_set_scalar_dt_buffer( beta, dt_chi_c, dt_beta, buf_beta );
+	bli_set_scalar_dt_buffer( beta, dt_chi_c, dt_beta, buf_beta );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.

frame/0/unzipsc/bli_unzipsc_unb_var1.h

@@ -33,7 +33,7 @@
 */
 
 
-void bl2_unzipsc_unb_var1( obj_t* beta,
+void bli_unzipsc_unb_var1( obj_t* beta,
                            obj_t* chi_r,
                            obj_t* chi_i );
 

frame/0/zipsc/bli_zipsc.c

@@ -32,20 +32,20 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
 // Define object-based interface.
 //
-void bl2_zipsc( obj_t* beta_r,
+void bli_zipsc( obj_t* beta_r,
                 obj_t* beta_i,
                 obj_t* chi )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_zipsc_check( beta_r, beta_i, chi );
+	if ( bli_error_checking_is_enabled() )
+		bli_zipsc_check( beta_r, beta_i, chi );
 
-	bl2_zipsc_unb_var1( beta_r, beta_i, chi );
+	bli_zipsc_unb_var1( beta_r, beta_i, chi );
 }
 
 

frame/0/zipsc/bli_zipsc.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_zipsc_check.h"
-#include "bl2_zipsc_unb_var1.h"
+#include "bli_zipsc_check.h"
+#include "bli_zipsc_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_zipsc( obj_t* beta_r,
+void bli_zipsc( obj_t* beta_r,
                 obj_t* beta_i,
                 obj_t* chi );
 

frame/0/zipsc/bli_zipsc_check.c

@@ -32,9 +32,9 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_zipsc_check( obj_t* beta_r,
+void bli_zipsc_check( obj_t* beta_r,
                       obj_t* beta_i,
                       obj_t* chi )
 {
@@ -42,33 +42,33 @@ void bl2_zipsc_check( obj_t* beta_r,
 
 	// Check object datatypes.
 
-	e_val = bl2_check_real_object( beta_r );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_real_object( beta_r );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_real_object( beta_i );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_real_object( beta_i );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_noninteger_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_nonconstant_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_nonconstant_object( chi );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_object_real_proj_of( chi, beta_r );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_object_real_proj_of( chi, beta_r );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_object_real_proj_of( chi, beta_i );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_object_real_proj_of( chi, beta_i );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( beta_r );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( beta_r );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( beta_i );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( beta_i );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_scalar_object( chi );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( chi );
+	bli_check_error_code( e_val );
 }
 

frame/0/zipsc/bli_zipsc_check.h

@@ -32,6 +32,6 @@
 
 */
 
-void bl2_zipsc_check( obj_t* beta_r,
+void bli_zipsc_check( obj_t* beta_r,
                       obj_t* beta_i,
                       obj_t* chi );

frame/0/zipsc/bli_zipsc_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T zipsc_fp
 
@@ -45,27 +45,27 @@ typedef void (*FUNCPTR_T)(
 static FUNCPTR_T GENARRAY(ftypes,zipsc_unb_var1);
 
 
-void bl2_zipsc_unb_var1( obj_t*  beta_r,
+void bli_zipsc_unb_var1( obj_t*  beta_r,
                          obj_t*  beta_i,
                          obj_t*  chi )
 {
 	num_t     dt_beta_r;
 	num_t     dt_beta_i;
-	num_t     dt_chi     = bl2_obj_datatype( *chi );
-	num_t     dt_chi_r   = bl2_obj_datatype_proj_to_real( *chi );
+	num_t     dt_chi     = bli_obj_datatype( *chi );
+	num_t     dt_chi_r   = bli_obj_datatype_proj_to_real( *chi );
 
 	void*     buf_beta_r;
 	void*     buf_beta_i;
 
-	void*     buf_chi    = bl2_obj_buffer_at_off( *chi );
+	void*     buf_chi    = bli_obj_buffer_at_off( *chi );
 
 	FUNCPTR_T f;
 
 	// If beta is a scalar constant, use dt_chi_r to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the beta object and extract the buffer at the beta offset.
-	bl2_set_scalar_dt_buffer( beta_r, dt_chi_r, dt_beta_r, buf_beta_r );
-	bl2_set_scalar_dt_buffer( beta_i, dt_chi_r, dt_beta_i, buf_beta_i );
+	bli_set_scalar_dt_buffer( beta_r, dt_chi_r, dt_beta_r, buf_beta_r );
+	bli_set_scalar_dt_buffer( beta_i, dt_chi_r, dt_beta_i, buf_beta_i );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.

frame/0/zipsc/bli_zipsc_unb_var1.h

@@ -33,7 +33,7 @@
 */
 
 
-void bl2_zipsc_unb_var1( obj_t* beta_r,
+void bli_zipsc_unb_var1( obj_t* beta_r,
                          obj_t* beta_i,
                          obj_t* chi );
 

frame/1/addv/bli_addv.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 
 //
@@ -46,7 +46,7 @@ void PASTEMAC0(opname)( \
                         obj_t* y  \
                       ) \
 { \
-    if ( bl2_error_checking_is_enabled() ) \
+    if ( bli_error_checking_is_enabled() ) \
         PASTEMAC(opname,_check)( x, y ); \
 \
     PASTEMAC0(varname)( x, \

frame/1/addv/bli_addv.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_addv_check.h"
-#include "bl2_addv_unb_var1.h"
+#include "bli_addv_check.h"
+#include "bli_addv_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_addv( obj_t* x,
+void bli_addv( obj_t* x,
                obj_t* y );
 
 

frame/1/addv/bli_addv_check.c

@@ -32,30 +32,30 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_subv_check( obj_t*  x,
+void bli_addv_check( obj_t*  x,
                      obj_t*  y )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_floating_object( x );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_floating_object( x );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_floating_object( y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_floating_object( y );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_vector_object( x );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_vector_object( x );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_vector_object( y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_vector_object( y );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_equal_vector_lengths( x, y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_equal_vector_lengths( x, y );
+	bli_check_error_code( e_val );
 }
 

frame/1/addv/bli_addv_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_addv_check( obj_t*  x,
+void bli_addv_check( obj_t*  x,
                      obj_t*  y );

frame/1/addv/bli_addv_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T addv_fp
 
@@ -56,20 +56,20 @@ static FUNCPTR_T GENARRAY2_MIN(ftypes,addv_unb_var1);
 #endif
 
 
-void bl2_addv_unb_var1( obj_t*  x,
+void bli_addv_unb_var1( obj_t*  x,
                         obj_t*  y )
 {
-	num_t     dt_x      = bl2_obj_datatype( *x );
-	num_t     dt_y      = bl2_obj_datatype( *y );
+	num_t     dt_x      = bli_obj_datatype( *x );
+	num_t     dt_y      = bli_obj_datatype( *y );
 
-	conj_t    conjx     = bl2_obj_conj_status( *x );
-	dim_t     n         = bl2_obj_vector_dim( *x );
+	conj_t    conjx     = bli_obj_conj_status( *x );
+	dim_t     n         = bli_obj_vector_dim( *x );
 
-	inc_t     inc_x     = bl2_obj_vector_inc( *x );
-	void*     buf_x     = bl2_obj_buffer_at_off( *x );
+	inc_t     inc_x     = bli_obj_vector_inc( *x );
+	void*     buf_x     = bli_obj_buffer_at_off( *x );
 
-	inc_t     inc_y     = bl2_obj_vector_inc( *y );
-	void*     buf_y     = bl2_obj_buffer_at_off( *y );
+	inc_t     inc_y     = bli_obj_vector_inc( *y );
+	void*     buf_y     = bli_obj_buffer_at_off( *y );
 
 	FUNCPTR_T f;
 
@@ -101,12 +101,12 @@ void PASTEMAC2(chx,chy,varname)( \
 	ctype_y* psi1; \
 	dim_t    i; \
 \
-	if ( bl2_zero_dim1( n ) ) return; \
+	if ( bli_zero_dim1( n ) ) return; \
 \
 	chi1 = x_cast; \
 	psi1 = y_cast; \
 \
-	if ( bl2_is_conj( conjx ) ) \
+	if ( bli_is_conj( conjx ) ) \
 	{ \
 		for ( i = 0; i < n; ++i ) \
 		{ \

frame/1/addv/bli_addv_unb_var1.h

@@ -32,7 +32,7 @@
 
 */
 
-void bl2_addv_unb_var1( obj_t* x,
+void bli_addv_unb_var1( obj_t* x,
                         obj_t* y );
 
 

frame/1/axpyv/bli_axpyv.c

@@ -32,17 +32,17 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 /*
-void bl2_axpyv( obj_t* alpha,
+void bli_axpyv( obj_t* alpha,
                 obj_t* x,
                 obj_t* y )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_axpyv_check( alpha, x, y );
+	if ( bli_error_checking_is_enabled() )
+		bli_axpyv_check( alpha, x, y );
 
-	bl2_axpyv_unb_var1( alpha, x, y );
+	bli_axpyv_unb_var1( alpha, x, y );
 }
 */
 
@@ -58,7 +58,7 @@ void PASTEMAC0(opname)( \
                         obj_t* y  \
                       ) \
 { \
-	if ( bl2_error_checking_is_enabled() ) \
+	if ( bli_error_checking_is_enabled() ) \
 		PASTEMAC(opname,_check)( alpha, x, y ); \
 \
 	PASTEMAC0(varname)( alpha, \

frame/1/axpyv/bli_axpyv.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_axpyv_check.h"
-#include "bl2_axpyv_unb_var1.h"
+#include "bli_axpyv_check.h"
+#include "bli_axpyv_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_axpyv( obj_t* alpha,
+void bli_axpyv( obj_t* alpha,
                 obj_t* x,
                 obj_t* y );
 

frame/1/axpyv/bli_axpyv_check.c

@@ -32,9 +32,9 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_axpyv_check( obj_t*  alpha,
+void bli_axpyv_check( obj_t*  alpha,
                       obj_t*  x,
                       obj_t*  y )
 {
@@ -42,27 +42,27 @@ void bl2_axpyv_check( obj_t*  alpha,
 
 	// Check object datatypes.
 
-	e_val = bl2_check_noninteger_object( alpha );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_noninteger_object( alpha );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_floating_object( x );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_floating_object( x );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_floating_object( y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_floating_object( y );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_scalar_object( alpha );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_scalar_object( alpha );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_vector_object( x );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_vector_object( x );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_vector_object( y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_vector_object( y );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_equal_vector_lengths( x, y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_equal_vector_lengths( x, y );
+	bli_check_error_code( e_val );
 }
 

frame/1/axpyv/bli_axpyv_check.h

@@ -32,6 +32,6 @@
 
 */
 
-void bl2_axpyv_check( obj_t*  alpha,
+void bli_axpyv_check( obj_t*  alpha,
                       obj_t*  x,
                       obj_t*  y );

frame/1/axpyv/bli_axpyv_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T axpyv_fp
 
@@ -57,21 +57,21 @@ static FUNCPTR_T GENARRAY3_MIN(ftypes,axpyv_unb_var1);
 #endif
 
 
-void bl2_axpyv_unb_var1( obj_t*  alpha,
+void bli_axpyv_unb_var1( obj_t*  alpha,
                          obj_t*  x,
                          obj_t*  y )
 {
-	num_t     dt_x      = bl2_obj_datatype( *x );
-	num_t     dt_y      = bl2_obj_datatype( *y );
+	num_t     dt_x      = bli_obj_datatype( *x );
+	num_t     dt_y      = bli_obj_datatype( *y );
 
-	conj_t    conjx     = bl2_obj_conj_status( *x );
-	dim_t     n         = bl2_obj_vector_dim( *x );
+	conj_t    conjx     = bli_obj_conj_status( *x );
+	dim_t     n         = bli_obj_vector_dim( *x );
 
-	inc_t     inc_x     = bl2_obj_vector_inc( *x );
-	void*     buf_x     = bl2_obj_buffer_at_off( *x );
+	inc_t     inc_x     = bli_obj_vector_inc( *x );
+	void*     buf_x     = bli_obj_buffer_at_off( *x );
 
-	inc_t     inc_y     = bl2_obj_vector_inc( *y );
-	void*     buf_y     = bl2_obj_buffer_at_off( *y );
+	inc_t     inc_y     = bli_obj_vector_inc( *y );
+	void*     buf_y     = bli_obj_buffer_at_off( *y );
 
 	num_t     dt_alpha;
 	void*     buf_alpha;
@@ -81,7 +81,7 @@ void bl2_axpyv_unb_var1( obj_t*  alpha,
 	// If alpha is a scalar constant, use dt_x to extract the address of the
 	// corresponding constant value; otherwise, use the datatype encoded
 	// within the alpha object and extract the buffer at the alpha offset.
-	bl2_set_scalar_dt_buffer( alpha, dt_x, dt_alpha, buf_alpha );
+	bli_set_scalar_dt_buffer( alpha, dt_x, dt_alpha, buf_alpha );
 
 	// Index into the type combination array to extract the correct
 	// function pointer.
@@ -114,7 +114,7 @@ void PASTEMAC3(cha,chx,chy,varname)( \
 	ctype_y* psi1; \
 	dim_t    i; \
 \
-	if ( bl2_zero_dim1( n ) ) return; \
+	if ( bli_zero_dim1( n ) ) return; \
 \
 	/* If alpha is zero, return. */ \
 	if ( PASTEMAC(cha,eq0)( *alpha_cast ) ) return; \
@@ -132,7 +132,7 @@ void PASTEMAC3(cha,chx,chy,varname)( \
 	chi1 = x_cast; \
 	psi1 = y_cast; \
 \
-	if ( bl2_is_conj( conjx ) ) \
+	if ( bli_is_conj( conjx ) ) \
 	{ \
 		for ( i = 0; i < n; ++i ) \
 		{ \

frame/1/axpyv/bli_axpyv_unb_var1.h

@@ -32,7 +32,7 @@
 
 */
 
-void bl2_axpyv_unb_var1( obj_t* alpha,
+void bli_axpyv_unb_var1( obj_t* alpha,
                          obj_t* x,
                          obj_t* y );
 

frame/1/copynzv/bli_copynzv.c

@@ -32,16 +32,16 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 /*
-void bl2_copynzv( obj_t* x,
+void bli_copynzv( obj_t* x,
                   obj_t* y )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_copynzv_check( x, y );
+	if ( bli_error_checking_is_enabled() )
+		bli_copynzv_check( x, y );
 
-	bl2_copynzv_unb_var1( x, y );
+	bli_copynzv_unb_var1( x, y );
 }
 */
 
@@ -56,7 +56,7 @@ void PASTEMAC0(opname)( \
                         obj_t* y  \
                       ) \
 { \
-    if ( bl2_error_checking_is_enabled() ) \
+    if ( bli_error_checking_is_enabled() ) \
         PASTEMAC(opname,_check)( x, y ); \
 \
     PASTEMAC0(varname)( x, \

frame/1/copynzv/bli_copynzv.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_copynzv_check.h"
-#include "bl2_copynzv_unb_var1.h"
+#include "bli_copynzv_check.h"
+#include "bli_copynzv_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_copynzv( obj_t* x,
+void bli_copynzv( obj_t* x,
                   obj_t* y );
 
 

frame/1/copynzv/bli_copynzv_check.c

@@ -32,30 +32,30 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_copynzv_check( obj_t*  x,
+void bli_copynzv_check( obj_t*  x,
                         obj_t*  y )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_floating_object( x );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_floating_object( x );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_floating_object( y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_floating_object( y );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_vector_object( x );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_vector_object( x );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_vector_object( y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_vector_object( y );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_equal_vector_lengths( x, y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_equal_vector_lengths( x, y );
+	bli_check_error_code( e_val );
 }
 

frame/1/copynzv/bli_copynzv_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_copynzv_check( obj_t*  x,
+void bli_copynzv_check( obj_t*  x,
                         obj_t*  y );

frame/1/copynzv/bli_copynzv_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T copynzv_fp
 
@@ -56,20 +56,20 @@ static FUNCPTR_T GENARRAY2_MIN(ftypes,copynzv_unb_var1);
 #endif
 
 
-void bl2_copynzv_unb_var1( obj_t*  x,
+void bli_copynzv_unb_var1( obj_t*  x,
                            obj_t*  y )
 {
-	num_t     dt_x      = bl2_obj_datatype( *x );
-	num_t     dt_y      = bl2_obj_datatype( *y );
+	num_t     dt_x      = bli_obj_datatype( *x );
+	num_t     dt_y      = bli_obj_datatype( *y );
 
-	conj_t    conjx     = bl2_obj_conj_status( *x );
-	dim_t     n         = bl2_obj_vector_dim( *x );
+	conj_t    conjx     = bli_obj_conj_status( *x );
+	dim_t     n         = bli_obj_vector_dim( *x );
 
-	inc_t     inc_x     = bl2_obj_vector_inc( *x );
-	void*     buf_x     = bl2_obj_buffer_at_off( *x );
+	inc_t     inc_x     = bli_obj_vector_inc( *x );
+	void*     buf_x     = bli_obj_buffer_at_off( *x );
 
-	inc_t     inc_y     = bl2_obj_vector_inc( *y );
-	void*     buf_y     = bl2_obj_buffer_at_off( *y );
+	inc_t     inc_y     = bli_obj_vector_inc( *y );
+	void*     buf_y     = bli_obj_buffer_at_off( *y );
 
 	FUNCPTR_T f;
 
@@ -101,12 +101,12 @@ void PASTEMAC2(chx,chy,varname)( \
 	ctype_y* psi1; \
 	dim_t    i; \
 \
-	if ( bl2_zero_dim1( n ) ) return; \
+	if ( bli_zero_dim1( n ) ) return; \
 \
 	chi1 = x_cast; \
 	psi1 = y_cast; \
 \
-	if ( bl2_is_conj( conjx ) ) \
+	if ( bli_is_conj( conjx ) ) \
 	{ \
 		for ( i = 0; i < n; ++i ) \
 		{ \

frame/1/copynzv/bli_copynzv_unb_var1.h

@@ -32,7 +32,7 @@
 
 */
 
-void bl2_copynzv_unb_var1( obj_t* x,
+void bli_copynzv_unb_var1( obj_t* x,
                            obj_t* y );
 
 

frame/1/copyv/bli_copyv.c

@@ -32,16 +32,16 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 /*
-void bl2_copyv( obj_t* x,
+void bli_copyv( obj_t* x,
                 obj_t* y )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_copyv_check( x, y );
+	if ( bli_error_checking_is_enabled() )
+		bli_copyv_check( x, y );
 
-	bl2_copyv_unb_var1( x, y );
+	bli_copyv_unb_var1( x, y );
 }
 */
 
@@ -56,7 +56,7 @@ void PASTEMAC0(opname)( \
                         obj_t* y  \
                       ) \
 { \
-    if ( bl2_error_checking_is_enabled() ) \
+    if ( bli_error_checking_is_enabled() ) \
         PASTEMAC(opname,_check)( x, y ); \
 \
     PASTEMAC0(varname)( x, \

frame/1/copyv/bli_copyv.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_copyv_check.h"
-#include "bl2_copyv_unb_var1.h"
+#include "bli_copyv_check.h"
+#include "bli_copyv_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_copyv( obj_t* x,
+void bli_copyv( obj_t* x,
                 obj_t* y );
 
 

frame/1/copyv/bli_copyv_check.c

@@ -32,30 +32,30 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
-void bl2_copyv_check( obj_t*  x,
+void bli_copyv_check( obj_t*  x,
                       obj_t*  y )
 {
 	err_t e_val;
 
 	// Check object datatypes.
 
-	e_val = bl2_check_floating_object( x );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_floating_object( x );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_floating_object( y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_floating_object( y );
+	bli_check_error_code( e_val );
 
 	// Check object dimensions.
 
-	e_val = bl2_check_vector_object( x );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_vector_object( x );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_vector_object( y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_vector_object( y );
+	bli_check_error_code( e_val );
 
-	e_val = bl2_check_equal_vector_lengths( x, y );
-	bl2_check_error_code( e_val );
+	e_val = bli_check_equal_vector_lengths( x, y );
+	bli_check_error_code( e_val );
 }
 

frame/1/copyv/bli_copyv_check.h

@@ -32,5 +32,5 @@
 
 */
 
-void bl2_swapv_check( obj_t*  x,
+void bli_copyv_check( obj_t*  x,
                       obj_t*  y );

frame/1/copyv/bli_copyv_unb_var1.c

@@ -32,7 +32,7 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 #define FUNCPTR_T copyv_fp
 
@@ -56,20 +56,20 @@ static FUNCPTR_T GENARRAY2_MIN(ftypes,copyv_unb_var1);
 #endif
 
 
-void bl2_copyv_unb_var1( obj_t*  x,
+void bli_copyv_unb_var1( obj_t*  x,
                          obj_t*  y )
 {
-	num_t     dt_x      = bl2_obj_datatype( *x );
-	num_t     dt_y      = bl2_obj_datatype( *y );
+	num_t     dt_x      = bli_obj_datatype( *x );
+	num_t     dt_y      = bli_obj_datatype( *y );
 
-	conj_t    conjx     = bl2_obj_conj_status( *x );
-	dim_t     n         = bl2_obj_vector_dim( *x );
+	conj_t    conjx     = bli_obj_conj_status( *x );
+	dim_t     n         = bli_obj_vector_dim( *x );
 
-	inc_t     inc_x     = bl2_obj_vector_inc( *x );
-	void*     buf_x     = bl2_obj_buffer_at_off( *x );
+	inc_t     inc_x     = bli_obj_vector_inc( *x );
+	void*     buf_x     = bli_obj_buffer_at_off( *x );
 
-	inc_t     inc_y     = bl2_obj_vector_inc( *y );
-	void*     buf_y     = bl2_obj_buffer_at_off( *y );
+	inc_t     inc_y     = bli_obj_vector_inc( *y );
+	void*     buf_y     = bli_obj_buffer_at_off( *y );
 
 	FUNCPTR_T f;
 
@@ -101,12 +101,12 @@ void PASTEMAC2(chx,chy,varname)( \
 	ctype_y* psi1; \
 	dim_t    i; \
 \
-	if ( bl2_zero_dim1( n ) ) return; \
+	if ( bli_zero_dim1( n ) ) return; \
 \
 	chi1 = x_cast; \
 	psi1 = y_cast; \
 \
-	if ( bl2_is_conj( conjx ) ) \
+	if ( bli_is_conj( conjx ) ) \
 	{ \
 		for ( i = 0; i < n; ++i ) \
 		{ \

frame/1/copyv/bli_copyv_unb_var1.h

@@ -32,7 +32,7 @@
 
 */
 
-void bl2_copyv_unb_var1( obj_t* x,
+void bli_copyv_unb_var1( obj_t* x,
                          obj_t* y );
 
 

frame/1/dotv/bli_dotv.c

@@ -32,17 +32,17 @@
 
 */
 
-#include "blis2.h"
+#include "blis.h"
 
 /*
-void bl2_dotv( obj_t* x,
+void bli_dotv( obj_t* x,
                obj_t* y,
                obj_t* rho )
 {
-	if ( bl2_error_checking_is_enabled() )
-		bl2_dotv_check( x, y, rho );
+	if ( bli_error_checking_is_enabled() )
+		bli_dotv_check( x, y, rho );
 
-	bl2_dotv_unb_var1( x, y, rho );
+	bli_dotv_unb_var1( x, y, rho );
 }
 */
 
@@ -58,7 +58,7 @@ void PASTEMAC0(opname)( \
                         obj_t* rho \
                       ) \
 { \
-    if ( bl2_error_checking_is_enabled() ) \
+    if ( bli_error_checking_is_enabled() ) \
         PASTEMAC(opname,_check)( x, y, rho ); \
 \
     PASTEMAC0(varname)( x, \

frame/1/dotv/bli_dotv.h

@@ -32,14 +32,14 @@
 
 */
 
-#include "bl2_dotv_check.h"
-#include "bl2_dotv_unb_var1.h"
+#include "bli_dotv_check.h"
+#include "bli_dotv_unb_var1.h"
 
 
 //
 // Prototype object-based interface.
 //
-void bl2_dotv( obj_t* x,
+void bli_dotv( obj_t* x,
                obj_t* y,
                obj_t* rho );