Skip to content

Commit 548f903

Browse files
refactor: update blas/ext/base/scusumors
PR-URL: #1945 Closes: #1519 --------- Signed-off-by: Bryan Elee <[email protected]> Co-authored-by: Philipp Burckhardt <[email protected]> Reviewed-by: Philipp Burckhardt <[email protected]>
1 parent 7945e17 commit 548f903

19 files changed

+195
-326
lines changed

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

+10-25
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,15 @@ The function has the following parameters:
6565
- **y**: output [`Float32Array`][@stdlib/array/float32].
6666
- **strideY**: index increment for `y`.
6767

68-
The `N` and `stride` parameters determine which elements in `x` and `y` are accessed at runtime. For example, to compute the cumulative sum of every other element in `x`,
68+
The `N` and stride parameters determine which elements in the strided arrays are accessed at runtime. For example, to compute the cumulative sum of every other element in `x`,
6969

7070
```javascript
7171
var Float32Array = require( '@stdlib/array/float32' );
72-
var floor = require( '@stdlib/math/base/special/floor' );
7372

7473
var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ] );
7574
var y = new Float32Array( x.length );
7675

77-
var N = floor( x.length / 2 );
78-
79-
var v = scusumors( N, 0.0, x, 2, y, 1 );
76+
var v = scusumors( 4, 0.0, x, 2, y, 1 );
8077
// y => <Float32Array>[ 1.0, 3.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ]
8178
```
8279

@@ -86,7 +83,6 @@ Note that indexing is relative to the first index. To introduce an offset, use [
8683

8784
```javascript
8885
var Float32Array = require( '@stdlib/array/float32' );
89-
var floor = require( '@stdlib/math/base/special/floor' );
9086

9187
// Initial arrays...
9288
var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
@@ -96,9 +92,7 @@ var y0 = new Float32Array( x0.length );
9692
var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element
9793
var y1 = new Float32Array( y0.buffer, y0.BYTES_PER_ELEMENT*3 ); // start at 4th element
9894

99-
var N = floor( x0.length / 2 );
100-
101-
scusumors( N, 0.0, x1, -2, y1, 1 );
95+
scusumors( 4, 0.0, x1, -2, y1, 1 );
10296
// y0 => <Float32Array>[ 0.0, 0.0, 0.0, 4.0, 6.0, 4.0, 5.0, 0.0 ]
10397
```
10498

@@ -121,18 +115,15 @@ The function has the following additional parameters:
121115
- **offsetX**: starting index for `x`.
122116
- **offsetY**: starting index for `y`.
123117

124-
While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, `offsetX` and `offsetY` parameters support indexing semantics based on a starting indices. For example, to calculate the cumulative sum of every other value in `x` starting from the second value and to store in the last `N` elements of `y` starting from the last element
118+
While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, offset parameters support indexing semantics based on a starting indices. For example, to calculate the cumulative sum of every other value in `x` starting from the second value and to store in the last `N` elements of `y` starting from the last element
125119

126120
```javascript
127121
var Float32Array = require( '@stdlib/array/float32' );
128-
var floor = require( '@stdlib/math/base/special/floor' );
129122

130123
var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
131124
var y = new Float32Array( x.length );
132125

133-
var N = floor( x.length / 2 );
134-
135-
scusumors.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 );
126+
scusumors.ndarray( 4, 0.0, x, 2, 1, y, -1, y.length-1 );
136127
// y => <Float32Array>[ 0.0, 0.0, 0.0, 0.0, 5.0, 1.0, -1.0, 1.0 ]
137128
```
138129

@@ -144,7 +135,7 @@ scusumors.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 );
144135

145136
## Notes
146137

147-
- If `N <= 0`, both functions return `y` unchanged.
138+
- If `N <= 0`, both functions return the output array unchanged.
148139
- Ordinary recursive summation (i.e., a "simple" sum) is performant, but can incur significant numerical error. If performance is paramount and error tolerated, using ordinary recursive summation is acceptable; in all other cases, exercise due caution.
149140

150141
</section>
@@ -158,20 +149,14 @@ scusumors.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 );
158149
<!-- eslint no-undef: "error" -->
159150

160151
```javascript
161-
var randu = require( '@stdlib/random/base/randu' );
162-
var round = require( '@stdlib/math/base/special/round' );
152+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
153+
var filledarrayBy = require( '@stdlib/array/filled-by' );
163154
var Float32Array = require( '@stdlib/array/float32' );
164155
var scusumors = require( '@stdlib/blas/ext/base/scusumors' );
165156

166-
var y;
167-
var x;
168-
var i;
157+
var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) );
158+
var y = new Float32Array( x.length );
169159

170-
x = new Float32Array( 10 );
171-
y = new Float32Array( x.length );
172-
for ( i = 0; i < x.length; i++ ) {
173-
x[ i ] = round( randu()*100.0 );
174-
}
175160
console.log( x );
176161
console.log( y );
177162

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
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' );
2728
var Float32Array = require( '@stdlib/array/float32' );
@@ -41,13 +42,10 @@ var scusumors = require( './../lib/scusumors.js' );
4142
function createBenchmark( len ) {
4243
var y;
4344
var x;
44-
var i;
4545

46-
x = new Float32Array( len );
46+
x = filledarrayBy( len, 'float32', uniform( -10.0, 10.0 ) );
4747
y = new Float32Array( len );
48-
for ( i = 0; i < x.length; i++ ) {
49-
x[ i ] = ( randu()*20.0 ) - 10.0;
50-
}
48+
5149
return benchmark;
5250

5351
function benchmark( b ) {

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
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' );
2829
var Float32Array = require( '@stdlib/array/float32' );
@@ -50,13 +51,10 @@ var opts = {
5051
function createBenchmark( len ) {
5152
var x;
5253
var y;
53-
var i;
5454

55-
x = new Float32Array( len );
55+
x = filledarrayBy( len, 'float32', uniform( -10.0, 10.0 ) );
5656
y = new Float32Array( len );
57-
for ( i = 0; i < x.length; i++ ) {
58-
x[ i ] = ( randu()*20.0 ) - 10.0;
59-
}
57+
6058
return benchmark;
6159

6260
function benchmark( b ) {

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
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' );
2728
var Float32Array = require( '@stdlib/array/float32' );
@@ -41,13 +42,10 @@ var scusumors = require( './../lib/ndarray.js' );
4142
function createBenchmark( len ) {
4243
var x;
4344
var y;
44-
var i;
4545

46-
x = new Float32Array( len );
46+
x = filledarrayBy( len, 'float32', uniform( -10.0, 10.0 ) );
4747
y = new Float32Array( len );
48-
for ( i = 0; i < x.length; i++ ) {
49-
x[ i ] = ( randu()*20.0 ) - 10.0;
50-
}
48+
5149
return benchmark;
5250

5351
function benchmark( b ) {

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
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' );
2829
var Float32Array = require( '@stdlib/array/float32' );
@@ -50,13 +51,10 @@ var opts = {
5051
function createBenchmark( len ) {
5152
var x;
5253
var y;
53-
var i;
5454

55-
x = new Float32Array( len );
55+
x = filledarrayBy( len, 'float32', uniform( -10.0, 10.0 ) );
5656
y = new Float32Array( len );
57-
for ( i = 0; i < x.length; i++ ) {
58-
x[ i ] = ( randu()*20.0 ) - 10.0;
59-
}
57+
6058
return benchmark;
6159

6260
function benchmark( b ) {

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

+7-9
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
Computes the cumulative sum of single-precision floating-point strided array
44
elements using ordinary recursive summation.
55

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

99
Indexing is relative to the first index. To introduce an offset, use a typed
1010
array view.
@@ -44,24 +44,23 @@
4444
> {{alias}}( x.length, 0.0, x, 1, y, 1 )
4545
<Float32Array>[ 1.0, -1.0, 1.0 ]
4646

47-
// Using `N` and `stride` parameters:
47+
// Using `N` and stride parameters:
4848
> x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ] );
4949
> y = new {{alias:@stdlib/array/float32}}( x.length );
50-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
51-
> {{alias}}( N, 0.0, x, 2, y, 2 )
50+
> {{alias}}( 3, 0.0, x, 2, y, 2 )
5251
<Float32Array>[ -2.0, 0.0, -1.0, 0.0, 1.0, 0.0 ]
5352

5453
// Using view offsets:
5554
> var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] );
5655
> var y0 = new {{alias:@stdlib/array/float32}}( x0.length );
5756
> var x1 = new {{alias:@stdlib/array/float32}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 );
5857
> var y1 = new {{alias:@stdlib/array/float32}}( y0.buffer, y0.BYTES_PER_ELEMENT*3 );
59-
> N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 );
60-
> {{alias}}( N, 0.0, x1, 2, y1, 1 )
58+
> {{alias}}( 3, 0.0, x1, 2, y1, 1 )
6159
<Float32Array>[ -2.0, 0.0, -1.0 ]
6260
> y0
6361
<Float32Array>[ 0.0, 0.0, 0.0, -2.0, 0.0, -1.0 ]
6462

63+
6564
{{alias}}.ndarray( N, sum, x, strideX, offsetX, y, strideY, offsetY )
6665
Computes the cumulative sum of single-precision floating-point strided array
6766
elements using ordinary recursive summation and alternative indexing
@@ -113,8 +112,7 @@
113112
// Advanced indexing:
114113
> x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] );
115114
> y = new {{alias:@stdlib/array/float32}}( x.length );
116-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
117-
> {{alias}}.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 )
115+
> {{alias}}.ndarray( 3, 0.0, x, 2, 1, y, -1, y.length-1 )
118116
<Float32Array>[ 0.0, 0.0, 0.0, -1.0, 0.0, -2.0 ]
119117

120118
See Also

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

+4-10
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,14 @@
1818

1919
'use strict';
2020

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

26-
var y;
27-
var x;
28-
var i;
26+
var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) );
27+
var y = new Float32Array( x.length );
2928

30-
x = new Float32Array( 10 );
31-
y = new Float32Array( x.length );
32-
for ( i = 0; i < x.length; i++ ) {
33-
x[ i ] = round( randu()*100.0 );
34-
}
3529
console.log( x );
3630
console.log( y );
3731

lib/node_modules/@stdlib/blas/ext/base/scusumors/include.gypi

+1-1
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/scusumors/lib/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@
3636
*
3737
* @example
3838
* var Float32Array = require( '@stdlib/array/float32' );
39-
* var floor = require( '@stdlib/math/base/special/floor' );
4039
* var scusumors = require( '@stdlib/blas/ext/base/scusumors' );
4140
*
4241
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
4342
* var y = new Float32Array( x.length );
44-
* var N = floor( x.length / 2 );
4543
*
46-
* scusumors.ndarray( N, 0.0, x, 2, 1, y, 1, 0 );
44+
* scusumors.ndarray( 4, 0.0, x, 2, 1, y, 1, 0 );
4745
* // y => <Float32Array>[ 1.0, -1.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ]
4846
*/
4947

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,11 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );
4040
*
4141
* @example
4242
* var Float32Array = require( '@stdlib/array/float32' );
43-
* var floor = require( '@stdlib/math/base/special/floor' );
4443
*
4544
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
4645
* var y = new Float32Array( x.length );
47-
* var N = floor( x.length / 2 );
4846
*
49-
* var v = scusumors( N, 0.0, x, 2, 1, y, 1, 0 );
47+
* var v = scusumors( 4, 0.0, x, 2, 1, y, 1, 0 );
5048
* // returns <Float32Array>[ 1.0, -1.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ]
5149
*/
5250
function scusumors( N, sum, x, strideX, offsetX, y, strideY, offsetY ) {

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

+10-12
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( './scusumors.native.js' );
2526

2627

@@ -41,26 +42,23 @@ var addon = require( './scusumors.native.js' );
4142
*
4243
* @example
4344
* var Float32Array = require( '@stdlib/array/float32' );
44-
* var floor = require( '@stdlib/math/base/special/floor' );
4545
*
4646
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
4747
* var y = new Float32Array( x.length );
48-
* var N = floor( x.length / 2 );
4948
*
50-
* var v = scusumors( N, 0.0, x, 2, 1, y, 1, 0 );
49+
* var v = scusumors( 4, 0.0, x, 2, 1, y, 1, 0 );
5150
* // returns <Float32Array>[ 1.0, -1.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ]
5251
*/
5352
function scusumors( N, sum, x, strideX, offsetX, y, strideY, offsetY ) {
5453
var viewX;
5554
var viewY;
56-
if ( strideX < 0 ) {
57-
offsetX += (N-1) * strideX;
58-
}
59-
if ( strideY < 0 ) {
60-
offsetY += (N-1) * strideY;
61-
}
62-
viewX = new Float32Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offsetX), x.length-offsetX ); // eslint-disable-line max-len
63-
viewY = new Float32Array( y.buffer, y.byteOffset+(y.BYTES_PER_ELEMENT*offsetY), y.length-offsetY ); // eslint-disable-line max-len
55+
56+
offsetX = minViewBufferIndex( N, strideX, offsetX );
57+
offsetY = minViewBufferIndex( N, strideY, offsetY );
58+
59+
viewX = offsetView( x, offsetX );
60+
viewY = offsetView( y, offsetY );
61+
6462
addon( N, sum, viewX, strideX, viewY, strideY );
6563
return y;
6664
}

0 commit comments

Comments
 (0)