Skip to content

Commit c6bf7de

Browse files
refactor: update implementation for blas/ext/base/sapxsumors
PR-URL: #2862 Closes: #1513 --------- Signed-off-by: Philipp Burckhardt <[email protected]> Co-authored-by: Philipp Burckhardt <[email protected]> Reviewed-by: Philipp Burckhardt <[email protected]>
1 parent 8b090ca commit c6bf7de

20 files changed

+197
-296
lines changed

lib/node_modules/@stdlib/blas/ext/base/sapxsumors/README.md

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ Adds a constant to each single-precision floating-point strided array element an
4444
var Float32Array = require( '@stdlib/array/float32' );
4545

4646
var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );
47-
var N = x.length;
4847

49-
var v = sapxsumors( N, 5.0, x, 1 );
48+
var v = sapxsumors( x.length, 5.0, x, 1 );
5049
// returns 16.0
5150
```
5251

@@ -56,16 +55,14 @@ The function has the following parameters:
5655
- **x**: input [`Float32Array`][@stdlib/array/float32].
5756
- **stride**: index increment for `x`.
5857

59-
The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to access every other element in `x`,
58+
The `N` and `stride` parameters determine which elements in the strided array are accessed at runtime. For example, to access every other element in `x`,
6059

6160
```javascript
6261
var Float32Array = require( '@stdlib/array/float32' );
63-
var floor = require( '@stdlib/math/base/special/floor' );
6462

6563
var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ] );
66-
var N = floor( x.length / 2 );
6764

68-
var v = sapxsumors( N, 5.0, x, 2 );
65+
var v = sapxsumors( 4, 5.0, x, 2 );
6966
// returns 25.0
7067
```
7168

@@ -75,14 +72,11 @@ Note that indexing is relative to the first index. To introduce an offset, use [
7572

7673
```javascript
7774
var Float32Array = require( '@stdlib/array/float32' );
78-
var floor = require( '@stdlib/math/base/special/floor' );
7975

8076
var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
8177
var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element
8278

83-
var N = floor( x0.length / 2 );
84-
85-
var v = sapxsumors( N, 5.0, x1, 2 );
79+
var v = sapxsumors( 4, 5.0, x1, 2 );
8680
// returns 25.0
8781
```
8882

@@ -94,9 +88,8 @@ Adds a constant to each single-precision floating-point strided array element an
9488
var Float32Array = require( '@stdlib/array/float32' );
9589

9690
var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );
97-
var N = x.length;
9891

99-
var v = sapxsumors.ndarray( N, 5.0, x, 1, 0 );
92+
var v = sapxsumors.ndarray( x.length, 5.0, x, 1, 0 );
10093
// returns 16.0
10194
```
10295

@@ -108,12 +101,10 @@ While [`typed array`][mdn-typed-array] views mandate a view offset based on the
108101

109102
```javascript
110103
var Float32Array = require( '@stdlib/array/float32' );
111-
var floor = require( '@stdlib/math/base/special/floor' );
112104

113105
var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
114-
var N = floor( x.length / 2 );
115106

116-
var v = sapxsumors.ndarray( N, 5.0, x, 2, 1 );
107+
var v = sapxsumors.ndarray( 4, 5.0, x, 2, 1 );
117108
// returns 25.0
118109
```
119110

@@ -139,18 +130,12 @@ var v = sapxsumors.ndarray( N, 5.0, x, 2, 1 );
139130
<!-- eslint no-undef: "error" -->
140131

141132
```javascript
142-
var randu = require( '@stdlib/random/base/randu' );
143-
var round = require( '@stdlib/math/base/special/round' );
133+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
134+
var filledarrayBy = require( '@stdlib/array/filled-by' );
144135
var Float32Array = require( '@stdlib/array/float32' );
145136
var sapxsumors = require( '@stdlib/blas/ext/base/sapxsumors' );
146137

147-
var x;
148-
var i;
149-
150-
x = new Float32Array( 10 );
151-
for ( i = 0; i < x.length; i++ ) {
152-
x[ i ] = round( randu()*100.0 );
153-
}
138+
var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ));
154139
console.log( x );
155140

156141
var v = sapxsumors( x.length, 5.0, x, 1 );

lib/node_modules/@stdlib/blas/ext/base/sapxsumors/benchmark/benchmark.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,19 @@
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 isnan = require( '@stdlib/math/base/assert/is-nan' );
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 sapxsumors = require( './../lib/sapxsumors.js' );
3030

3131

32+
// VARIABLES //
33+
34+
var rand = uniform( -100.0, 100.0 );
35+
36+
3237
// FUNCTIONS //
3338

3439
/**
@@ -39,13 +44,7 @@ var sapxsumors = require( './../lib/sapxsumors.js' );
3944
* @returns {Function} benchmark function
4045
*/
4146
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-
}
47+
var x = filledarrayBy( len, 'float32', rand );
4948
return benchmark;
5049

5150
function benchmark( b ) {

lib/node_modules/@stdlib/blas/ext/base/sapxsumors/benchmark/benchmark.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 isnan = require( '@stdlib/math/base/assert/is-nan' );
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

@@ -36,6 +36,7 @@ var sapxsumors = tryRequire( resolve( __dirname, './../lib/sapxsumors.native.js'
3636
var opts = {
3737
'skip': ( sapxsumors instanceof Error )
3838
};
39+
var rand = uniform( -100.0, 100.0 );
3940

4041

4142
// FUNCTIONS //
@@ -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/sapxsumors/benchmark/benchmark.ndarray.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,19 @@
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 isnan = require( '@stdlib/math/base/assert/is-nan' );
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 sapxsumors = require( './../lib/ndarray.js' );
3030

3131

32+
// VARIABLES //
33+
34+
var rand = uniform( -100.0, 100.0 );
35+
36+
3237
// FUNCTIONS //
3338

3439
/**
@@ -39,13 +44,7 @@ var sapxsumors = require( './../lib/ndarray.js' );
3944
* @returns {Function} benchmark function
4045
*/
4146
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-
}
47+
var x = filledarrayBy( len, 'float32', rand );
4948
return benchmark;
5049

5150
function benchmark( b ) {

lib/node_modules/@stdlib/blas/ext/base/sapxsumors/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 isnan = require( '@stdlib/math/base/assert/is-nan' );
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

@@ -36,6 +36,7 @@ var sapxsumors = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' )
3636
var opts = {
3737
'skip': ( sapxsumors instanceof Error )
3838
};
39+
var rand = uniform( -100.0, 100.0 );
3940

4041

4142
// FUNCTIONS //
@@ -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/sapxsumors/docs/repl.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
Adds a constant to each single-precision floating-point strided array
44
element and computes the sum using ordinary recursive summation.
55

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

99
Indexing is relative to the first index. To introduce an offset, use a typed
1010
array view.
@@ -52,6 +52,7 @@
5252
> {{alias}}( N, 5.0, x1, stride )
5353
14.0
5454

55+
5556
{{alias}}.ndarray( N, alpha, x, stride, offset )
5657
Adds a constant to each single-precision floating-point strided array
5758
element and computes the sum using ordinary recursive summation and

lib/node_modules/@stdlib/blas/ext/base/sapxsumors/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 sapxsumors = 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( 0, 100 ) );
3326
console.log( x );
3427

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

lib/node_modules/@stdlib/blas/ext/base/sapxsumors/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/sapxsumors/lib/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
* var sapxsumors = require( '@stdlib/blas/ext/base/sapxsumors' );
2929
*
3030
* var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );
31-
* var N = x.length;
3231
*
33-
* var v = sapxsumors( N, 5.0, x, 1 );
32+
* var v = sapxsumors( x.length, 5.0, x, 1 );
3433
* // returns 16.0
3534
*
3635
* @example
@@ -39,9 +38,8 @@
3938
* var sapxsumors = require( '@stdlib/blas/ext/base/sapxsumors' );
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 = sapxsumors.ndarray( N, 5.0, x, 2, 1 );
42+
* var v = sapxsumors.ndarray( 4, 5.0, x, 2, 1 );
4543
* // returns 25.0
4644
*/
4745

lib/node_modules/@stdlib/blas/ext/base/sapxsumors/lib/ndarray.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );
4040
* 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 = sapxsumors( N, 5.0, x, 2, 1 );
44+
* var v = sapxsumors( 4, 5.0, x, 2, 1 );
4645
* // returns 25.0
4746
*/
4847
function sapxsumors( N, alpha, x, stride, offset ) {

0 commit comments

Comments
 (0)