Skip to content

Commit 8e4ef81

Browse files
authored
refactor: update blas/ext/base/gapx to follow current project conventions
PR-URL: #4347 Reviewed-by: Athan Reines <kgryte@gmail.com>
1 parent 4cc5a5b commit 8e4ef81

File tree

10 files changed

+96
-177
lines changed

10 files changed

+96
-177
lines changed

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

+15-35
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020

2121
# gapx
2222

23-
> Add a constant to each element in a strided array.
23+
> Add a scalar constant to each element in a strided array.
2424
2525
<section class="usage">
2626

@@ -30,9 +30,9 @@ limitations under the License.
3030
var gapx = require( '@stdlib/blas/ext/base/gapx' );
3131
```
3232

33-
#### gapx( N, alpha, x, stride )
33+
#### gapx( N, alpha, x, strideX )
3434

35-
Adds a constant `alpha` to each element in a strided array `x`.
35+
Adds a scalar constant to each element in a strided array.
3636

3737
```javascript
3838
var x = [ -2.0, 1.0, 3.0, -5.0, 4.0, 0.0, -1.0, -3.0 ];
@@ -46,41 +46,36 @@ The function has the following parameters:
4646
- **N**: number of indexed elements.
4747
- **alpha**: scalar constant.
4848
- **x**: input [`Array`][mdn-array] or [`typed array`][mdn-typed-array].
49-
- **stride**: index increment.
49+
- **strideX**: stride length.
5050

51-
The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to add a constant to every other element
51+
The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to add a constant to every other element:
5252

5353
```javascript
54-
var floor = require( '@stdlib/math/base/special/floor' );
55-
5654
var x = [ -2.0, 1.0, 3.0, -5.0, 4.0, 0.0, -1.0, -3.0 ];
57-
var N = floor( x.length / 2 );
5855

59-
gapx( N, 5.0, x, 2 );
56+
gapx( 4, 5.0, x, 2 );
6057
// x => [ 3.0, 1.0, 8.0, -5.0, 9.0, 0.0, 4.0, -3.0 ]
6158
```
6259

6360
Note that indexing is relative to the first index. To introduce an offset, use [`typed array`][mdn-typed-array] views.
6461

6562
```javascript
6663
var Float64Array = require( '@stdlib/array/float64' );
67-
var floor = require( '@stdlib/math/base/special/floor' );
6864

6965
// Initial array...
7066
var x0 = new Float64Array( [ 1.0, -2.0, 3.0, -4.0, 5.0, -6.0 ] );
7167

7268
// Create an offset view...
7369
var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element
74-
var N = floor( x0.length/2 );
7570

7671
// Add a constant to every other element...
77-
gapx( N, 5.0, x1, 2 );
72+
gapx( 3, 5.0, x1, 2 );
7873
// x0 => <Float64Array>[ 1.0, 3.0, 3.0, 1.0, 5.0, -1.0 ]
7974
```
8075

81-
#### gapx.ndarray( N, alpha, x, stride, offset )
76+
#### gapx.ndarray( N, alpha, x, strideX, offsetX )
8277

83-
Adds a constant `alpha` to each element in a strided array `x` using alternative indexing semantics.
78+
Adds a scalar constant to each element in a strided array using alternative indexing semantics.
8479

8580
```javascript
8681
var x = [ -2.0, 1.0, 3.0, -5.0, 4.0, 0.0, -1.0, -3.0 ];
@@ -91,9 +86,9 @@ gapx.ndarray( x.length, 5.0, x, 1, 0 );
9186

9287
The function has the following additional parameters:
9388

94-
- **offset**: starting index.
89+
- **offsetX**: starting index.
9590

96-
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 access only the last three elements of `x`
91+
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 access only the last three elements:
9792

9893
```javascript
9994
var x = [ 1.0, -2.0, 3.0, -4.0, 5.0, -6.0 ];
@@ -124,27 +119,12 @@ gapx.ndarray( 3, 5.0, x, 1, x.length-3 );
124119
<!-- eslint no-undef: "error" -->
125120

126121
```javascript
127-
var round = require( '@stdlib/math/base/special/round' );
128-
var randu = require( '@stdlib/random/base/randu' );
129-
var Float64Array = require( '@stdlib/array/float64' );
122+
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
130123
var gapx = require( '@stdlib/blas/ext/base/gapx' );
131124

132-
var rand;
133-
var sign;
134-
var x;
135-
var i;
136-
137-
x = new Float64Array( 10 );
138-
for ( i = 0; i < x.length; i++ ) {
139-
rand = round( randu()*100.0 );
140-
sign = randu();
141-
if ( sign < 0.5 ) {
142-
sign = -1.0;
143-
} else {
144-
sign = 1.0;
145-
}
146-
x[ i ] = sign * rand;
147-
}
125+
var x = discreteUniform( 10, -100, 100, {
126+
'dtype': 'float64'
127+
});
148128
console.log( x );
149129

150130
gapx( x.length, 5.0, x, 1 );

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

+9-8
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 gapx = 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 gapx = 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/gapx/benchmark/benchmark.ndarray.js

+9-8
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 gapx = 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 gapx = 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/gapx/docs/repl.txt

+28-38
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

2-
{{alias}}( N, alpha, x, stride )
3-
Adds a constant to each element in a strided array.
2+
{{alias}}( N, alpha, x, strideX )
3+
Adds a scalar constant to each element in a strided array.
44

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

88
Indexing is relative to the first index. To introduce an offset, use typed
99
array views.
@@ -16,52 +16,46 @@
1616
Number of indexed elements.
1717

1818
alpha: number
19-
Constant.
19+
Scalar constant.
2020

2121
x: Array<number>|TypedArray
2222
Input array.
2323

24-
stride: integer
25-
Index increment for `x`.
24+
strideX: integer
25+
Stride length.
2626

2727
Returns
2828
-------
2929
x: Array<number>|TypedArray
30-
Input array `x`.
30+
Input array.
3131

3232
Examples
3333
--------
3434
// Standard Usage:
35-
> var x = [ -2.0, 1.0, 3.0, -5.0, 4.0, -1.0, -3.0 ];
36-
> var alpha = 5.0;
37-
> {{alias}}( x.length, alpha, x, 1 )
38-
[ 3.0, 6.0, 8.0, 0.0, 9.0, 4.0, 2.0 ]
35+
> var x = [ -2.0, 1.0, 3.0, -5.0, 4.0, 0.0, -1.0, -3.0 ];
36+
> {{alias}}( x.length, 5.0, x, 1 )
37+
[ 3.0, 6.0, 8.0, 0.0, 9.0, 5.0, 4.0, 2.0 ]
3938

40-
// Using `N` and `stride` parameters:
41-
> x = [ -2.0, 1.0, 3.0, -5.0, 4.0, -1.0, -3.0 ];
42-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
43-
> alpha = 5.0;
44-
> var stride = 2;
45-
> {{alias}}( N, alpha, x, stride )
46-
[ 3.0, 1.0, 8.0, -5.0, 9.0, -1.0, -3.0 ]
39+
// Using `N` and stride parameters:
40+
> x = [ -2.0, 1.0, 3.0, -5.0, 4.0, 0.0, -1.0, -3.0 ];
41+
> {{alias}}( 4, 5.0, x, 2 )
42+
[ 3.0, 1.0, 8.0, -5.0, 9.0, 0.0, 4.0, -3.0 ]
4743

4844
// Using view offsets:
4945
> var x0 = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, -4.0, 5.0, -6.0 ] );
5046
> var x1 = new {{alias:@stdlib/array/float64}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 );
51-
> N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 );
52-
> alpha = 5.0;
53-
> stride = 2;
54-
> {{alias}}( N, alpha, x1, stride )
47+
> {{alias}}( 3, 5.0, x1, 2 )
5548
<Float64Array>[ 3.0, 3.0, 1.0, 5.0, -1.0 ]
5649
> x0
5750
<Float64Array>[ 1.0, 3.0, 3.0, 1.0, 5.0, -1.0 ]
5851

59-
{{alias}}.ndarray( N, alpha, x, stride, offset )
60-
Adds a constant to each element in a strided array using alternative
52+
53+
{{alias}}.ndarray( N, alpha, x, strideX, offsetX )
54+
Adds a scalar constant to each element in a strided array using alternative
6155
indexing semantics.
6256

6357
While typed array views mandate a view offset based on the underlying
64-
buffer, the `offset` parameter supports indexing semantics based on a
58+
buffer, the offset parameter supports indexing semantics based on a
6559
starting index.
6660

6761
Parameters
@@ -70,36 +64,32 @@
7064
Number of indexed elements.
7165

7266
alpha: number
73-
Constant.
67+
Scalar constant.
7468

7569
x: Array<number>|TypedArray
7670
Input array.
7771

78-
stride: integer
79-
Index increment for `x`.
72+
strideX: integer
73+
Stride length.
8074

81-
offset: integer
82-
Starting index of `x`.
75+
offsetX: integer
76+
Starting index.
8377

8478
Returns
8579
-------
8680
x: Array<number>|TypedArray
87-
Input array `x`.
81+
Input array.
8882

8983
Examples
9084
--------
9185
// Standard Usage:
9286
> var x = [ -2.0, 1.0, 3.0, -5.0, 4.0, -1.0, -3.0 ];
93-
> var alpha = 5.0;
94-
> {{alias}}.ndarray( x.length, alpha, x, 1, 0 )
87+
> {{alias}}.ndarray( x.length, 5.0, x, 1, 0 )
9588
[ 3.0, 6.0, 8.0, 0.0, 9.0, 4.0, 2.0 ]
9689

9790
// Using an index offset:
9891
> x = [ 1.0, -2.0, 3.0, -4.0, 5.0, -6.0 ];
99-
> var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
100-
> alpha = 5.0;
101-
> var stride = 2;
102-
> {{alias}}.ndarray( N, alpha, x, stride, 1 )
92+
> {{alias}}.ndarray( 3, 5.0, x, 2, 1 )
10393
[ 1.0, 3.0, 3.0, 1.0, 5.0, -1.0 ]
10494

10595
See Also

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import { NumericArray } from '@stdlib/types/array';
2727
*/
2828
interface Routine {
2929
/**
30-
* Adds a constant to each element in a strided array.
30+
* Adds a scalar constant to each element in a strided array.
3131
*
3232
* @param N - number of indexed elements
33-
* @param alpha - constant
33+
* @param alpha - scalar constant
3434
* @param x - input array
35-
* @param stride - stride length
35+
* @param strideX - stride length
3636
* @returns `x`
3737
*
3838
* @example
@@ -41,16 +41,16 @@ interface Routine {
4141
* gapx( x.length, 5.0, x, 1 );
4242
* // x => [ 3.0, 6.0, 8.0, 0.0, 9.0, 5.0, 4.0, 2.0 ]
4343
*/
44-
( N: number, alpha: number, x: NumericArray, stride: number ): NumericArray;
44+
( N: number, alpha: number, x: NumericArray, strideX: number ): NumericArray;
4545

4646
/**
47-
* Adds a constant to each element in a strided array using alternative indexing semantics.
47+
* Adds a scalar constant to each element in a strided array using alternative indexing semantics.
4848
*
4949
* @param N - number of indexed elements
50-
* @param alpha - constant
50+
* @param alpha - scalar constant
5151
* @param x - input array
52-
* @param stride - stride length
53-
* @param offset - starting index
52+
* @param strideX - stride length
53+
* @param offsetX - starting index
5454
* @returns `x`
5555
*
5656
* @example
@@ -59,16 +59,16 @@ interface Routine {
5959
* gapx.ndarray( x.length, 5.0, x, 1, 0 );
6060
* // x => [ 3.0, 6.0, 8.0, 0.0, 9.0, 5.0, 4.0, 2.0 ]
6161
*/
62-
ndarray( N: number, alpha: number, x: NumericArray, stride: number, offset: number ): NumericArray;
62+
ndarray( N: number, alpha: number, x: NumericArray, strideX: number, offsetX: number ): NumericArray;
6363
}
6464

6565
/**
66-
* Adds a constant to each element in a strided array.
66+
* Adds a scalar constant to each element in a strided array.
6767
*
6868
* @param N - number of indexed elements
69-
* @param alpha - constant
69+
* @param alpha - scalar constant
7070
* @param x - input array
71-
* @param stride - stride length
71+
* @param strideX - stride length
7272
* @returns `x`
7373
*
7474
* @example

0 commit comments

Comments
 (0)