Merge branch 'develop' into bench-csrot-dynamic-alloc

Author: ishwarthecodddr

lib/node_modules/@stdlib/blas/base/ccopy/benchmark/c/benchmark.length.c

@@ -138,6 +138,10 @@ static double benchmark2( int iterations, int len ) {
 	float *y;
 	double t;
 	int i;
+<<<<<<< HEAD
+=======
+
+>>>>>>> 9125c9c2ad97f1b875413af6a594b831bce940f8
 	x = (float *) malloc( len * 2 * sizeof( float ) );
 	y = (float *) malloc( len * 2 * sizeof( float ) );
 	for ( i = 0; i < len; i++ ) {
@@ -158,26 +162,14 @@ static double benchmark2( int iterations, int len ) {
 	if ( y[ 0 ] != y[ 0 ] ) {
 		printf( "should not return NaN\n" );
 	}
+<<<<<<< HEAD
 	free(x);
 	free(y);
-	return elapsed;
-}
-
-/**
-* Main execution sequence.
-*/
-int main( void ) {
-	double elapsed;
-	int count;
-	int iter;
-	int len;
-	int i;
-	int j;
-
-	// Use the current time to seed the random number generator:
-	srand( time( NULL ) );
-
-	print_version();
+=======
+	free( x );
+	free( y );
+>>>>>>> 9125c9c2ad97f1b875413af6a594b831bce940f8
+rsion();
 	count = 0;
 	for ( i = MIN; i <= MAX; i++ ) {
 		len = pow( 10, i );

lib/node_modules/@stdlib/blas/base/csrot/benchmark/c/benchmark.length.c

@@ -97,12 +97,21 @@ static float rand_float( void ) {
 static double benchmark1( int iterations, int len ) {
 	double elapsed;
 	float *x;
+<<<<<<< HEAD
 	float *y;
 	double t;
 	int i;
 
 	x = (float *) malloc( len * 2 * sizeof( float ) );
 	y = (float *) malloc( len * 2 * sizeof( float ) );
+=======
+	
+	float *y;
+	double t;
+	int i;
+	x = (float *)( malloc( len * 2 * sizeof( float ) ) );
+	y = (float *)( malloc( len * 2 * sizeof( float ) ) );
+>>>>>>> 9125c9c2ad97f1b875413af6a594b831bce940f8
 	for ( i = 0; i < len; i++ ) {
 		x[ i ] = ( rand_float()*10000.0f ) - 5000.0f;
 		x[ i+1 ] = ( rand_float()*10000.0f ) - 5000.0f;
@@ -139,11 +148,14 @@ static double benchmark2( int iterations, int len ) {
 	float *y;
 	double t;
 	int i;
+<<<<<<< HEAD
 	x = (float *) malloc( len * 2 * sizeof( float ) );
 	y = (float *) malloc( len * 2 * sizeof( float ) );
-	for ( i = 0; i < len; i++ ) {
-		x[ i ] = ( rand_float()*10000.0f ) - 5000.0f;
-		x[ i+1 ] = ( rand_float()*10000.0f ) - 5000.0f;
+=======
+	x = (float *)( malloc( len * 2 * sizeof( float ) ) );
+	y = (float *)( malloc( len * 2 * sizeof( float ) ) );
+>>>>>>> 9125c9c2ad97f1b875413af6a594b831bce940f8
+ = ( rand_float()*10000.0f ) - 5000.0f;
 		y[ i ] = ( rand_float()*10000.0f ) - 5000.0f;
 		y[ i+1 ] = ( rand_float()*10000.0f ) - 5000.0f;
 	}
@@ -159,16 +171,16 @@ static double benchmark2( int iterations, int len ) {
 	if ( y[ 0 ] != y[ 0 ] ) {
 		printf( "should not return NaN\n" );
 	}
-	free( x );
-	free( y );
 	return elapsed;
 }
 
 /**
 * Main execution sequence.
 */
 int main( void ) {
-	double elapsed;
+	double elapsed
+	free( x );
+	free( y );;
 	int count;
 	int iter;
 	int len;