Skip to content

Commit 743fd05

Browse files
refactor: update blas/ext/base/scusumkbn2 to follow current project conventions
PR-URL: #1961 Closes: #1518 --------- Signed-off-by: Philipp Burckhardt <[email protected]> Co-authored-by: Philipp Burckhardt <[email protected]> Reviewed-by: Philipp Burckhardt <[email protected]>
1 parent 37a6dfc commit 743fd05

File tree

17 files changed

+220
-327
lines changed

17 files changed

+220
-327
lines changed

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

Lines changed: 13 additions & 27 deletions
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 = scusumkbn2( N, 0.0, x, 2, y, 1 );
76+
var v = scusumkbn2( 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-
scusumkbn2( N, 0.0, x1, -2, y1, 1 );
95+
scusumkbn2( 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

@@ -110,9 +104,9 @@ Computes the cumulative sum of single-precision floating-point strided array ele
110104
var Float32Array = require( '@stdlib/array/float32' );
111105

112106
var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );
113-
var y = new Float32Array( x.length );
107+
var y = new Float32Array( 3 );
114108

115-
scusumkbn2.ndarray( x.length, 0.0, x, 1, 0, y, 1, 0 );
109+
scusumkbn2.ndarray( 3, 0.0, x, 1, 0, y, 1, 0 );
116110
// y => <Float32Array>[ 1.0, -1.0, 1.0 ]
117111
```
118112

@@ -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-
scusumkbn2.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 );
126+
scusumkbn2.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

@@ -157,21 +148,16 @@ scusumkbn2.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 );
157148
<!-- eslint no-undef: "error" -->
158149

159150
```javascript
160-
var randu = require( '@stdlib/random/base/randu' );
161-
var round = require( '@stdlib/math/base/special/round' );
162-
var Float32Array = require( '@stdlib/array/float32' );
151+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
152+
var filledarrayBy = require( '@stdlib/array/filled-by' );
163153
var scusumkbn2 = require( '@stdlib/blas/ext/base/scusumkbn2' );
164154

165-
var y;
166-
var x;
167-
var i;
155+
var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) );
168156

169-
x = new Float32Array( 10 );
170-
y = new Float32Array( x.length );
171-
for ( i = 0; i < x.length; i++ ) {
172-
x[ i ] = round( randu()*100.0 );
173-
}
174157
console.log( x );
158+
159+
var y = filledarrayBy( x.length, 'float32', discreteUniform( 0, 10 ) );
160+
175161
console.log( y );
176162

177163
scusumkbn2( x.length, 0.0, x, 1, y, -1 );

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

Lines changed: 9 additions & 11 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 isnanf = require( '@stdlib/math/base/assert/is-nanf' );
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 scusumkbn2 = require( './../lib/scusumkbn2.js' );
3030

3131

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

3439
/**
@@ -39,15 +44,8 @@ var scusumkbn2 = require( './../lib/scusumkbn2.js' );
3944
* @returns {Function} benchmark function
4045
*/
4146
function createBenchmark( len ) {
42-
var y;
43-
var x;
44-
var i;
45-
46-
x = new Float32Array( len );
47-
y = new Float32Array( len );
48-
for ( i = 0; i < x.length; i++ ) {
49-
x[ i ] = ( randu()*20.0 ) - 10.0;
50-
}
47+
var x = filledarrayBy( len, 'float32', rand );
48+
var y = filledarrayBy( len, 'float32', rand );
5149
return benchmark;
5250

5351
function benchmark( b ) {

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

Lines changed: 5 additions & 11 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 isnanf = require( '@stdlib/math/base/assert/is-nanf' );
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 scusumkbn2 = tryRequire( resolve( __dirname, './../lib/scusumkbn2.native.js'
3636
var opts = {
3737
'skip': ( scusumkbn2 instanceof Error )
3838
};
39+
var rand = uniform( -100.0, 100.0 );
3940

4041

4142
// FUNCTIONS //
@@ -48,15 +49,8 @@ var opts = {
4849
* @returns {Function} benchmark function
4950
*/
5051
function createBenchmark( len ) {
51-
var x;
52-
var y;
53-
var i;
54-
55-
x = new Float32Array( len );
56-
y = new Float32Array( len );
57-
for ( i = 0; i < x.length; i++ ) {
58-
x[ i ] = ( randu()*20.0 ) - 10.0;
59-
}
52+
var x = filledarrayBy( len, 'float32', rand );
53+
var y = filledarrayBy( len, 'float32', rand );
6054
return benchmark;
6155

6256
function benchmark( b ) {

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

Lines changed: 9 additions & 11 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 isnanf = require( '@stdlib/math/base/assert/is-nanf' );
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 scusumkbn2 = require( './../lib/ndarray.js' );
3030

3131

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

3439
/**
@@ -39,15 +44,8 @@ var scusumkbn2 = require( './../lib/ndarray.js' );
3944
* @returns {Function} benchmark function
4045
*/
4146
function createBenchmark( len ) {
42-
var x;
43-
var y;
44-
var i;
45-
46-
x = new Float32Array( len );
47-
y = new Float32Array( len );
48-
for ( i = 0; i < x.length; i++ ) {
49-
x[ i ] = ( randu()*20.0 ) - 10.0;
50-
}
47+
var x = filledarrayBy( len, 'float32', rand );
48+
var y = filledarrayBy( len, 'float32', rand );
5149
return benchmark;
5250

5351
function benchmark( b ) {

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

Lines changed: 5 additions & 11 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 isnanf = require( '@stdlib/math/base/assert/is-nanf' );
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 scusumkbn2 = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' )
3636
var opts = {
3737
'skip': ( scusumkbn2 instanceof Error )
3838
};
39+
var rand = uniform( -100.0, 100.0 );
3940

4041

4142
// FUNCTIONS //
@@ -48,15 +49,8 @@ var opts = {
4849
* @returns {Function} benchmark function
4950
*/
5051
function createBenchmark( len ) {
51-
var x;
52-
var y;
53-
var i;
54-
55-
x = new Float32Array( len );
56-
y = new Float32Array( len );
57-
for ( i = 0; i < x.length; i++ ) {
58-
x[ i ] = ( randu()*20.0 ) - 10.0;
59-
}
52+
var x = filledarrayBy( len, 'float32', rand );
53+
var y = filledarrayBy( len, 'float32', rand );
6054
return benchmark;
6155

6256
function benchmark( b ) {

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

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
{{alias}}( N, sum, x, strideX, y, strideY )
3-
Computes the cumulative sum of single-precision floating-point strided array
4-
elements using a second-order iterative Kahan–Babuška algorithm.
3+
Computes the cumulative sum of single-precision floating-point strided
4+
array elements using a second-order iterative Kahan–Babuška algorithm.
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
7+
arrays are accessed at runtime.
88

9-
Indexing is relative to the first index. To introduce an offset, use a typed
10-
array view.
9+
Indexing is relative to the first index. To introduce an offset, use
10+
a typed array view.
1111

1212
If `N <= 0`, the function returns `y` unchanged.
1313

@@ -44,11 +44,10 @@
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:
@@ -62,14 +61,16 @@
6261
> y0
6362
<Float32Array>[ 0.0, 0.0, 0.0, -2.0, 0.0, -1.0 ]
6463

64+
6565
{{alias}}.ndarray( N, sum, x, strideX, offsetX, y, strideY, offsetY )
66-
Computes the cumulative sum of single-precision floating-point strided array
67-
elements using a second-order iterative Kahan–Babuška algorithm and
66+
Computes the cumulative sum of single-precision floating-point strided
67+
array elements using a second-order iterative Kahan–Babuška algorithm and
6868
alternative indexing semantics.
6969

7070
While typed array views mandate a view offset based on the underlying
71-
buffer, the `offset` parameter supports indexing semantics based on a
72-
starting index.
71+
buffer, the `offsetX` and `offsetY` parameter supports indexing semantics
72+
based on starting indices.
73+
7374

7475
Parameters
7576
----------
@@ -97,11 +98,13 @@
9798
offsetY: integer
9899
Starting index for `y`.
99100

101+
100102
Returns
101103
-------
102104
out: Float32Array
103105
Output array.
104106

107+
105108
Examples
106109
--------
107110
// Standard Usage:
@@ -113,10 +116,10 @@
113116
// Advanced indexing:
114117
> x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] );
115118
> 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 )
119+
> {{alias}}.ndarray( 3, 0.0, x, 2, 1, y, -1, y.length-1 )
118120
<Float32Array>[ 0.0, 0.0, 0.0, -1.0, 0.0, -2.0 ]
119121

122+
120123
See Also
121124
--------
122125

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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@
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 scusumkbn2 = require( './../lib' );
2524

26-
var y;
27-
var x;
28-
var i;
29-
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-
}
25+
var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) );
3526
console.log( x );
27+
28+
var y = filledarrayBy( x.length, 'float32', discreteUniform( 0, 10 ) );
3629
console.log( y );
3730

3831
scusumkbn2( x.length, 0.0, x, 1, y, -1 );

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