We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 9509466 commit 7ab3e9aCopy full SHA for 7ab3e9a
1 file changed
lib/node_modules/@stdlib/blas/base/csrot/benchmark/c/benchmark.length.c
@@ -97,21 +97,12 @@ static float rand_float( void ) {
97
static double benchmark1( int iterations, int len ) {
98
double elapsed;
99
float *x;
100
-<<<<<<< HEAD
101
float *y;
102
double t;
103
int i;
104
105
x = (float *) malloc( len * 2 * sizeof( float ) );
106
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
115
for ( i = 0; i < len; i++ ) {
116
x[ i ] = ( rand_float()*10000.0f ) - 5000.0f;
117
x[ i+1 ] = ( rand_float()*10000.0f ) - 5000.0f;
0 commit comments