Skip to content

Commit c6703d9

Browse files
alextes90kgrytePlaneshifter
authored
refactor: update blas/ext/base/sdsnansum to follow current project convention
PR-URL: #1773 Closes: #1523 --------- Signed-off-by: Athan Reines <[email protected]> Co-authored-by: Athan Reines <[email protected]> Co-authored-by: Philipp Burckhardt <[email protected]> Reviewed-by: Athan Reines <[email protected]> Reviewed-by: Philipp Burckhardt <[email protected]>
1 parent 832504a commit c6703d9

19 files changed

+231
-316
lines changed

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

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
@license Apache-2.0
44
5-
Copyright (c) 2020 The Stdlib Authors.
5+
Copyright (c) 2024 The Stdlib Authors.
66
77
Licensed under the Apache License, Version 2.0 (the "License");
88
you may not use this file except in compliance with the License.
@@ -44,28 +44,25 @@ Computes the sum of single-precision floating-point strided array elements, igno
4444
var Float32Array = require( '@stdlib/array/float32' );
4545

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

49-
var v = sdsnansum( N, x, 1 );
48+
var v = sdsnansum( 4, x, 1 );
5049
// returns 1.0
5150
```
5251

5352
The function has the following parameters:
5453

5554
- **N**: number of indexed elements.
5655
- **x**: input [`Float32Array`][@stdlib/array/float32].
57-
- **stride**: index increment for `x`.
56+
- **stride**: index increment for the strided array.
5857

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`,
58+
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 the strided array,
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, NaN, -7.0, NaN, 3.0, 4.0, 2.0 ] );
66-
var N = floor( x.length / 2 );
6764

68-
var v = sdsnansum( N, x, 2 );
65+
var v = sdsnansum( 4, x, 2 );
6966
// returns 5.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, NaN, -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 = sdsnansum( N, x1, 2 );
79+
var v = sdsnansum( 4, x1, 2 );
8680
// returns 5.0
8781
```
8882

@@ -102,18 +96,16 @@ var v = sdsnansum.ndarray( N, x, 1, 0 );
10296

10397
The function has the following additional parameters:
10498

105-
- **offset**: starting index for `x`.
99+
- **offset**: starting index for the strided array.
106100

107-
While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, the `offset` parameter supports indexing semantics based on a starting index. For example, to calculate the sum of every other value in `x` starting from the second value
101+
While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, the `offset` parameter supports indexing semantics based on a starting index. For example, to calculate the sum of every other value in the strided array starting from the second value
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 = sdsnansum.ndarray( N, x, 2, 1 );
108+
var v = sdsnansum.ndarray( 4, x, 2, 1 );
117109
// returns 5.0
118110
```
119111

@@ -139,22 +131,19 @@ var v = sdsnansum.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 sdsnansum = require( '@stdlib/blas/ext/base/sdsnansum' );
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 = sdsnansum( x.length, x, 1 );

lib/node_modules/@stdlib/blas/ext/base/sdsnansum/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 sdsnansum = require( './../lib/sdsnansum.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 sdsnansum = require( './../lib/sdsnansum.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/sdsnansum/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/sdsnansum/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 sdsnansum = 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 sdsnansum = 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/sdsnansum/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/sdsnansum/docs/repl.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11

22
{{alias}}( N, x, stride )
3-
Computes the sum of single-precision floating-point strided array elements,
4-
ignoring `NaN` values and using extended accumulation.
3+
Computes the sum of single-precision floating-point strided array
4+
elements, ignore `NaN` values and using extended accumulation.
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
7+
strided array are accessed
78
at runtime.
89

910
Indexing is relative to the first index. To introduce an offset, use a typed
@@ -36,19 +37,18 @@
3637

3738
// Using `N` and `stride` parameters:
3839
> x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0, NaN, NaN ] );
39-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
4040
> var stride = 2;
41-
> {{alias}}( N, x, stride )
41+
> {{alias}}( 4, x, stride )
4242
1.0
4343

4444
// Using view offsets:
4545
> var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] );
4646
> 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 );
4847
> stride = 2;
49-
> {{alias}}( N, x1, stride )
48+
> {{alias}}( 4, x1, stride )
5049
-1.0
5150

51+
5252
{{alias}}.ndarray( N, x, stride, offset )
5353
Computes the sum of single-precision floating-point strided array elements,
5454
ignoring `NaN` values and using extended accumulation and alternative
@@ -85,9 +85,8 @@
8585
1.0
8686

8787
// Using offset parameter:
88-
> var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] );
89-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
90-
> {{alias}}.ndarray( N, x, 2, 1 )
88+
> x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] );
89+
> {{alias}}.ndarray( 4, x, 2, 1 )
9190
-1.0
9291

9392
See Also

lib/node_modules/@stdlib/blas/ext/base/sdsnansum/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 sdsnansum = 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 = sdsnansum( x.length, x, 1 );

lib/node_modules/@stdlib/blas/ext/base/sdsnansum/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

0 commit comments

Comments
 (0)