Skip to content

Commit 87ccb3b

Browse files
refactor: update blas/ext/base/dnansumpw to follow current project conventions
PR-URL: #2076 Closes: #1487 --------- Signed-off-by: Philipp Burckhardt <pburckhardt@outlook.com> Co-authored-by: Philipp Burckhardt <pburckhardt@outlook.com> Reviewed-by: Philipp Burckhardt <pburckhardt@outlook.com>
1 parent 7318f6d commit 87ccb3b

17 files changed

+168
-285
lines changed

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

+8-27
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,14 @@ The function has the following parameters:
5656
- **x**: input [`Float64Array`][@stdlib/array/float64].
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 Float64Array = require( '@stdlib/array/float64' );
63-
var floor = require( '@stdlib/math/base/special/floor' );
6463

6564
var x = new Float64Array( [ 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 = dnansumpw( N, x, 2 );
66+
var v = dnansumpw( 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 Float64Array = require( '@stdlib/array/float64' );
78-
var floor = require( '@stdlib/math/base/special/floor' );
7976

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

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

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

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

99-
var v = dnansumpw.ndarray( N, x, 1, 0 );
93+
var v = dnansumpw.ndarray( 4, 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 Float64Array = require( '@stdlib/array/float64' );
111-
var floor = require( '@stdlib/math/base/special/floor' );
112105

113106
var x = new Float64Array( [ 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 = dnansumpw.ndarray( N, x, 2, 1 );
108+
var v = dnansumpw.ndarray( 4, x, 2, 1 );
117109
// returns 5.0
118110
```
119111

@@ -139,22 +131,11 @@ var v = dnansumpw.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 Float64Array = require( '@stdlib/array/float64' );
134+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
135+
var filledarrayBy = require( '@stdlib/array/filled-by' );
145136
var dnansumpw = require( '@stdlib/blas/ext/base/dnansumpw' );
146137

147-
var x;
148-
var i;
149-
150-
x = new Float64Array( 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 );
156-
}
157-
}
138+
var x = filledarrayBy( 10, 'float64', discreteUniform( 0, 100 ) );
158139
console.log( x );
159140

160141
var v = dnansumpw( x.length, x, 1 );

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

+8-13
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 Float64Array = require( '@stdlib/array/float64' );
2828
var pkg = require( './../package.json' ).name;
2929
var dnansumpw = require( './../lib/dnansumpw.js' );
3030

3131

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

3439
/**
@@ -39,17 +44,7 @@ var dnansumpw = require( './../lib/dnansumpw.js' );
3944
* @returns {Function} benchmark function
4045
*/
4146
function createBenchmark( len ) {
42-
var x;
43-
var i;
44-
45-
x = new Float64Array( 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-
}
47+
var x = filledarrayBy( len, 'float64', rand );
5348
return benchmark;
5449

5550
function benchmark( b ) {

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

+4-13
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 Float64Array = require( '@stdlib/array/float64' );
2929
var tryRequire = require( '@stdlib/utils/try-require' );
3030
var pkg = require( './../package.json' ).name;
3131

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

4041

4142
// FUNCTIONS //
@@ -48,17 +49,7 @@ var opts = {
4849
* @returns {Function} benchmark function
4950
*/
5051
function createBenchmark( len ) {
51-
var x;
52-
var i;
53-
54-
x = new Float64Array( 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-
}
52+
var x = filledarrayBy( len, 'float64', rand );
6253
return benchmark;
6354

6455
function benchmark( b ) {

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

+8-13
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 Float64Array = require( '@stdlib/array/float64' );
2828
var pkg = require( './../package.json' ).name;
2929
var dnansumpw = require( './../lib/ndarray.js' );
3030

3131

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

3439
/**
@@ -39,17 +44,7 @@ var dnansumpw = require( './../lib/ndarray.js' );
3944
* @returns {Function} benchmark function
4045
*/
4146
function createBenchmark( len ) {
42-
var x;
43-
var i;
44-
45-
x = new Float64Array( 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-
}
47+
var x = filledarrayBy( len, 'float64', rand );
5348
return benchmark;
5449

5550
function benchmark( b ) {

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

+4-13
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 Float64Array = require( '@stdlib/array/float64' );
2929
var tryRequire = require( '@stdlib/utils/try-require' );
3030
var pkg = require( './../package.json' ).name;
3131

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

4041

4142
// FUNCTIONS //
@@ -48,17 +49,7 @@ var opts = {
4849
* @returns {Function} benchmark function
4950
*/
5051
function createBenchmark( len ) {
51-
var x;
52-
var i;
53-
54-
x = new Float64Array( 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-
}
52+
var x = filledarrayBy( len, 'float64', rand );
6253
return benchmark;
6354

6455
function benchmark( b ) {

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

+3-14
Original file line numberDiff line numberDiff line change
@@ -18,22 +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 Float64Array = require( '@stdlib/array/float64' );
21+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
22+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2423
var dnansumpw = require( './../lib' );
2524

26-
var x;
27-
var i;
28-
29-
x = new Float64Array( 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 );
35-
}
36-
}
25+
var x = filledarrayBy( 10, 'float64', discreteUniform( -100.0, 100.0 ) );
3726
console.log( x );
3827

3928
var v = dnansumpw( x.length, x, 1 );

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@
3535
*
3636
* @example
3737
* var Float64Array = require( '@stdlib/array/float64' );
38-
* var floor = require( '@stdlib/math/base/special/floor' );
3938
* var dnansumpw = require( '@stdlib/blas/ext/base/dnansumpw' );
4039
*
4140
* var x = new Float64Array( [ 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 );
4341
*
44-
* var v = dnansumpw.ndarray( N, x, 2, 1 );
42+
* var v = dnansumpw.ndarray( 5, x, 2, 1 );
4543
* // returns 5.0
4644
*/
4745

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,10 @@ var BLOCKSIZE = 128;
5151
*
5252
* @example
5353
* var Float64Array = require( '@stdlib/array/float64' );
54-
* var floor = require( '@stdlib/math/base/special/floor' );
5554
*
5655
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
57-
* var N = floor( x.length / 2 );
5856
*
59-
* var v = dnansumpw( N, x, 2, 1 );
57+
* var v = dnansumpw( 5, x, 2, 1 );
6058
* // returns 5.0
6159
*/
6260
function dnansumpw( N, x, stride, offset ) {

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

+5-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
// MODULES //
2222

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

2627

@@ -37,20 +38,16 @@ var addon = require( './dnansumpw.native.js' );
3738
*
3839
* @example
3940
* var Float64Array = require( '@stdlib/array/float64' );
40-
* var floor = require( '@stdlib/math/base/special/floor' );
4141
*
4242
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
43-
* var N = floor( x.length / 2 );
4443
*
45-
* var v = dnansumpw( N, x, 2, 1 );
44+
* var v = dnansumpw( 5, x, 2, 1 );
4645
* // returns 5.0
4746
*/
4847
function dnansumpw( N, x, stride, offset ) {
4948
var view;
50-
if ( stride < 0 ) {
51-
offset += (N-1) * stride;
52-
}
53-
view = new Float64Array( 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

0 commit comments

Comments
 (0)