Skip to content

Commit 2327600

Browse files
ndarray-dnanmean
1 parent 8785e54 commit 2327600

File tree

15 files changed

+187
-243
lines changed

15 files changed

+187
-243
lines changed

lib/node_modules/@stdlib/stats/base/dnanmean/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/stats/base/dnanmean/include/stdlib/stats/base/dnanmean.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef STDLIB_STATS_BASE_DNANMEAN_H
2020
#define STDLIB_STATS_BASE_DNANMEAN_H
2121

22-
#include <stdint.h>
22+
#include "stdlib/blas/base/shared.h"
2323

2424
/*
2525
* If C++, prevent name mangling so that the compiler emits a binary file having undecorated names, thus mirroring the behavior of a C compiler.
@@ -31,7 +31,12 @@ extern "C" {
3131
/**
3232
* Computes the arithmetic mean of a double-precision floating-point strided array, ignoring `NaN` values.
3333
*/
34-
double stdlib_strided_dnanmean( const int64_t N, const double *X, const int64_t stride );
34+
double API_SUFFIX(stdlib_strided_dnanmean)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX );
35+
36+
/**
37+
* Computes the maximum absolute value of a double-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics .
38+
*/
39+
double API_SUFFIX(stdlib_strided_dnanmean_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX );
3540

3641
#ifdef __cplusplus
3742
}

lib/node_modules/@stdlib/stats/base/dnanmean/lib/dnanmean.js

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

2121
// MODULES //
2222

23-
var dnanmeanpn = require( '@stdlib/stats/base/dnanmeanpn' );
23+
var stride2offset = require( '@stdlib/strided/base/stride2offset' );
24+
var ndarray = require( './ndarray.js' );
2425

2526

2627
// MAIN //
@@ -30,7 +31,7 @@ var dnanmeanpn = require( '@stdlib/stats/base/dnanmeanpn' );
3031
*
3132
* @param {PositiveInteger} N - number of indexed elements
3233
* @param {Float64Array} x - input array
33-
* @param {integer} stride - stride length
34+
* @param {integer} strideX - stride length
3435
* @returns {number} arithmetic mean
3536
*
3637
* @example
@@ -39,11 +40,11 @@ var dnanmeanpn = require( '@stdlib/stats/base/dnanmeanpn' );
3940
* var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] );
4041
* var N = x.length;
4142
*
42-
* var v = dnanmean( N, x, 1 );
43+
* var v = dnanmean( x.length, x, 1 );
4344
* // returns ~0.3333
4445
*/
45-
function dnanmean( N, x, stride ) {
46-
return dnanmeanpn( N, x, stride );
46+
function dnanmean( N, x, strideX ) {
47+
return ndarray( N, x, strideX, stride2offset( N, strideX ) );
4748
}
4849

4950

lib/node_modules/@stdlib/stats/base/dnanmean/lib/dnanmean.native.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var addon = require( './../src/addon.node' );
3030
*
3131
* @param {PositiveInteger} N - number of indexed elements
3232
* @param {Float64Array} x - input array
33-
* @param {integer} stride - stride length
33+
* @param {integer} strideX - stride length
3434
* @returns {number} arithmetic mean
3535
*
3636
* @example
@@ -39,11 +39,11 @@ var addon = require( './../src/addon.node' );
3939
* var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] );
4040
* var N = x.length;
4141
*
42-
* var v = dnanmean( N, x, 1 );
42+
* var v = dnanmean( x.length, x, 1 );
4343
* // returns ~0.3333
4444
*/
45-
function dnanmean( N, x, stride ) {
46-
return addon( N, x, stride );
45+
function dnanmean( N, x, strideX ) {
46+
return addon( N, x, strideX );
4747
}
4848

4949

lib/node_modules/@stdlib/stats/base/dnanmean/lib/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,16 @@
3030
* var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] );
3131
* var N = 3;
3232
*
33-
* var v = dnanmean( N, x, 1 );
33+
* var v = dnanmean( x.length, x, 1 );
3434
* // returns ~0.3333
3535
*
3636
* @example
3737
* var Float64Array = require( '@stdlib/array/float64' );
38-
* var floor = require( '@stdlib/math/base/special/floor' );
3938
* var dnanmean = require( '@stdlib/stats/base/dnanmean' );
4039
*
4140
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
42-
* var N = floor( x.length / 2 );
4341
*
44-
* var v = dnanmean.ndarray( N, x, 2, 1 );
42+
* var v = dnanmean.ndarray( 5, x, 2, 1 );
4543
* // returns 1.25
4644
*/
4745

lib/node_modules/@stdlib/stats/base/dnanmean/lib/ndarray.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,20 @@ var dnanmeanpn = require( '@stdlib/stats/base/dnanmeanpn' ).ndarray;
3030
*
3131
* @param {PositiveInteger} N - number of indexed elements
3232
* @param {Float64Array} x - input array
33-
* @param {integer} stride - stride length
34-
* @param {NonNegativeInteger} offset - starting index
33+
* @param {integer} strideX - stride length
34+
* @param {NonNegativeInteger} offsetX - starting index
3535
* @returns {number} arithmetic mean
3636
*
3737
* @example
3838
* var Float64Array = require( '@stdlib/array/float64' );
39-
* var floor = require( '@stdlib/math/base/special/floor' );
4039
*
4140
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
42-
* var N = floor( x.length / 2 );
4341
*
44-
* var v = dnanmean( N, x, 2, 1 );
42+
* var v = dnanmean( 5, x, 2, 1 );
4543
* // returns 1.25
4644
*/
47-
function dnanmean( N, x, stride, offset ) {
48-
return dnanmeanpn( N, x, stride, offset );
45+
function dnanmean( N, x, strideX, offsetX ) {
46+
return dnanmeanpn( N, x, strideX, offsetX );
4947
}
5048

5149

lib/node_modules/@stdlib/stats/base/dnanmean/lib/ndarray.native.js

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020

2121
// MODULES //
2222

23-
var Float64Array = require( '@stdlib/array/float64' );
24-
var addon = require( './dnanmean.native.js' );
23+
var addon = require( './../src/addon.node' );
2524

2625

2726
// MAIN //
@@ -31,27 +30,20 @@ var addon = require( './dnanmean.native.js' );
3130
*
3231
* @param {PositiveInteger} N - number of indexed elements
3332
* @param {Float64Array} x - input array
34-
* @param {integer} stride - stride length
35-
* @param {NonNegativeInteger} offset - starting index
33+
* @param {integer} strideX - stride length
34+
* @param {NonNegativeInteger} offsetX - starting index
3635
* @returns {number} arithmetic mean
3736
*
3837
* @example
3938
* var Float64Array = require( '@stdlib/array/float64' );
40-
* var floor = require( '@stdlib/math/base/special/floor' );
4139
*
4240
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN ] );
43-
* var N = floor( x.length / 2 );
4441
*
45-
* var v = dnanmean( N, x, 2, 1 );
42+
* var v = dnanmean( 5, x, 2, 1 );
4643
* // returns 1.25
4744
*/
48-
function dnanmean( N, x, stride, offset ) {
49-
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
54-
return addon( N, view, stride );
45+
function dnanmean( N, x, strideX, offsetX ) {
46+
return addon.ndarray( N, x, strideX, offsetX );
5547
}
5648

5749

lib/node_modules/@stdlib/stats/base/dnanmean/manifest.json

Lines changed: 65 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
2-
"options": {},
2+
"options": {
3+
"task": "build",
4+
"wasm": false
5+
},
36
"fields": [
47
{
58
"field": "src",
@@ -24,17 +27,75 @@
2427
],
2528
"confs": [
2629
{
30+
"task": "build",
31+
"wasm": false,
2732
"src": [
28-
"./src/dnanmean.c"
33+
"./src/main.c"
2934
],
3035
"include": [
3136
"./include"
3237
],
33-
"libraries": [
34-
"-lm"
38+
"libraries": [],
39+
"libpath": [],
40+
"dependencies": [
41+
"@stdlib/blas/base/shared",
42+
"@stdlib/strided/base/stride2offset",
43+
"@stdlib/stats/base/dnanmeanpn",
44+
"@stdlib/napi/export",
45+
"@stdlib/napi/argv",
46+
"@stdlib/napi/argv-int64",
47+
"@stdlib/napi/argv-strided-float64array",
48+
"@stdlib/napi/create-double"
49+
]
50+
},
51+
{
52+
"task": "benchmark",
53+
"wasm": false,
54+
"src": [
55+
"./src/main.c"
56+
],
57+
"include": [
58+
"./include"
59+
],
60+
"libraries": [],
61+
"libpath": [],
62+
"dependencies": [
63+
"@stdlib/blas/base/shared",
64+
"@stdlib/strided/base/stride2offset",
65+
"@stdlib/stats/base/dnanmeanpn"
66+
]
67+
},
68+
{
69+
"task": "examples",
70+
"wasm": false,
71+
"src": [
72+
"./src/main.c"
73+
],
74+
"include": [
75+
"./include"
76+
],
77+
"libraries": [],
78+
"libpath": [],
79+
"dependencies": [
80+
"@stdlib/blas/base/shared",
81+
"@stdlib/strided/base/stride2offset",
82+
"@stdlib/stats/base/dnanmeanpn"
83+
]
84+
},
85+
{
86+
"task": "",
87+
"wasm": true,
88+
"src": [
89+
"./src/main.c"
90+
],
91+
"include": [
92+
"./include"
3593
],
94+
"libraries": [],
3695
"libpath": [],
3796
"dependencies": [
97+
"@stdlib/blas/base/shared",
98+
"@stdlib/strided/base/stride2offset",
3899
"@stdlib/stats/base/dnanmeanpn"
39100
]
40101
}
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/**
2+
* @license Apache-2.0
3+
*
4+
* Copyright (c) 2020 The Stdlib Authors.
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
19+
#include "stdlib/stats/base/dnanmean.h"
20+
#include "stdlib/napi/export.h"
21+
#include "stdlib/napi/argv.h"
22+
#include "stdlib/napi/argv_int64.h"
23+
#include "stdlib/napi/argv_strided_float64array.h"
24+
#include "stdlib/napi/create_double.h"
25+
#include <node_api.h>
26+
27+
28+
29+
/**
30+
* Receives JavaScript callback invocation data.
31+
*
32+
* @param env environment under which the function is invoked
33+
* @param info callback data
34+
* @return Node-API value
35+
*/
36+
static napi_value addon( napi_env env, napi_callback_info info ) {
37+
STDLIB_NAPI_ARGV( env, info, argv, argc, 3 );
38+
STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 );
39+
STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 );
40+
STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 );
41+
STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dnanmean( N, X, strideX ), v );
42+
return v;
43+
}
44+
45+
/**
46+
* Receives JavaScript callback invocation data.
47+
*
48+
* @param env environment under which the function is invoked
49+
* @param info callback data
50+
* @return Node-API value
51+
*/
52+
static napi_value addon_method( napi_env env, napi_callback_info info ) {
53+
STDLIB_NAPI_ARGV( env, info, argv, argc, 4 );
54+
STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 );
55+
STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 );
56+
STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 3 );
57+
STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 );
58+
STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dnanmean_ndarray( N, X, strideX, offsetX ), v );
59+
return v;
60+
}
61+
62+
STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method )

0 commit comments

Comments
 (0)