Skip to content

Commit a70e23d

Browse files
refactor: update blas/ext/base/dasumpw to follow current project conventions
PR-URL: #1998 Closes: #1470 --------- Signed-off-by: utkarsh_raj <[email protected]> Signed-off-by: Philipp Burckhardt <[email protected]> Co-authored-by: Philipp Burckhardt <[email protected]> Reviewed-by: Philipp Burckhardt <[email protected]>
1 parent a9016c6 commit a70e23d

17 files changed

+182
-259
lines changed

Diff for: lib/node_modules/@stdlib/blas/ext/base/dasumpw/README.md

+7-21
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,14 @@ The function has the following parameters:
7171
- **x**: input [`Float64Array`][@stdlib/array/float64].
7272
- **stride**: index increment for `x`.
7373

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

7676
```javascript
7777
var Float64Array = require( '@stdlib/array/float64' );
78-
var floor = require( '@stdlib/math/base/special/floor' );
7978

8079
var x = new Float64Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ] );
81-
var N = floor( x.length / 2 );
8280

83-
var v = dasumpw( N, x, 2 );
81+
var v = dasumpw( 4, x, 2 );
8482
// returns 9.0
8583
```
8684

@@ -90,14 +88,11 @@ Note that indexing is relative to the first index. To introduce an offset, use [
9088

9189
```javascript
9290
var Float64Array = require( '@stdlib/array/float64' );
93-
var floor = require( '@stdlib/math/base/special/floor' );
9491

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

98-
var N = floor( x0.length / 2 );
99-
100-
var v = dasumpw( N, x1, 2 );
95+
var v = dasumpw( 4, x1, 2 );
10196
// returns 9.0
10297
```
10398

@@ -123,12 +118,10 @@ While [`typed array`][mdn-typed-array] views mandate a view offset based on the
123118

124119
```javascript
125120
var Float64Array = require( '@stdlib/array/float64' );
126-
var floor = require( '@stdlib/math/base/special/floor' );
127121

128122
var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
129-
var N = floor( x.length / 2 );
130123

131-
var v = dasumpw.ndarray( N, x, 2, 1 );
124+
var v = dasumpw.ndarray( 4, x, 2, 1 );
132125
// returns 9.0
133126
```
134127

@@ -154,18 +147,11 @@ var v = dasumpw.ndarray( N, x, 2, 1 );
154147
<!-- eslint no-undef: "error" -->
155148

156149
```javascript
157-
var randu = require( '@stdlib/random/base/randu' );
158-
var round = require( '@stdlib/math/base/special/round' );
159-
var Float64Array = require( '@stdlib/array/float64' );
150+
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
151+
var filledarrayBy = require( '@stdlib/array/filled-by' );
160152
var dasumpw = require( '@stdlib/blas/ext/base/dasumpw' );
161153

162-
var x;
163-
var i;
164-
165-
x = new Float64Array( 10 );
166-
for ( i = 0; i < x.length; i++ ) {
167-
x[ i ] = round( randu()*100.0 );
168-
}
154+
var x = filledarrayBy( 10, 'float64', discreteUniform( 0, 100 ) );
169155
console.log( x );
170156

171157
var v = dasumpw( x.length, x, 1 );

Diff for: lib/node_modules/@stdlib/blas/ext/base/dasumpw/benchmark/benchmark.js

+8-9
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 dasumpw = require( './../lib/dasumpw.js' );
3030

3131

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

3439
/**
@@ -39,13 +44,7 @@ var dasumpw = require( './../lib/dasumpw.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-
x[ i ] = ( randu()*20.0 ) - 10.0;
48-
}
47+
var x = filledarrayBy( len, 'float64', rand );
4948
return benchmark;
5049

5150
function benchmark( b ) {

Diff for: lib/node_modules/@stdlib/blas/ext/base/dasumpw/benchmark/benchmark.native.js

+4-9
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 dasumpw = tryRequire( resolve( __dirname, './../lib/dasumpw.native.js' ) );
3636
var opts = {
3737
'skip': ( dasumpw instanceof Error )
3838
};
39+
var rand = uniform( -100.0, 100.0 );
3940

4041

4142
// FUNCTIONS //
@@ -48,13 +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-
x[ i ] = ( randu()*20.0 ) - 10.0;
57-
}
52+
var x = filledarrayBy( len, 'float64', rand );
5853
return benchmark;
5954

6055
function benchmark( b ) {

Diff for: lib/node_modules/@stdlib/blas/ext/base/dasumpw/benchmark/benchmark.ndarray.js

+8-9
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 dasumpw = require( './../lib/ndarray.js' );
3030

3131

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

3439
/**
@@ -39,13 +44,7 @@ var dasumpw = 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-
x[ i ] = ( randu()*20.0 ) - 10.0;
48-
}
47+
var x = filledarrayBy( len, 'float64', rand );
4948
return benchmark;
5049

5150
function benchmark( b ) {

Diff for: lib/node_modules/@stdlib/blas/ext/base/dasumpw/benchmark/benchmark.ndarray.native.js

+4-9
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 dasumpw = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) );
3636
var opts = {
3737
'skip': ( dasumpw instanceof Error )
3838
};
39+
var rand = uniform( -100.0, 100.0 );
3940

4041

4142
// FUNCTIONS //
@@ -48,13 +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-
x[ i ] = ( randu()*20.0 ) - 10.0;
57-
}
52+
var x = filledarrayBy( len, 'float64', rand );
5853
return benchmark;
5954

6055
function benchmark( b ) {

Diff for: lib/node_modules/@stdlib/blas/ext/base/dasumpw/examples/index.js

+3-10
Original file line numberDiff line numberDiff line change
@@ -18,18 +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 dasumpw = require( './../lib' );
2524

26-
var x;
27-
var i;
28-
29-
x = new Float64Array( 10 );
30-
for ( i = 0; i < x.length; i++ ) {
31-
x[ i ] = round( randu()*100.0 );
32-
}
25+
var x = filledarrayBy( 10, 'float64', discreteUniform( -100.0, 100.0 ) );
3326
console.log( x );
3427

3528
var v = dasumpw( x.length, x, 1 );

Diff for: lib/node_modules/@stdlib/blas/ext/base/dasumpw/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

Diff for: lib/node_modules/@stdlib/blas/ext/base/dasumpw/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 dasumpw = require( '@stdlib/blas/ext/base/dasumpw' );
4039
*
4140
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );
42-
* var N = floor( x.length / 2 );
4341
*
44-
* var v = dasumpw.ndarray( N, x, 2, 1 );
42+
* var v = dasumpw.ndarray( 4, x, 2, 1 );
4543
* // returns 9.0
4644
*/
4745

Diff for: lib/node_modules/@stdlib/blas/ext/base/dasumpw/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 ] );
57-
* var N = floor( x.length / 2 );
5856
*
59-
* var v = dasumpw( N, x, 2, 1 );
57+
* var v = dasumpw( 4, x, 2, 1 );
6058
* // returns 9.0
6159
*/
6260
function dasumpw( N, x, stride, offset ) {

Diff for: lib/node_modules/@stdlib/blas/ext/base/dasumpw/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( './dasumpw.native.js' );
2526

2627

@@ -37,20 +38,16 @@ var addon = require( './dasumpw.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 ] );
43-
* var N = floor( x.length / 2 );
4443
*
45-
* var v = dasumpw( N, x, 2, 1 );
44+
* var v = dasumpw( 4, x, 2, 1 );
4645
* // returns 9.0
4746
*/
4847
function dasumpw( 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)