Skip to content

Commit 7ab3e9a

Browse files
bench: refactor to use dynamic memory allocation in 'blas/base/csrot'
1 parent 9509466 commit 7ab3e9a

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,21 +97,12 @@ static float rand_float( void ) {
9797
static double benchmark1( int iterations, int len ) {
9898
double elapsed;
9999
float *x;
100-
<<<<<<< HEAD
101100
float *y;
102101
double t;
103102
int i;
104103

105104
x = (float *) malloc( len * 2 * sizeof( float ) );
106105
y = (float *) malloc( len * 2 * sizeof( float ) );
107-
=======
108-
109-
float *y;
110-
double t;
111-
int i;
112-
x = (float *)( malloc( len * 2 * sizeof( float ) ) );
113-
y = (float *)( malloc( len * 2 * sizeof( float ) ) );
114-
>>>>>>> 9125c9c2ad97f1b875413af6a594b831bce940f8
115106
for ( i = 0; i < len; i++ ) {
116107
x[ i ] = ( rand_float()*10000.0f ) - 5000.0f;
117108
x[ i+1 ] = ( rand_float()*10000.0f ) - 5000.0f;

0 commit comments

Comments
 (0)