Skip to content

Commit 9e91f81

Browse files
Neerajpathak07kgryteAayush Khanna
authored
feat: add C ndarray interface and refactor implementation for stats/base/dsnanmean
PR-URL: #4395 Co-authored-by: Athan Reines <[email protected]> Co-authored-by: Aayush Khanna <[email protected]> Reviewed-by: Athan Reines <[email protected]> Reviewed-by: Aayush Khanna <[email protected]> Signed-off-by: Neeraj Pathak <[email protected]> Signed-off-by: Athan Reines <[email protected]>
1 parent e0e2ab2 commit 9e91f81

23 files changed

+437
-241
lines changed

lib/node_modules/@stdlib/stats/base/dsnanmean/README.md

Lines changed: 136 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,84 +51,80 @@ The [arithmetic mean][arithmetic-mean] is defined as
5151
var dsnanmean = require( '@stdlib/stats/base/dsnanmean' );
5252
```
5353

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

5656
Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array `x`, ignoring `NaN` values, using extended accumulation, and returning an extended precision result.
5757

5858
```javascript
5959
var Float32Array = require( '@stdlib/array/float32' );
6060

6161
var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] );
62-
var N = x.length;
6362

64-
var v = dsnanmean( N, x, 1 );
63+
var v = dsnanmean( x.length, x, 1 );
6564
// returns ~0.3333
6665
```
6766

6867
The function has the following parameters:
6968

7069
- **N**: number of indexed elements.
7170
- **x**: input [`Float32Array`][@stdlib/array/float32].
72-
- **stride**: index increment for `x`.
71+
- **strideX**: stride length for `x`.
72+
73+
The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to compute the [arithmetic mean][arithmetic-mean] of every other element in `x`,
7374

74-
The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the [arithmetic mean][arithmetic-mean] of every other element in `x`,
75+
<!-- eslint-disable max-len -->
7576

7677
```javascript
7778
var Float32Array = require( '@stdlib/array/float32' );
78-
var floor = require( '@stdlib/math/base/special/floor' );
7979

80-
var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0, NaN ] );
81-
var N = floor( x.length / 2 );
80+
var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0, NaN, NaN ] );
8281

83-
var v = dsnanmean( N, x, 2 );
82+
var v = dsnanmean( 5, x, 2 );
8483
// returns 1.25
8584
```
8685

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

89-
<!-- eslint-disable stdlib/capitalized-comments -->
88+
<!-- eslint-disable stdlib/capitalized-comments, max-len -->
9089

9190
```javascript
9291
var Float32Array = require( '@stdlib/array/float32' );
9392
var floor = require( '@stdlib/math/base/special/floor' );
9493

95-
var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
94+
var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
9695
var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element
9796

98-
var N = floor( x0.length / 2 );
99-
100-
var v = dsnanmean( N, x1, 2 );
97+
var v = dsnanmean( 5, x1, 2 );
10198
// returns 1.25
10299
```
103100

104-
#### dsnanmean.ndarray( N, x, stride, offset )
101+
#### dsnanmean.ndarray( N, x, strideX, offsetX )
105102

106103
Computes the [arithmetic mean][arithmetic-mean] of a single-precision floating-point strided array, ignoring `NaN` values and using extended accumulation and alternative indexing semantics.
107104

108105
```javascript
109106
var Float32Array = require( '@stdlib/array/float32' );
110107

111108
var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] );
112-
var N = x.length;
113109

114-
var v = dsnanmean.ndarray( N, x, 1, 0 );
110+
var v = dsnanmean.ndarray( x.length, x, 1, 0 );
115111
// returns ~0.33333
116112
```
117113

118114
The function has the following additional parameters:
119115

120-
- **offset**: starting index for `x`.
116+
- **offsetX**: starting index for `x`.
117+
118+
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 [arithmetic mean][arithmetic-mean] for every other element in `x` starting from the second element
121119

122-
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 [arithmetic mean][arithmetic-mean] for every other value in `x` starting from the second value
120+
<!-- eslint-disable max-len -->
123121

124122
```javascript
125123
var Float32Array = require( '@stdlib/array/float32' );
126-
var floor = require( '@stdlib/math/base/special/floor' );
127124

128-
var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
129-
var N = floor( x.length / 2 );
125+
var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
130126

131-
var v = dsnanmean.ndarray( N, x, 2, 1 );
127+
var v = dsnanmean.ndarray( 5, x, 2, 1 );
132128
// returns 1.25
133129
```
134130

@@ -181,6 +177,123 @@ console.log( v );
181177

182178
<!-- /.examples -->
183179

180+
<!-- C interface documentation. -->
181+
182+
* * *
183+
184+
<section class="c">
185+
186+
## C APIs
187+
188+
<!-- Section to include introductory text. Make sure to keep an empty line after the intro `section` element and another before the `/section` close. -->
189+
190+
<section class="intro">
191+
192+
</section>
193+
194+
<!-- /.intro -->
195+
196+
<!-- C usage documentation. -->
197+
198+
<section class="usage">
199+
200+
### Usage
201+
202+
```c
203+
#include "stdlib/stats/base/dsnanmean.h"
204+
```
205+
206+
#### stdlib_strided_dsnanmean( N, \*X, strideX )
207+
208+
Computes the arithmetic mean of a single-precision floating-point strided array, ignoring `NaN` values, using extended accumulation, and returning an extended precision result.
209+
210+
```c
211+
const float x[] = { 1.0f, 2.0f, 0.0f/0.0f, 3.0f, 0.0f/0.0f, 4.0f, 5.0f, 6.0f, 0.0f/0.0f, 7.0f, 8.0f, 0.0f/0.0f };
212+
213+
double v = stdlib_strided_dsnanmean( 6, x, 2 );
214+
// returns ~4.6667
215+
```
216+
217+
The function accepts the following arguments:
218+
219+
- **N**: `[in] CBLAS_INT` number of indexed elements.
220+
- **X**: `[in] float*` input array.
221+
- **strideX**: `[in] CBLAS_INT` stride length for `X`.
222+
223+
```c
224+
double stdlib_strided_dsnanmean( const CBLAS_INT N, const float *X, const CBLAS_INT strideX );
225+
```
226+
227+
#### stdlib_strided_dsnanmean_ndarray( N, \*X, strideX, offsetX )
228+
229+
Computes the arithmetic mean of a single-precision floating-point strided array, ignoring `NaN` values and using extended accumulation and alternative indexing semantics.
230+
231+
```c
232+
const float x[] = { 1.0f, 2.0f, 0.0f/0.0f, 3.0f, 0.0f/0.0f, 4.0f, 5.0f, 6.0f, 0.0f/0.0f, 7.0f, 8.0f, 0.0f/0.0f };
233+
234+
double v = stdlib_strided_dsnanmean_ndarray( 6, x, 2, 0 );
235+
// returns ~4.6667
236+
```
237+
238+
The function accepts the following arguments:
239+
240+
- **N**: `[in] CBLAS_INT` number of indexed elements.
241+
- **X**: `[in] float*` input array.
242+
- **strideX**: `[in] CBLAS_INT` stride length for `X`.
243+
- **offsetX**: `[in] CBLAS_INT` starting index for `X`.
244+
245+
```c
246+
double stdlib_strided_dsnanmean_ndarray( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX );
247+
```
248+
249+
</section>
250+
251+
<!-- /.usage -->
252+
253+
<!-- C API usage notes. Make sure to keep an empty line after the `section` element and another before the `/section` close. -->
254+
255+
<section class="notes">
256+
257+
</section>
258+
259+
<!-- /.notes -->
260+
261+
<!-- C API usage examples. -->
262+
263+
<section class="examples">
264+
265+
### Examples
266+
267+
```c
268+
#include "stdlib/stats/base/dsnanmean.h"
269+
#include <stdio.h>
270+
271+
int main( void ) {
272+
// Create a strided array:
273+
const float x[] = { 1.0f, 2.0f, 0.0f/0.0f, 3.0f, 0.0f/0.0f, 4.0f, 5.0f, 6.0f, 0.0f/0.0f, 7.0f, 8.0f, 0.0f/0.0f };
274+
275+
// Specify the number of elements:
276+
const int N = 6;
277+
278+
// Specify the stride length:
279+
const int strideX = 2;
280+
281+
// Compute the arithmetic mean:
282+
double v = stdlib_strided_dsnanmean( N, x, strideX );
283+
284+
// Print the result:
285+
printf( "mean: %lf\n", v );
286+
}
287+
```
288+
289+
</section>
290+
291+
<!-- /.examples -->
292+
293+
</section>
294+
295+
<!-- /.c -->
296+
184297
<!-- Section for related `stdlib` packages. Do not manually edit this section, as it is automatically populated. -->
185298
186299
<section class="related">

lib/node_modules/@stdlib/stats/base/dsnanmean/benchmark/benchmark.js

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,30 @@
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' );
25+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
26+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2527
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2628
var pow = require( '@stdlib/math/base/special/pow' );
27-
var Float32Array = require( '@stdlib/array/float32' );
2829
var pkg = require( './../package.json' ).name;
2930
var dsnanmean = require( './../lib/dsnanmean.js' );
3031

3132

3233
// FUNCTIONS //
3334

35+
/**
36+
* Returns a random number.
37+
*
38+
* @private
39+
* @returns {number} random number
40+
*/
41+
function rand() {
42+
if ( bernoulli( 0.8 ) < 1 ) {
43+
return NaN;
44+
}
45+
return uniform( -10.0, 10.0 );
46+
}
47+
3448
/**
3549
* Creates a benchmark function.
3650
*
@@ -39,17 +53,7 @@ var dsnanmean = require( './../lib/dsnanmean.js' );
3953
* @returns {Function} benchmark function
4054
*/
4155
function createBenchmark( len ) {
42-
var x;
43-
var i;
44-
45-
x = new Float32Array( len );
46-
for ( i = 0; i < x.length; i++ ) {
47-
if ( randu() < 0.2 ) {
48-
x[ i ] = NaN;
49-
} else {
50-
x[ i ] = ( randu()*20.0 ) - 10.0;
51-
}
52-
}
56+
var x = filledarrayBy( len, 'float32', rand );
5357
return benchmark;
5458

5559
function benchmark( b ) {

lib/node_modules/@stdlib/stats/base/dsnanmean/benchmark/benchmark.native.js

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
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' );
26+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
27+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2628
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2729
var pow = require( '@stdlib/math/base/special/pow' );
28-
var Float32Array = require( '@stdlib/array/float32' );
2930
var tryRequire = require( '@stdlib/utils/try-require' );
3031
var pkg = require( './../package.json' ).name;
3132

@@ -40,6 +41,19 @@ var opts = {
4041

4142
// FUNCTIONS //
4243

44+
/**
45+
* Returns a random number.
46+
*
47+
* @private
48+
* @returns {number} random number
49+
*/
50+
function rand() {
51+
if ( bernoulli( 0.8 ) < 1 ) {
52+
return NaN;
53+
}
54+
return uniform( -10.0, 10.0 );
55+
}
56+
4357
/**
4458
* Creates a benchmark function.
4559
*
@@ -48,17 +62,7 @@ var opts = {
4862
* @returns {Function} benchmark function
4963
*/
5064
function createBenchmark( len ) {
51-
var x;
52-
var i;
53-
54-
x = new Float32Array( len );
55-
for ( i = 0; i < x.length; i++ ) {
56-
if ( randu() < 0.2 ) {
57-
x[ i ] = NaN;
58-
} else {
59-
x[ i ] = ( randu()*20.0 ) - 10.0;
60-
}
61-
}
65+
var x = filledarrayBy( len, 'float32', rand );
6266
return benchmark;
6367

6468
function benchmark( b ) {

lib/node_modules/@stdlib/stats/base/dsnanmean/benchmark/benchmark.ndarray.js

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,30 @@
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' );
25+
var bernoulli = require( '@stdlib/random/base/bernoulli' );
26+
var filledarrayBy = require( '@stdlib/array/filled-by' );
2527
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2628
var pow = require( '@stdlib/math/base/special/pow' );
27-
var Float32Array = require( '@stdlib/array/float32' );
2829
var pkg = require( './../package.json' ).name;
2930
var dsnanmean = require( './../lib/ndarray.js' );
3031

3132

3233
// FUNCTIONS //
3334

35+
/**
36+
* Returns a random number.
37+
*
38+
* @private
39+
* @returns {number} random number
40+
*/
41+
function rand() {
42+
if ( bernoulli( 0.8 ) < 1 ) {
43+
return NaN;
44+
}
45+
return uniform( -10.0, 10.0 );
46+
}
47+
3448
/**
3549
* Creates a benchmark function.
3650
*
@@ -39,17 +53,7 @@ var dsnanmean = require( './../lib/ndarray.js' );
3953
* @returns {Function} benchmark function
4054
*/
4155
function createBenchmark( len ) {
42-
var x;
43-
var i;
44-
45-
x = new Float32Array( len );
46-
for ( i = 0; i < x.length; i++ ) {
47-
if ( randu() < 0.2 ) {
48-
x[ i ] = NaN;
49-
} else {
50-
x[ i ] = ( randu()*20.0 ) - 10.0;
51-
}
52-
}
56+
var x = filledarrayBy( len, 'float32', rand );
5357
return benchmark;
5458

5559
function benchmark( b ) {

0 commit comments

Comments
 (0)