Skip to content

Commit e9360fe

Browse files
committed
Merge branch 'develop' of https://github.com/stdlib-js/stdlib into develop
2 parents c4ccb4b + f580092 commit e9360fe

File tree

22 files changed

+210
-336
lines changed

22 files changed

+210
-336
lines changed

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

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,14 @@ 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' );
73-
7472
var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ] );
7573
var y = new Float32Array( x.length );
7674

77-
var N = floor( x.length / 2 );
78-
79-
var v = scusumkbn( N, 0.0, x, 2, y, 1 );
75+
var v = scusumkbn( 4, 0.0, x, 2, y, 1 );
8076
// y => <Float32Array>[ 1.0, 3.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ]
8177
```
8278

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

8783
```javascript
8884
var Float32Array = require( '@stdlib/array/float32' );
89-
var floor = require( '@stdlib/math/base/special/floor' );
9085

9186
// Initial arrays...
9287
var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
@@ -96,9 +91,7 @@ var y0 = new Float32Array( x0.length );
9691
var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element
9792
var y1 = new Float32Array( y0.buffer, y0.BYTES_PER_ELEMENT*3 ); // start at 4th element
9893

99-
var N = floor( x0.length / 2 );
100-
101-
scusumkbn( N, 0.0, x1, -2, y1, 1 );
94+
scusumkbn( 4, 0.0, x1, -2, y1, 1 );
10295
// y0 => <Float32Array>[ 0.0, 0.0, 0.0, 4.0, 6.0, 4.0, 5.0, 0.0 ]
10396
```
10497

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

112105
var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );
113-
var y = new Float32Array( x.length );
106+
var y = new Float32Array( 3 );
114107

115-
scusumkbn.ndarray( x.length, 0.0, x, 1, 0, y, 1, 0 );
108+
scusumkbn.ndarray( 3, 0.0, x, 1, 0, y, 1, 0 );
116109
// y => <Float32Array>[ 1.0, -1.0, 1.0 ]
117110
```
118111

@@ -121,18 +114,15 @@ The function has the following additional parameters:
121114
- **offsetX**: starting index for `x`.
122115
- **offsetY**: starting index for `y`.
123116

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
117+
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
125118

126119
```javascript
127120
var Float32Array = require( '@stdlib/array/float32' );
128-
var floor = require( '@stdlib/math/base/special/floor' );
129121

130122
var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
131123
var y = new Float32Array( x.length );
132124

133-
var N = floor( x.length / 2 );
134-
135-
scusumkbn.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 );
125+
scusumkbn.ndarray( 4, 0.0, x, 2, 1, y, -1, y.length-1 );
136126
// y => <Float32Array>[ 0.0, 0.0, 0.0, 0.0, 5.0, 1.0, -1.0, 1.0 ]
137127
```
138128

@@ -157,21 +147,14 @@ scusumkbn.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 );
157147
<!-- eslint no-undef: "error" -->
158148

159149
```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' );
150+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
151+
var filledarrayBy = require( '@stdlib/array/filled-by' );
163152
var scusumkbn = require( '@stdlib/blas/ext/base/scusumkbn' );
164153

165-
var y;
166-
var x;
167-
var i;
168-
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-
}
154+
var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) );
174155
console.log( x );
156+
157+
var y = filledarrayBy( x.length, 'float32', discreteUniform( 0, 10 ) );
175158
console.log( y );
176159

177160
scusumkbn( x.length, 0.0, x, 1, y, -1 );

lib/node_modules/@stdlib/blas/ext/base/scusumkbn/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 scusumkbn = require( './../lib/scusumkbn.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 scusumkbn = require( './../lib/scusumkbn.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/scusumkbn/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 scusumkbn = tryRequire( resolve( __dirname, './../lib/scusumkbn.native.js' )
3636
var opts = {
3737
'skip': ( scusumkbn 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/scusumkbn/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 scusumkbn = 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 scusumkbn = 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/scusumkbn/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 scusumkbn = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) )
3636
var opts = {
3737
'skip': ( scusumkbn 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/scusumkbn/docs/repl.txt

Lines changed: 8 additions & 9 deletions
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 an improved 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 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,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,15 @@
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 )
6666
Computes the cumulative sum of single-precision floating-point strided array
6767
elements using an improved Kahan–Babuška algorithm and alternative indexing
6868
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 offset parameters support indexing semantics based on
72+
starting indices.
7373

7474
Parameters
7575
----------
@@ -113,8 +113,7 @@
113113
// Advanced indexing:
114114
> x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] );
115115
> 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 )
116+
> {{alias}}.ndarray( 3, 0.0, x, 2, 1, y, -1, y.length-1 )
118117
<Float32Array>[ 0.0, 0.0, 0.0, -1.0, 0.0, -2.0 ]
119118

120119
See Also

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

lib/node_modules/@stdlib/blas/ext/base/scusumkbn/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/scusumkbn/lib/ndarray.native.js

Lines changed: 7 additions & 9 deletions
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( './scusumkbn.native.js' );
2526

2627

@@ -53,14 +54,11 @@ var addon = require( './scusumkbn.native.js' );
5354
function scusumkbn( N, sum, x, strideX, offsetX, y, strideY, offsetY ) {
5455
var viewX;
5556
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
57+
offsetX = minViewBufferIndex( N, strideX, offsetX );
58+
offsetY = minViewBufferIndex( N, strideY, offsetY );
59+
60+
viewX = offsetView( x, offsetX );
61+
viewY = offsetView( y, offsetY );
6462
addon( N, sum, viewX, strideX, viewY, strideY );
6563
return y;
6664
}

0 commit comments

Comments
 (0)