Merge branch 'dev' of github.com:flame/blis into dev

frame/1/bli_l1v_check.c

@@ -203,6 +203,11 @@ void bli_l1v_xy_check
 	e_val = bli_check_floating_object( y );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_vector_object( x );
@@ -243,6 +248,11 @@ void bli_l1v_axy_check
 	e_val = bli_check_floating_object( y );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( alpha );
@@ -289,6 +299,11 @@ void bli_l1v_xby_check
 	e_val = bli_check_floating_object( y );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( beta );
@@ -339,6 +354,11 @@ void bli_l1v_axby_check
 	e_val = bli_check_floating_object( y );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( alpha );
@@ -402,6 +422,11 @@ void bli_l1v_dot_check
 	e_val = bli_check_nonconstant_object( rho );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( alpha );

frame/1d/bli_l1d_check.c

@@ -121,6 +121,11 @@ void bli_l1d_xy_check
 	e_val = bli_check_floating_object( y );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_matrix_object( x );
@@ -161,6 +166,11 @@ void bli_l1d_axy_check
 	e_val = bli_check_floating_object( y );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( alpha );

frame/1f/bli_l1f_check.c

@@ -66,6 +66,14 @@ void bli_axpy2v_check
 	e_val = bli_check_floating_object( z );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( x, z );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( alphax );
@@ -132,6 +140,14 @@ void bli_axpyf_check
 	e_val = bli_check_floating_object( y );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( alpha );
@@ -203,6 +219,17 @@ void bli_dotaxpyv_check
 	e_val = bli_check_floating_object( z );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, xt );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( x, z );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( alpha );
@@ -299,6 +326,23 @@ void bli_dotxaxpyf_check
 	e_val = bli_check_floating_object( z );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, at );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, w );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, y );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, z );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( alpha );
@@ -407,6 +451,14 @@ void bli_dotxf_check
 	e_val = bli_check_floating_object( y );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( alpha );

frame/1m/bli_l1m_check.c

@@ -106,6 +106,11 @@ void bli_l1m_xy_check
 	e_val = bli_check_floating_object( y );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_matrix_object( x );
@@ -146,6 +151,11 @@ void bli_l1m_axy_check
 	e_val = bli_check_floating_object( y );
 	bli_check_error_code( e_val );
 
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( x, y );
+	bli_check_error_code( e_val );
+
 	// Check object dimensions.
 
 	e_val = bli_check_scalar_object( alpha );

frame/2/bli_l2_check.c

@@ -53,6 +53,14 @@ void bli_gemv_check
 
 	e_val = bli_check_general_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, y );
+	bli_check_error_code( e_val );
 }
 
 
@@ -80,6 +88,14 @@ void bli_hemv_check
 
 	e_val = bli_check_hermitian_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, y );
+	bli_check_error_code( e_val );
 }
 
 
@@ -107,6 +123,14 @@ void bli_symv_check
 
 	e_val = bli_check_symmetric_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, y );
+	bli_check_error_code( e_val );
 }
 
 
@@ -132,6 +156,11 @@ void bli_trmv_check
 
 	e_val = bli_check_triangular_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
 }
 
 
@@ -157,6 +186,11 @@ void bli_trsv_check
 
 	e_val = bli_check_triangular_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
 }
 
 
@@ -178,6 +212,14 @@ void bli_ger_check
 
 	e_val = bli_check_general_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, y );
+	bli_check_error_code( e_val );
 }
 
 
@@ -203,6 +245,11 @@ void bli_her_check
 
 	e_val = bli_check_hermitian_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
 }
 
 
@@ -229,6 +276,14 @@ void bli_her2_check
 
 	e_val = bli_check_hermitian_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, y );
+	bli_check_error_code( e_val );
 }
 
 
@@ -254,6 +309,11 @@ void bli_syr_check
 
 	e_val = bli_check_symmetric_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
 }
 
 
@@ -280,6 +340,14 @@ void bli_syr2_check
 
 	e_val = bli_check_symmetric_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( a, x );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( a, y );
+	bli_check_error_code( e_val );
 }
 
 

frame/3/bli_l3_check.c

@@ -294,6 +294,14 @@ void bli_gemm_basic_check
 
 	e_val = bli_check_level3_dims( a, b, c );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( c, a );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( c, b );
+	bli_check_error_code( e_val );
 }
 
 void bli_hemm_basic_check
@@ -330,6 +338,14 @@ void bli_hemm_basic_check
 
 	e_val = bli_check_square_object( a );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( c, a );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( c, b );
+	bli_check_error_code( e_val );
 }
 
 void bli_herk_basic_check
@@ -365,6 +381,14 @@ void bli_herk_basic_check
 
 	e_val = bli_check_general_object( ah );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( c, a );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( c, ah );
+	bli_check_error_code( e_val );
 }
 
 void bli_her2k_basic_check
@@ -412,6 +436,20 @@ void bli_her2k_basic_check
 
 	e_val = bli_check_general_object( ah );
 	bli_check_error_code( e_val );
+
+	// Check for consistent datatypes.
+
+	e_val = bli_check_consistent_object_datatypes( c, a );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( c, ah );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( c, b );
+	bli_check_error_code( e_val );
+
+	e_val = bli_check_consistent_object_datatypes( c, bh );
+	bli_check_error_code( e_val );
 }
 
 void bli_l3_basic_check

frame/include/bli_obj_macro_defs.h

@@ -108,7 +108,7 @@ static num_t bli_obj_dt_proj_to_real( obj_t* obj )
 
 static num_t bli_obj_dt_proj_to_complex( obj_t* obj )
 {
-	return ( bli_obj_dt( obj ) & BLIS_BITVAL_COMPLEX );
+	return ( bli_obj_dt( obj ) | BLIS_BITVAL_COMPLEX );
 }
 
 static num_t bli_obj_target_dt( obj_t* obj )