Skip to content

Commit d5eae50

Browse files
aayush0325aayush0325
committed
feat: add C ndarray interface and refactor implementation
--- type: pre_commit_static_analysis_report description: Results of running static analysis checks when committing changes. report: - task: lint_filenames status: passed - task: lint_editorconfig status: passed - task: lint_markdown status: na - task: lint_package_json status: na - task: lint_repl_help status: na - task: lint_javascript_src status: passed - task: lint_javascript_cli status: na - task: lint_javascript_examples status: na - task: lint_javascript_tests status: na - task: lint_javascript_benchmarks status: na - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: passed - task: lint_c_examples status: na - task: lint_c_benchmarks status: na - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: na - task: lint_typescript_tests status: na - task: lint_license_headers status: passed ---
1 parent 04fda1b commit d5eae50

File tree

10 files changed

+177
-171
lines changed

10 files changed

+177
-171
lines changed

‎lib/node_modules/@stdlib/stats/base/dnanminabs/include/stdlib/stats/base/dnanminabs.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef STDLIB_STATS_BASE_DNANMINABS_H
2020
#define STDLIB_STATS_BASE_DNANMINABS_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 minimum absolute value of a double-precision floating-point strided array, ignoring `NaN` values.
3333
*/
34-
double stdlib_strided_dnanminabs( const int64_t N, const double *X, const int64_t stride );
34+
double API_SUFFIX(stdlib_strided_dnanminabs)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX );
35+
36+
/**
37+
* Computes the minimum 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_dnanminabs_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/dnanminabs/lib/dnanminabs.js‎

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

2121
// MODULES //
2222

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

2626

2727
// MAIN //
@@ -31,58 +31,19 @@ var abs = require( '@stdlib/math/base/special/abs' );
3131
*
3232
* @param {PositiveInteger} N - number of indexed elements
3333
* @param {Float64Array} x - input array
34-
* @param {integer} stride - stride length
34+
* @param {integer} strideX - stride length
3535
* @returns {number} minimum absolute value
3636
*
3737
* @example
3838
* var Float64Array = require( '@stdlib/array/float64' );
3939
*
4040
* var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] );
41-
* var N = x.length;
4241
*
43-
* var v = dnanminabs( N, x, 1 );
42+
* var v = dnanminabs( x.length, x, 1 );
4443
* // returns 1.0
4544
*/
46-
function dnanminabs( N, x, stride ) {
47-
var min;
48-
var ix;
49-
var v;
50-
var i;
51-
52-
if ( N <= 0 ) {
53-
return NaN;
54-
}
55-
if ( N === 1 || stride === 0 ) {
56-
return abs( x[ 0 ] );
57-
}
58-
if ( stride < 0 ) {
59-
ix = (1-N) * stride;
60-
} else {
61-
ix = 0;
62-
}
63-
for ( i = 0; i < N; i++ ) {
64-
v = x[ ix ];
65-
if ( v === v ) {
66-
break;
67-
}
68-
ix += stride;
69-
}
70-
if ( i === N ) {
71-
return NaN;
72-
}
73-
min = abs( v );
74-
i += 1;
75-
for ( i; i < N; i++ ) {
76-
ix += stride;
77-
v = abs( x[ ix ] );
78-
if ( isnan( v ) ) {
79-
continue;
80-
}
81-
if ( v < min ) {
82-
min = v;
83-
}
84-
}
85-
return min;
45+
function dnanminabs( N, x, strideX ) {
46+
return ndarray( N, x, strideX, stride2offset( N, strideX ) );
8647
}
8748

8849

‎lib/node_modules/@stdlib/stats/base/dnanminabs/lib/dnanminabs.native.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,19 @@ 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} minimum absolute value
3535
*
3636
* @example
3737
* var Float64Array = require( '@stdlib/array/float64' );
3838
*
3939
* var x = new Float64Array( [ 1.0, -2.0, 2.0, NaN ] );
40-
* var N = x.length;
4140
*
42-
* var v = dnanminabs( N, x, 1 );
41+
* var v = dnanminabs( x.length, x, 1 );
4342
* // returns 1.0
4443
*/
45-
function dnanminabs( N, x, stride ) {
46-
return addon( N, x, stride );
44+
function dnanminabs( N, x, strideX ) {
45+
return addon( N, x, strideX );
4746
}
4847

4948

‎lib/node_modules/@stdlib/stats/base/dnanminabs/lib/index.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,17 @@
2828
* var dnanminabs = require( '@stdlib/stats/base/dnanminabs' );
2929
*
3030
* var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] );
31-
* var N = x.length;
3231
*
33-
* var v = dnanminabs( N, x, 1 );
32+
* var v = dnanminabs( x.length, x, 1 );
3433
* // returns 1.0
3534
*
3635
* @example
3736
* var Float64Array = require( '@stdlib/array/float64' );
38-
* var floor = require( '@stdlib/math/base/special/floor' );
3937
* var dnanminabs = require( '@stdlib/stats/base/dnanminabs' );
4038
*
4139
* var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] );
42-
* var N = floor( x.length / 2 );
4340
*
44-
* var v = dnanminabs.ndarray( N, x, 2, 1 );
41+
* var v = dnanminabs.ndarray( 5, x, 2, 1 );
4542
* // returns 1.0
4643
*/
4744

‎lib/node_modules/@stdlib/stats/base/dnanminabs/lib/ndarray.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,20 @@ var abs = require( '@stdlib/math/base/special/abs' );
3131
*
3232
* @param {PositiveInteger} N - number of indexed elements
3333
* @param {Float64Array} x - input array
34-
* @param {integer} stride - stride length
35-
* @param {NonNegativeInteger} offset - starting index
34+
* @param {integer} strideX - stride length
35+
* @param {NonNegativeInteger} offsetX - starting index
3636
* @returns {number} minimum absolute value
3737
*
3838
* @example
3939
* var Float64Array = require( '@stdlib/array/float64' );
4040
* 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, NaN, NaN ] );
43-
* var N = floor( x.length / 2 );
4443
*
45-
* var v = dnanminabs( N, x, 2, 1 );
44+
* var v = dnanminabs( 5, x, 2, 1 );
4645
* // returns 1.0
4746
*/
48-
function dnanminabs( N, x, stride, offset ) {
47+
function dnanminabs( N, x, strideX, offsetX ) {
4948
var min;
5049
var ix;
5150
var v;
@@ -54,24 +53,24 @@ function dnanminabs( N, x, stride, offset ) {
5453
if ( N <= 0 ) {
5554
return NaN;
5655
}
57-
if ( N === 1 || stride === 0 ) {
58-
return abs( x[ offset ] );
56+
if ( N === 1 || strideX === 0 ) {
57+
return abs( x[ offsetX ] );
5958
}
60-
ix = offset;
59+
ix = offsetX;
6160
for ( i = 0; i < N; i++ ) {
6261
v = x[ ix ];
6362
if ( v === v ) {
6463
break;
6564
}
66-
ix += stride;
65+
ix += strideX;
6766
}
6867
if ( i === N ) {
6968
return NaN;
7069
}
7170
min = abs( v );
7271
i += 1;
7372
for ( i; i < N; i++ ) {
74-
ix += stride;
73+
ix += strideX;
7574
v = abs( x[ ix ] );
7675
if ( isnan( v ) ) {
7776
continue;

‎lib/node_modules/@stdlib/stats/base/dnanminabs/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( './dnanminabs.native.js' );
23+
var addon = require( './../src/addon.node' );
2524

2625

2726
// MAIN //
@@ -31,27 +30,20 @@ var addon = require( './dnanminabs.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} minimum absolute value
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, NaN ] );
43-
* var N = floor( x.length / 2 );
4441
*
45-
* var v = dnanminabs( N, x, 2, 1 );
42+
* var v = dnanminabs( 5, x, 2, 1 );
4643
* // returns 1.0
4744
*/
48-
function dnanminabs( 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 dnanminabs( N, x, strideX, offsetX ) {
46+
return addon.ndarray( N, x, strideX, offsetX );
5547
}
5648

5749

‎lib/node_modules/@stdlib/stats/base/dnanminabs/manifest.json‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"options": {
3-
"task": "build"
3+
"task": "build",
4+
"wasm": false
45
},
56
"fields": [
67
{
@@ -27,18 +28,20 @@
2728
"confs": [
2829
{
2930
"task": "build",
31+
"wasm": false,
3032
"src": [
31-
"./src/dnanminabs.c"
33+
"./src/main.c"
3234
],
3335
"include": [
3436
"./include"
3537
],
36-
"libraries": [
37-
"-lm"
38-
],
38+
"libraries": [],
3939
"libpath": [],
4040
"dependencies": [
4141
"@stdlib/math/base/assert/is-nan",
42+
"@stdlib/math/base/special/abs",
43+
"@stdlib/blas/base/shared",
44+
"@stdlib/strided/base/stride2offset",
4245
"@stdlib/napi/export",
4346
"@stdlib/napi/argv",
4447
"@stdlib/napi/argv-int64",
@@ -48,34 +51,56 @@
4851
},
4952
{
5053
"task": "benchmark",
54+
"wasm": false,
5155
"src": [
52-
"./src/dnanminabs.c"
56+
"./src/main.c"
5357
],
5458
"include": [
5559
"./include"
5660
],
57-
"libraries": [
58-
"-lm"
59-
],
61+
"libraries": [],
6062
"libpath": [],
6163
"dependencies": [
62-
"@stdlib/math/base/assert/is-nan"
64+
"@stdlib/math/base/assert/is-nan",
65+
"@stdlib/math/base/special/abs",
66+
"@stdlib/blas/base/shared",
67+
"@stdlib/strided/base/stride2offset"
6368
]
6469
},
6570
{
6671
"task": "examples",
72+
"wasm": false,
6773
"src": [
68-
"./src/dnanminabs.c"
74+
"./src/main.c"
6975
],
7076
"include": [
7177
"./include"
7278
],
73-
"libraries": [
74-
"-lm"
79+
"libraries": [],
80+
"libpath": [],
81+
"dependencies": [
82+
"@stdlib/math/base/assert/is-nan",
83+
"@stdlib/math/base/special/abs",
84+
"@stdlib/blas/base/shared",
85+
"@stdlib/strided/base/stride2offset"
86+
]
87+
},
88+
{
89+
"task": "",
90+
"wasm": true,
91+
"src": [
92+
"./src/main.c"
93+
],
94+
"include": [
95+
"./include"
7596
],
97+
"libraries": [],
7698
"libpath": [],
7799
"dependencies": [
78-
"@stdlib/math/base/assert/is-nan"
100+
"@stdlib/math/base/assert/is-nan",
101+
"@stdlib/math/base/special/abs",
102+
"@stdlib/blas/base/shared",
103+
"@stdlib/strided/base/stride2offset"
79104
]
80105
}
81106
]

‎lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.c‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,27 @@
3434
static napi_value addon( napi_env env, napi_callback_info info ) {
3535
STDLIB_NAPI_ARGV( env, info, argv, argc, 3 );
3636
STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 );
37-
STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 );
38-
STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, stride, argv, 1 );
39-
STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dnanminabs( N, X, stride ), v );
37+
STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 );
38+
STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 );
39+
STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dnanminabs( N, X, strideX ), v );
4040
return v;
4141
}
4242

43-
STDLIB_NAPI_MODULE_EXPORT_FCN( addon )
43+
/**
44+
* Receives JavaScript callback invocation data.
45+
*
46+
* @param env environment under which the function is invoked
47+
* @param info callback data
48+
* @return Node-API value
49+
*/
50+
static napi_value addon_method( napi_env env, napi_callback_info info ) {
51+
STDLIB_NAPI_ARGV( env, info, argv, argc, 4 );
52+
STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 );
53+
STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 );
54+
STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 3 );
55+
STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 );
56+
STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dnanminabs_ndarray( N, X, strideX, offsetX ), v );
57+
return v;
58+
}
59+
60+
STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method )

0 commit comments

Comments
 (0)