Skip to content

Commit 3e80682

Browse files
refactor: update implementation for blas/ext/base/sdsnansumpw
PR-URL: #2863 Closes: #1524 --------- Signed-off-by: Philipp Burckhardt <[email protected]> Co-authored-by: Philipp Burckhardt <[email protected]> Reviewed-by: Philipp Burckhardt <[email protected]>
1 parent c6bf7de commit 3e80682

20 files changed

+231
-315
lines changed

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

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,14 @@ The function has the following parameters:
5656
- **x**: input [`Float32Array`][@stdlib/array/float32].
5757
- **stride**: index increment for `x`.
5858

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

6161
```javascript
6262
var Float32Array = require( '@stdlib/array/float32' );
63-
var floor = require( '@stdlib/math/base/special/floor' );
6463

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

68-
var v = sdsnansumpw( N, x, 2 );
66+
var v = sdsnansumpw( 4, x, 2 );
6967
// returns 5.0
7068
```
7169

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

7674
```javascript
7775
var Float32Array = require( '@stdlib/array/float32' );
78-
var floor = require( '@stdlib/math/base/special/floor' );
7976

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

83-
var N = floor( x0.length / 2 );
84-
85-
var v = sdsnansumpw( N, x1, 2 );
80+
var v = sdsnansumpw( 4, x1, 2 );
8681
// returns 5.0
8782
```
8883

@@ -94,9 +89,8 @@ Computes the sum of single-precision floating-point strided array elements, igno
9489
var Float32Array = require( '@stdlib/array/float32' );
9590

9691
var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] );
97-
var N = x.length;
9892

99-
var v = sdsnansumpw.ndarray( N, x, 1, 0 );
93+
var v = sdsnansumpw.ndarray( x.length, x, 1, 0 );
10094
// returns 1.0
10195
```
10296

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

109103
```javascript
110104
var Float32Array = require( '@stdlib/array/float32' );
111-
var floor = require( '@stdlib/math/base/special/floor' );
112105

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

116-
var v = sdsnansumpw.ndarray( N, x, 2, 1 );
108+
var v = sdsnansumpw.ndarray( 4, x, 2, 1 );
117109
// returns 5.0
118110
```
119111

@@ -139,22 +131,19 @@ var v = sdsnansumpw.ndarray( N, x, 2, 1 );
139131
<!-- eslint no-undef: "error" -->
140132

141133
```javascript
142-
var randu = require( '@stdlib/random/base/randu' );
143-
var round = require( '@stdlib/math/base/special/round' );
144-
var Float32Array = require( '@stdlib/array/float32' );
134+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' );
135+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
136+
var filledarrayBy = require( '@stdlib/array/filled-by' );
145137
var sdsnansumpw = require( '@stdlib/blas/ext/base/sdsnansumpw' );
146138

147-
var x;
148-
var i;
149-
150-
x = new Float32Array( 10 );
151-
for ( i = 0; i < x.length; i++ ) {
152-
if ( randu() < 0.2 ) {
153-
x[ i ] = NaN;
154-
} else {
155-
x[ i ] = round( randu()*100.0 );
139+
function randOrNan() {
140+
if ( bernoulli() < 0.2 ) {
141+
return NaN;
156142
}
143+
return discreteUniform( 0, 100 );
157144
}
145+
146+
var x = filledarrayBy( 10, 'float32', randOrNan );
158147
console.log( x );
159148

160149
var v = sdsnansumpw( x.length, x, 1 );

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,24 @@
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' );
25+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
26+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2527
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2628
var pow = require( '@stdlib/math/base/special/pow' );
27-
var Float32Array = require( '@stdlib/array/float32' );
2829
var pkg = require( './../package.json' ).name;
2930
var sdsnansumpw = require( './../lib/sdsnansumpw.js' );
3031

3132

3233
// FUNCTIONS //
3334

35+
function randOrNan() {
36+
if ( bernoulli() < 0.2 ) {
37+
return NaN;
38+
}
39+
return uniform( -20.0, -10.0 );
40+
}
41+
3442
/**
3543
* Creates a benchmark function.
3644
*
@@ -39,17 +47,7 @@ var sdsnansumpw = require( './../lib/sdsnansumpw.js' );
3947
* @returns {Function} benchmark function
4048
*/
4149
function createBenchmark( len ) {
42-
var x;
43-
var i;
44-
45-
x = new Float32Array( len );
46-
for ( i = 0; i < x.length; i++ ) {
47-
if ( randu() < 0.2 ) {
48-
x[ i ] = NaN;
49-
} else {
50-
x[ i ] = ( randu()*10.0 ) - 20.0;
51-
}
52-
}
50+
var x = filledarrayBy( len, 'float32', randOrNan );
5351
return benchmark;
5452

5553
function benchmark( b ) {

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

Lines changed: 11 additions & 13 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' );
26+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
27+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2628
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2729
var pow = require( '@stdlib/math/base/special/pow' );
28-
var Float32Array = require( '@stdlib/array/float32' );
2930
var tryRequire = require( '@stdlib/utils/try-require' );
3031
var pkg = require( './../package.json' ).name;
3132

@@ -40,6 +41,13 @@ var opts = {
4041

4142
// FUNCTIONS //
4243

44+
function randOrNan() {
45+
if ( bernoulli() < 0.2 ) {
46+
return NaN;
47+
}
48+
return uniform( -20.0, -10.0 );
49+
}
50+
4351
/**
4452
* Creates a benchmark function.
4553
*
@@ -48,17 +56,7 @@ var opts = {
4856
* @returns {Function} benchmark function
4957
*/
5058
function createBenchmark( len ) {
51-
var x;
52-
var i;
53-
54-
x = new Float32Array( len );
55-
for ( i = 0; i < x.length; i++ ) {
56-
if ( randu() < 0.2 ) {
57-
x[ i ] = NaN;
58-
} else {
59-
x[ i ] = ( randu()*10.0 ) - 20.0;
60-
}
61-
}
59+
var x = filledarrayBy( len, 'float32', randOrNan );
6260
return benchmark;
6361

6462
function benchmark( b ) {

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,24 @@
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' );
25+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
26+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2527
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2628
var pow = require( '@stdlib/math/base/special/pow' );
27-
var Float32Array = require( '@stdlib/array/float32' );
2829
var pkg = require( './../package.json' ).name;
2930
var sdsnansumpw = require( './../lib/ndarray.js' );
3031

3132

3233
// FUNCTIONS //
3334

35+
function randOrNan() {
36+
if ( bernoulli() < 0.2 ) {
37+
return NaN;
38+
}
39+
return uniform( -20.0, -10.0 );
40+
}
41+
3442
/**
3543
* Creates a benchmark function.
3644
*
@@ -39,17 +47,7 @@ var sdsnansumpw = require( './../lib/ndarray.js' );
3947
* @returns {Function} benchmark function
4048
*/
4149
function createBenchmark( len ) {
42-
var x;
43-
var i;
44-
45-
x = new Float32Array( len );
46-
for ( i = 0; i < x.length; i++ ) {
47-
if ( randu() < 0.2 ) {
48-
x[ i ] = NaN;
49-
} else {
50-
x[ i ] = ( randu()*10.0 ) - 20.0;
51-
}
52-
}
50+
var x = filledarrayBy( len, 'float32', randOrNan );
5351
return benchmark;
5452

5553
function benchmark( b ) {

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

Lines changed: 11 additions & 13 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' );
26+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
27+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2628
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2729
var pow = require( '@stdlib/math/base/special/pow' );
28-
var Float32Array = require( '@stdlib/array/float32' );
2930
var tryRequire = require( '@stdlib/utils/try-require' );
3031
var pkg = require( './../package.json' ).name;
3132

@@ -40,6 +41,13 @@ var opts = {
4041

4142
// FUNCTIONS //
4243

44+
function randOrNan() {
45+
if ( bernoulli() < 0.2 ) {
46+
return NaN;
47+
}
48+
return uniform( -20.0, -10.0 );
49+
}
50+
4351
/**
4452
* Creates a benchmark function.
4553
*
@@ -48,17 +56,7 @@ var opts = {
4856
* @returns {Function} benchmark function
4957
*/
5058
function createBenchmark( len ) {
51-
var x;
52-
var i;
53-
54-
x = new Float32Array( len );
55-
for ( i = 0; i < x.length; i++ ) {
56-
if ( randu() < 0.2 ) {
57-
x[ i ] = NaN;
58-
} else {
59-
x[ i ] = ( randu()*10.0 ) - 20.0;
60-
}
61-
}
59+
var x = filledarrayBy( len, 'float32', randOrNan );
6260
return benchmark;
6361

6462
function benchmark( b ) {

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
ignoring `NaN` values and using pairwise summation with extended
55
accumulation.
66

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

1010
Indexing is relative to the first index. To introduce an offset, use a typed
1111
array view.
@@ -37,19 +37,16 @@
3737

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

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

49+
5350
{{alias}}.ndarray( N, x, stride, offset )
5451
Computes the sum of single-precision floating-point strided array elements,
5552
ignoring `NaN` values and using pairwise summation with extended
@@ -87,8 +84,7 @@
8784

8885
// Using offset parameter:
8986
> var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] );
90-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
91-
> {{alias}}.ndarray( N, x, 2, 1 )
87+
> {{alias}}.ndarray( 4, x, 2, 1 )
9288
-1.0
9389

9490
See Also

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,19 @@
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' );
22+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
23+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2424
var sdsnansumpw = require( './../lib' );
2525

26-
var x;
27-
var i;
28-
29-
x = new Float32Array( 10 );
30-
for ( i = 0; i < x.length; i++ ) {
31-
if ( randu() < 0.2 ) {
32-
x[ i ] = NaN;
33-
} else {
34-
x[ i ] = round( randu()*100.0 );
26+
function randOrNan() {
27+
if ( bernoulli() < 0.2 ) {
28+
return NaN;
3529
}
30+
return discreteUniform( 0, 100 );
3631
}
32+
33+
var x = filledarrayBy( 10, 'float32', randOrNan );
3734
console.log( x );
3835

3936
var v = sdsnansumpw( x.length, x, 1 );

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,17 @@
2828
* var sdsnansumpw = require( '@stdlib/blas/ext/base/sdsnansumpw' );
2929
*
3030
* var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] );
31-
* var N = x.length;
3231
*
33-
* var v = sdsnansumpw( N, x, 1 );
32+
* var v = sdsnansumpw( x.length, x, 1 );
3433
* // returns 1.0
3534
*
3635
* @example
3736
* var Float32Array = require( '@stdlib/array/float32' );
38-
* var floor = require( '@stdlib/math/base/special/floor' );
3937
* var sdsnansumpw = require( '@stdlib/blas/ext/base/sdsnansumpw' );
4038
*
4139
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
42-
* var N = floor( x.length / 2 );
4340
*
44-
* var v = sdsnansumpw.ndarray( N, x, 2, 1 );
41+
* var v = sdsnansumpw.ndarray( 5, x, 2, 1 );
4542
* // returns 5.0
4643
*/
4744

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ var BLOCKSIZE = 128;
5555
* var floor = require( '@stdlib/math/base/special/floor' );
5656
*
5757
* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
58-
* var N = floor( x.length / 2 );
5958
*
60-
* var v = sdsnansumpw( N, x, 2, 1 );
59+
* var v = sdsnansumpw( 5, x, 2, 1 );
6160
* // returns 5.0
6261
*/
6362
function sdsnansumpw( N, x, stride, offset ) {

0 commit comments

Comments
 (0)