Skip to content

Commit 88d8d24

Browse files
ShivamAhirShivamAhir
committed
refactor sasumpw
1 parent d48f616 commit 88d8d24

File tree

15 files changed

+63
-95
lines changed

15 files changed

+63
-95
lines changed

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/benchmark/benchmark.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@
2121
// MODULES //
2222

2323
var bench = require( '@stdlib/bench' );
24-
var randu = require( '@stdlib/random/base/randu' );
24+
var uniform = require( '@stdlib/random/base/uniform' ).factory;
25+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2526
var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
2627
var pow = require( '@stdlib/math/base/special/pow' );
27-
var Float32Array = require( '@stdlib/array/float32' );
2828
var pkg = require( './../package.json' ).name;
2929
var sasumpw = require( './../lib/sasumpw.js' );
3030

3131

32+
// VARIABLES //
33+
34+
var rand = uniform( -100.0, 100.0 );
35+
3236
// FUNCTIONS //
3337

3438
/**
@@ -39,13 +43,7 @@ var sasumpw = require( './../lib/sasumpw.js' );
3943
* @returns {Function} benchmark function
4044
*/
4145
function createBenchmark( len ) {
42-
var x;
43-
var i;
44-
45-
x = new Float32Array( len );
46-
for ( i = 0; i < x.length; i++ ) {
47-
x[ i ] = ( randu()*20.0 ) - 10.0;
48-
}
46+
var x = filledarrayBy( len, 'float32', rand );
4947
return benchmark;
5048

5149
function benchmark( b ) {

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/benchmark/benchmark.native.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222

2323
var resolve = require( 'path' ).resolve;
2424
var bench = require( '@stdlib/bench' );
25-
var randu = require( '@stdlib/random/base/randu' );
25+
var uniform = require( '@stdlib/random/base/uniform' ).factory;
26+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2627
var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
2728
var pow = require( '@stdlib/math/base/special/pow' );
28-
var Float32Array = require( '@stdlib/array/float32' );
29+
2930
var tryRequire = require( '@stdlib/utils/try-require' );
3031
var pkg = require( './../package.json' ).name;
3132

@@ -36,7 +37,7 @@ var sasumpw = tryRequire( resolve( __dirname, './../lib/sasumpw.native.js' ) );
3637
var opts = {
3738
'skip': ( sasumpw instanceof Error )
3839
};
39-
40+
var rand = uniform( -100.0, 100.0 );
4041

4142
// FUNCTIONS //
4243

@@ -48,13 +49,7 @@ var opts = {
4849
* @returns {Function} benchmark function
4950
*/
5051
function createBenchmark( len ) {
51-
var x;
52-
var i;
53-
54-
x = new Float32Array( len );
55-
for ( i = 0; i < x.length; i++ ) {
56-
x[ i ] = ( randu()*20.0 ) - 10.0;
57-
}
52+
var x = filledarrayBy( len, 'float32', rand );
5853
return benchmark;
5954

6055
function benchmark( b ) {

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/benchmark/benchmark.ndarray.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@
2121
// MODULES //
2222

2323
var bench = require( '@stdlib/bench' );
24-
var randu = require( '@stdlib/random/base/randu' );
24+
var uniform = require( '@stdlib/random/base/uniform' ).factory;
25+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2526
var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
2627
var pow = require( '@stdlib/math/base/special/pow' );
27-
var Float32Array = require( '@stdlib/array/float32' );
2828
var pkg = require( './../package.json' ).name;
2929
var sasumpw = require( './../lib/ndarray.js' );
3030

31+
// VARIABLES //
32+
33+
var rand = uniform( -100.0, 100.0 );
34+
3135

3236
// FUNCTIONS //
3337

@@ -39,13 +43,7 @@ var sasumpw = require( './../lib/ndarray.js' );
3943
* @returns {Function} benchmark function
4044
*/
4145
function createBenchmark( len ) {
42-
var x;
43-
var i;
44-
45-
x = new Float32Array( len );
46-
for ( i = 0; i < x.length; i++ ) {
47-
x[ i ] = ( randu()*20.0 ) - 10.0;
48-
}
46+
var x = filledarrayBy( len, 'float32', rand );
4947
return benchmark;
5048

5149
function benchmark( b ) {

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/benchmark/benchmark.ndarray.native.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
var resolve = require( 'path' ).resolve;
2424
var bench = require( '@stdlib/bench' );
25-
var randu = require( '@stdlib/random/base/randu' );
25+
var uniform = require( '@stdlib/random/base/uniform' ).factory;
26+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2627
var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
2728
var pow = require( '@stdlib/math/base/special/pow' );
28-
var Float32Array = require( '@stdlib/array/float32' );
2929
var tryRequire = require( '@stdlib/utils/try-require' );
3030
var pkg = require( './../package.json' ).name;
3131

@@ -37,6 +37,7 @@ var opts = {
3737
'skip': ( sasumpw instanceof Error )
3838
};
3939

40+
var rand = uniform( -100.0, 100.0 );
4041

4142
// FUNCTIONS //
4243

@@ -48,13 +49,7 @@ var opts = {
4849
* @returns {Function} benchmark function
4950
*/
5051
function createBenchmark( len ) {
51-
var x;
52-
var i;
53-
54-
x = new Float32Array( len );
55-
for ( i = 0; i < x.length; i++ ) {
56-
x[ i ] = ( randu()*20.0 ) - 10.0;
57-
}
52+
var x = filledarrayBy( len, 'float32', rand );
5853
return benchmark;
5954

6055
function benchmark( b ) {

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/docs/repl.txt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Computes the sum of absolute values (L1 norm) of single-precision floating-
44
point strided array elements using pairwise summation.
55

6-
The `N` and `stride` parameters determine which elements in `x` are accessed
6+
The `N` and `stride` parameters determine which elements in the strided array are accessed
77
at runtime.
88

99
Indexing is relative to the first index. To introduce an offset, use a typed
@@ -36,17 +36,13 @@
3636

3737
// Using `N` and `stride` parameters:
3838
> x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ] );
39-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
40-
> var stride = 2;
41-
> {{alias}}( N, x, stride )
39+
> {{alias}}( 3, x, 2 )
4240
5.0
4341

4442
// Using view offsets:
4543
> var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] );
4644
> var x1 = new {{alias:@stdlib/array/float32}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 );
47-
> N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 );
48-
> stride = 2;
49-
> {{alias}}( N, x1, stride )
45+
> {{alias}}( 3, x1, 2 )
5046
5.0
5147

5248
{{alias}}.ndarray( N, x, stride, offset )
@@ -86,8 +82,7 @@
8682

8783
// Using offset parameter:
8884
> var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] );
89-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
90-
> {{alias}}.ndarray( N, x, 2, 1 )
85+
> {{alias}}.ndarray( 3, x, 2, 1 )
9186
5.0
9287

9388
See Also

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/examples/index.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,11 @@
1818

1919
'use strict';
2020

21-
var randu = require( '@stdlib/random/base/randu' );
22-
var round = require( '@stdlib/math/base/special/round' );
23-
var Float32Array = require( '@stdlib/array/float32' );
21+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
22+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2423
var sasumpw = require( './../lib' );
2524

26-
var x;
27-
var i;
28-
29-
x = new Float32Array( 10 );
30-
for ( i = 0; i < x.length; i++ ) {
31-
x[ i ] = round( randu()*100.0 );
32-
}
25+
var x = filledarrayBy( 10, 'float32', discreteUniform( -100.0, 100.0 ) );
3326
console.log( x );
3427

3528
var v = sasumpw( x.length, x, 1 );

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/include.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Source files:
3838
'src_files': [
39-
'<(src_dir)/addon.cpp',
39+
'<(src_dir)/addon.c',
4040
'<!@(node -e "var arr = require(\'@stdlib/utils/library-manifest\')(\'./manifest.json\',{},{\'basedir\':process.cwd(),\'paths\':\'posix\'}).src; for ( var i = 0; i < arr.length; i++ ) { console.log( arr[ i ] ); }")',
4141
],
4242

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/lib/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@
3535
*
3636
* @example
3737
* var Float32Array = require( '@stdlib/array/float32' );
38-
* var floor = require( '@stdlib/math/base/special/floor' );
3938
* var sasumpw = require( '@stdlib/blas/ext/base/sasumpw' );
4039
*
4140
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
42-
* var N = floor( x.length / 2 );
4341
*
44-
* var v = sasumpw.ndarray( N, x, 2, 1 );
42+
* var v = sasumpw.ndarray( 4, x, 2, 1 );
4543
* // returns 9.0
4644
*/
4745

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/lib/ndarray.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,10 @@ var BLOCKSIZE = 128;
5252
*
5353
* @example
5454
* var Float32Array = require( '@stdlib/array/float32' );
55-
* var floor = require( '@stdlib/math/base/special/floor' );
5655
*
5756
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
58-
* var N = floor( x.length / 2 );
5957
*
60-
* var v = sasumpw( N, x, 2, 1 );
58+
* var v = sasumpw( 4, x, 2, 1 );
6159
* // returns 9.0
6260
*/
6361
function sasumpw( N, x, stride, offset ) {

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/lib/ndarray.native.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
// MODULES //
2222

23-
var Float32Array = require( '@stdlib/array/float32' );
23+
var minViewBufferIndex = require( '@stdlib/strided/base/min-view-buffer-index' );
24+
var offsetView = require( '@stdlib/strided/base/offset-view' );
2425
var addon = require( './sasumpw.native.js' );
2526

2627

@@ -37,20 +38,16 @@ var addon = require( './sasumpw.native.js' );
3738
*
3839
* @example
3940
* var Float32Array = require( '@stdlib/array/float32' );
40-
* var floor = require( '@stdlib/math/base/special/floor' );
4141
*
4242
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
43-
* var N = floor( x.length / 2 );
4443
*
45-
* var v = sasumpw( N, x, 2, 1 );
44+
* var v = sasumpw( 4, x, 2, 1 );
4645
* // returns 9.0
4746
*/
4847
function sasumpw( N, x, stride, offset ) {
4948
var view;
50-
if ( stride < 0 ) {
51-
offset += (N-1) * stride;
52-
}
53-
view = new Float32Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offset), x.length-offset ); // eslint-disable-line max-len
49+
offset = minViewBufferIndex( N, stride, offset );
50+
view = offsetView( x, offset );
5451
return addon( N, view, stride );
5552
}
5653

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/manifest.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@
3434
"-lm"
3535
],
3636
"libpath": [],
37-
"dependencies": []
37+
"dependencies": [
38+
"stdlib/napi/export.h",
39+
"stdlib/napi/argv.h",
40+
"stdlib/napi/argv_int64.h",
41+
"stdlib/napi/argv_strided_float32array.h"
42+
]
3843
}
3944
]
4045
}

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/test/test.ndarray.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
// MODULES //
2222

2323
var tape = require( 'tape' );
24-
var floor = require( '@stdlib/math/base/special/floor' );
2524
var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
2625
var Float32Array = require( '@stdlib/array/float32' );
2726
var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );
@@ -37,7 +36,7 @@ tape( 'main export is a function', function test( t ) {
3736
});
3837

3938
tape( 'the function has an arity of 4', function test( t ) {
40-
t.strictEqual( sasumpw.length, 4, 'has expected arity' );
39+
t.strictEqual( sasumpw.length, 4, 'returns expected value' );
4140
t.end();
4241
});
4342

@@ -119,7 +118,7 @@ tape( 'the function supports a `stride` parameter', function test( t ) {
119118
2.0
120119
]);
121120

122-
N = floor( x.length / 2 );
121+
N = 4;
123122
v = sasumpw( N, x, 2, 0 );
124123

125124
t.strictEqual( v, 9.0, 'returns expected value' );
@@ -143,7 +142,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t )
143142
2.0
144143
]);
145144

146-
N = floor( x.length / 2 );
145+
N = 4;
147146
v = sasumpw( N, x, -2, 6 );
148147

149148
t.strictEqual( v, 9.0, 'returns expected value' );
@@ -185,7 +184,7 @@ tape( 'the function supports an `offset` parameter', function test( t ) {
185184
3.0,
186185
4.0 // 3
187186
]);
188-
N = floor( x.length / 2 );
187+
N = 4;
189188

190189
v = sasumpw( N, x, 2, 1 );
191190
t.strictEqual( v, 9.0, 'returns expected value' );

‎lib/node_modules/@stdlib/blas/ext/base/sasumpw/test/test.ndarray.native.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
var resolve = require( 'path' ).resolve;
2424
var tape = require( 'tape' );
25-
var floor = require( '@stdlib/math/base/special/floor' );
2625
var isnanf = require( '@stdlib/math/base/assert/is-nanf' );
2726
var Float32Array = require( '@stdlib/array/float32' );
2827
var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );
@@ -46,7 +45,7 @@ tape( 'main export is a function', opts, function test( t ) {
4645
});
4746

4847
tape( 'the function has an arity of 4', opts, function test( t ) {
49-
t.strictEqual( sasumpw.length, 4, 'has expected arity' );
48+
t.strictEqual( sasumpw.length, 4, 'returns expected value' );
5049
t.end();
5150
});
5251

@@ -128,7 +127,7 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) {
128127
2.0
129128
]);
130129

131-
N = floor( x.length / 2 );
130+
N = 4;
132131
v = sasumpw( N, x, 2, 0 );
133132

134133
t.strictEqual( v, 9.0, 'returns expected value' );
@@ -152,7 +151,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test
152151
2.0
153152
]);
154153

155-
N = floor( x.length / 2 );
154+
N = 4;
156155
v = sasumpw( N, x, -2, 6 );
157156

158157
t.strictEqual( v, 9.0, 'returns expected value' );
@@ -194,7 +193,7 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) {
194193
3.0,
195194
4.0 // 3
196195
]);
197-
N = floor( x.length / 2 );
196+
N = 4;
198197

199198
v = sasumpw( N, x, 2, 1 );
200199
t.strictEqual( v, 9.0, 'returns expected value' );

0 commit comments

Comments
 (0)