Skip to content

Commit f2bd056

Browse files
headlessNodeVinit-Pandit
authored andcommitted
refactor: update blas/ext/base/gasumpw to follow current project conventions
PR-URL: stdlib-js#4384 Reviewed-by: Athan Reines <[email protected]>
1 parent 8611e9b commit f2bd056

File tree

11 files changed

+93
-145
lines changed

11 files changed

+93
-145
lines changed

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

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The [_L1_ norm][l1norm] is defined as
5151
var gasumpw = require( '@stdlib/blas/ext/base/gasumpw' );
5252
```
5353

54-
#### gasumpw( N, x, stride )
54+
#### gasumpw( N, x, strideX )
5555

5656
Computes the sum of absolute values ([_L1_ norm][l1norm]) of strided array elements using pairwise summation.
5757

@@ -66,17 +66,14 @@ The function has the following parameters:
6666

6767
- **N**: number of indexed elements.
6868
- **x**: input [`Array`][mdn-array] or [`typed array`][mdn-typed-array].
69-
- **stride**: index increment for `x`.
69+
- **strideX**: stride length.
7070

71-
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`,
71+
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:
7272

7373
```javascript
74-
var floor = require( '@stdlib/math/base/special/floor' );
75-
7674
var x = [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ];
77-
var N = floor( x.length / 2 );
7875

79-
var v = gasumpw( N, x, 2 );
76+
var v = gasumpw( 4, x, 2 );
8077
// returns 9.0
8178
```
8279

@@ -86,18 +83,15 @@ Note that indexing is relative to the first index. To introduce an offset, use [
8683

8784
```javascript
8885
var Float64Array = require( '@stdlib/array/float64' );
89-
var floor = require( '@stdlib/math/base/special/floor' );
9086

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

94-
var N = floor( x0.length / 2 );
95-
96-
var v = gasumpw( N, x1, 2 );
90+
var v = gasumpw( 4, x1, 2 );
9791
// returns 9.0
9892
```
9993

100-
#### gasumpw.ndarray( N, x, stride, offset )
94+
#### gasumpw.ndarray( N, x, strideX, offsetX )
10195

10296
Computes the sum of absolute values ([_L1_ norm][l1norm]) of strided array elements using pairwise summation and alternative indexing semantics.
10397

@@ -110,17 +104,14 @@ var v = gasumpw.ndarray( x.length, x, 1, 0 );
110104

111105
The function has the following additional parameters:
112106

113-
- **offset**: starting index for `x`.
107+
- **offsetX**: starting index.
114108

115-
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 absolute values of every other value in `x` starting from the second value
109+
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 absolute values of every other element starting from the second element:
116110

117111
```javascript
118-
var floor = require( '@stdlib/math/base/special/floor' );
119-
120112
var x = [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ];
121-
var N = floor( x.length / 2 );
122113

123-
var v = gasumpw.ndarray( N, x, 2, 1 );
114+
var v = gasumpw.ndarray( 4, x, 2, 1 );
124115
// returns 9.0
125116
```
126117

@@ -147,18 +138,12 @@ var v = gasumpw.ndarray( N, x, 2, 1 );
147138
<!-- eslint no-undef: "error" -->
148139

149140
```javascript
150-
var randu = require( '@stdlib/random/base/randu' );
151-
var round = require( '@stdlib/math/base/special/round' );
152-
var Float64Array = require( '@stdlib/array/float64' );
141+
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
153142
var gasumpw = require( '@stdlib/blas/ext/base/gasumpw' );
154143

155-
var x;
156-
var i;
157-
158-
x = new Float64Array( 10 );
159-
for ( i = 0; i < x.length; i++ ) {
160-
x[ i ] = round( randu()*100.0 );
161-
}
144+
var x = discreteUniform( 10, -100, 100, {
145+
'dtype': 'float64'
146+
});
162147
console.log( x );
163148

164149
var v = gasumpw( x.length, x, 1 );

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,20 @@
2121
// MODULES //
2222

2323
var bench = require( '@stdlib/bench' );
24-
var randu = require( '@stdlib/random/base/randu' );
24+
var uniform = require( '@stdlib/random/array/uniform' );
2525
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2626
var pow = require( '@stdlib/math/base/special/pow' );
2727
var pkg = require( './../package.json' ).name;
2828
var gasumpw = require( './../lib/main.js' );
2929

3030

31+
// VARIABLES //
32+
33+
var options = {
34+
'dtype': 'generic'
35+
};
36+
37+
3138
// FUNCTIONS //
3239

3340
/**
@@ -38,13 +45,7 @@ var gasumpw = require( './../lib/main.js' );
3845
* @returns {Function} benchmark function
3946
*/
4047
function createBenchmark( len ) {
41-
var x;
42-
var i;
43-
44-
x = [];
45-
for ( i = 0; i < len; i++ ) {
46-
x.push( ( randu()*20.0 ) - 10.0 );
47-
}
48+
var x = uniform( len, -100, 100, options );
4849
return benchmark;
4950

5051
function benchmark( b ) {

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,20 @@
2121
// MODULES //
2222

2323
var bench = require( '@stdlib/bench' );
24-
var randu = require( '@stdlib/random/base/randu' );
24+
var uniform = require( '@stdlib/random/array/uniform' );
2525
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2626
var pow = require( '@stdlib/math/base/special/pow' );
2727
var pkg = require( './../package.json' ).name;
2828
var gasumpw = require( './../lib/ndarray.js' );
2929

3030

31+
// VARIABLES //
32+
33+
var options = {
34+
'dtype': 'generic'
35+
};
36+
37+
3138
// FUNCTIONS //
3239

3340
/**
@@ -38,13 +45,7 @@ var gasumpw = require( './../lib/ndarray.js' );
3845
* @returns {Function} benchmark function
3946
*/
4047
function createBenchmark( len ) {
41-
var x;
42-
var i;
43-
44-
x = [];
45-
for ( i = 0; i < len; i++ ) {
46-
x.push( ( randu()*20.0 ) - 10.0 );
47-
}
48+
var x = uniform( len, -100, 100, options );
4849
return benchmark;
4950

5051
function benchmark( b ) {

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

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

2-
{{alias}}( N, x, stride )
2+
{{alias}}( N, x, strideX )
33
Computes the sum of absolute values (L1 norm) of strided array elements
44
using pairwise summation.
55

6-
The `N` and `stride` parameters determine which elements in `x` are accessed
7-
at runtime.
6+
The `N` and stride parameters determine which elements in the strided array
7+
are accessed at runtime.
88

99
Indexing is relative to the first index. To introduce an offset, use a typed
1010
array view.
@@ -19,8 +19,8 @@
1919
x: Array<number>|TypedArray
2020
Input array.
2121

22-
stride: integer
23-
Index increment.
22+
strideX: integer
23+
Stride length.
2424

2525
Returns
2626
-------
@@ -34,27 +34,24 @@
3434
> {{alias}}( x.length, x, 1 )
3535
5.0
3636

37-
// Using `N` and `stride` parameters:
37+
// Using `N` and stride parameters:
3838
> x = new {{alias:@stdlib/array/float64}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ] );
39-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
40-
> var stride = 2;
41-
> {{alias}}( N, x, stride )
39+
> {{alias}}( 3, x, 2 )
4240
5.0
4341

4442
// Using view offsets:
4543
> var x0 = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] );
4644
> var x1 = new {{alias:@stdlib/array/float64}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 );
47-
> N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 );
48-
> stride = 2;
49-
> {{alias}}( N, x1, stride )
45+
> {{alias}}( 3, x1, 2 )
5046
5.0
5147

52-
{{alias}}.ndarray( N, x, stride, offset )
48+
49+
{{alias}}.ndarray( N, x, strideX, offsetX )
5350
Computes the sum of absolute values (L1 norm) of strided array elements
5451
using pairwise summation and alternative indexing semantics.
5552

5653
While typed array views mandate a view offset based on the underlying
57-
buffer, the `offset` parameter supports indexing semantics based on a
54+
buffer, the offset parameter supports indexing semantics based on a
5855
starting index.
5956

6057
Parameters
@@ -65,10 +62,10 @@
6562
x: Array<number>|TypedArray
6663
Input array.
6764

68-
stride: integer
69-
Index increment.
65+
strideX: integer
66+
Stride length.
7067

71-
offset: integer
68+
offsetX: integer
7269
Starting index.
7370

7471
Returns
@@ -85,8 +82,7 @@
8582

8683
// Using offset parameter:
8784
> var x = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] );
88-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
89-
> {{alias}}.ndarray( N, x, 2, 1 )
85+
> {{alias}}.ndarray( 3, x, 2, 1 )
9086
5.0
9187

9288
See Also

lib/node_modules/@stdlib/blas/ext/base/gasumpw/docs/types/index.d.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ interface Routine {
3131
*
3232
* @param N - number of indexed elements
3333
* @param x - input array
34-
* @param stride - stride length
34+
* @param strideX - stride length
3535
* @returns sum
3636
*
3737
* @example
@@ -40,15 +40,15 @@ interface Routine {
4040
* var v = gasumpw( x.length, x, 1 );
4141
* // returns 5.0
4242
*/
43-
( N: number, x: NumericArray, stride: number ): number;
43+
( N: number, x: NumericArray, strideX: number ): number;
4444

4545
/**
4646
* Computes the sum of absolute values (L1 norm) of strided array elements using pairwise summation and alternative indexing semantics.
4747
*
4848
* @param N - number of indexed elements
4949
* @param x - input array
50-
* @param stride - stride length
51-
* @param offset - starting index
50+
* @param strideX - stride length
51+
* @param offsetX - starting index
5252
* @returns sum
5353
*
5454
* @example
@@ -57,15 +57,15 @@ interface Routine {
5757
* var v = gasumpw.ndarray( x.length, x, 1, 0 );
5858
* // returns 5.0
5959
*/
60-
ndarray( N: number, x: NumericArray, stride: number, offset: number ): number;
60+
ndarray( N: number, x: NumericArray, strideX: number, offsetX: number ): number;
6161
}
6262

6363
/**
6464
* Computes the sum of absolute values (L1 norm) of strided array elements using pairwise summation.
6565
*
6666
* @param N - number of indexed elements
6767
* @param x - input array
68-
* @param stride - stride length
68+
* @param strideX - stride length
6969
* @returns sum
7070
*
7171
* @example

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,12 @@
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/array/discrete-uniform' );
2422
var gasumpw = require( './../lib' );
2523

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-
}
24+
var x = discreteUniform( 10, -100, 100, {
25+
'dtype': 'float64'
26+
});
3327
console.log( x );
3428

3529
var v = gasumpw( x.length, x, 1 );

lib/node_modules/@stdlib/blas/ext/base/gasumpw/lib/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@
3232
* // returns 5.0
3333
*
3434
* @example
35-
* var floor = require( '@stdlib/math/base/special/floor' );
3635
* var gasumpw = require( '@stdlib/blas/ext/base/gasumpw' );
3736
*
3837
* var x = [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ];
39-
* var N = floor( x.length / 2 );
4038
*
41-
* var v = gasumpw.ndarray( N, x, 2, 1 );
39+
* var v = gasumpw.ndarray( 4, x, 2, 1 );
4240
* // returns 9.0
4341
*/
4442

lib/node_modules/@stdlib/blas/ext/base/gasumpw/lib/main.js

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
// MODULES //
2222

23-
var abs = require( '@stdlib/math/base/special/abs' );
24-
var sum = require( './ndarray.js' );
23+
var stride2offset = require( '@stdlib/strided/base/stride2offset' );
24+
var ndarray = require( './ndarray.js' );
2525

2626

2727
// MAIN //
@@ -39,7 +39,7 @@ var sum = require( './ndarray.js' );
3939
*
4040
* @param {PositiveInteger} N - number of indexed elements
4141
* @param {NumericArray} x - input array
42-
* @param {integer} stride - stride length
42+
* @param {integer} strideX - stride length
4343
* @returns {number} sum
4444
*
4545
* @example
@@ -48,32 +48,8 @@ var sum = require( './ndarray.js' );
4848
* var v = gasumpw( x.length, x, 1 );
4949
* // returns 5.0
5050
*/
51-
function gasumpw( N, x, stride ) {
52-
var ix;
53-
var s;
54-
var i;
55-
56-
if ( N <= 0 ) {
57-
return 0.0;
58-
}
59-
if ( N === 1 || stride === 0 ) {
60-
return abs( x[ 0 ] );
61-
}
62-
if ( stride < 0 ) {
63-
ix = (1-N) * stride;
64-
} else {
65-
ix = 0;
66-
}
67-
if ( N < 8 ) {
68-
// Use simple summation...
69-
s = 0.0;
70-
for ( i = 0; i < N; i++ ) {
71-
s += abs( x[ ix ] );
72-
ix += stride;
73-
}
74-
return s;
75-
}
76-
return sum( N, x, stride, ix );
51+
function gasumpw( N, x, strideX ) {
52+
return ndarray( N, x, strideX, stride2offset( N, strideX ) );
7753
}
7854

7955

0 commit comments

Comments
 (0)