From be25162ff647ef83bdc4938dc28c0a30d15b02e6 Mon Sep 17 00:00:00 2001 From: Shubh Mehta <93862397+Shubh942@users.noreply.github.com> Date: Mon, 22 Apr 2024 06:46:11 +0530 Subject: [PATCH] refactor: update `blas/ext/base/dnannsumkbn` to follow current project conventions PR-URL: #2079 Closes: #1479 Ref: #1152 --------- Co-authored-by: Philipp Burckhardt Reviewed-by: Philipp Burckhardt --- .../blas/ext/base/dnannsumkbn/README.md | 33 ++-- .../base/dnannsumkbn/benchmark/benchmark.js | 20 +-- .../dnannsumkbn/benchmark/benchmark.native.js | 21 ++- .../benchmark/benchmark.ndarray.js | 21 ++- .../benchmark/benchmark.ndarray.native.js | 21 ++- .../blas/ext/base/dnannsumkbn/docs/repl.txt | 18 +- .../ext/base/dnannsumkbn/examples/index.js | 23 ++- .../blas/ext/base/dnannsumkbn/include.gypi | 2 +- .../blas/ext/base/dnannsumkbn/lib/index.js | 5 +- .../blas/ext/base/dnannsumkbn/lib/ndarray.js | 5 +- .../base/dnannsumkbn/lib/ndarray.native.js | 18 +- .../blas/ext/base/dnannsumkbn/manifest.json | 119 ++++++++----- .../blas/ext/base/dnannsumkbn/src/addon.c | 58 +++++++ .../blas/ext/base/dnannsumkbn/src/addon.cpp | 162 ------------------ .../base/dnannsumkbn/test/test.dnannsumkbn.js | 13 +- .../test/test.dnannsumkbn.native.js | 13 +- .../ext/base/dnannsumkbn/test/test.ndarray.js | 13 +- .../dnannsumkbn/test/test.ndarray.native.js | 13 +- 18 files changed, 229 insertions(+), 349 deletions(-) create mode 100644 lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/src/addon.c delete mode 100644 lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/src/addon.cpp diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/README.md b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/README.md index 631c2ed56e4..7c9708a4a43 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/README.md @@ -62,13 +62,11 @@ The `N` and `stride` parameters determine which elements are accessed at runtime ```javascript var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float64Array( [ 1.0, 2.0, NaN, -7.0, NaN, 3.0, 4.0, 2.0 ] ); var out = new Float64Array( 2 ); -var N = floor( x.length / 2 ); -var v = dnannsumkbn( N, x, 2, out, 1 ); +var v = dnannsumkbn( 4, x, 2, out, 1 ); // returns [ 5.0, 2 ] ``` @@ -78,7 +76,6 @@ Note that indexing is relative to the first index. To introduce an offset, use [ ```javascript var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x0 = new Float64Array( [ 2.0, 1.0, NaN, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element @@ -86,9 +83,7 @@ var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd var out0 = new Float64Array( 4 ); var out1 = new Float64Array( out0.buffer, out0.BYTES_PER_ELEMENT*2 ); // start at 3rd element -var N = floor( x0.length / 2 ); - -var v = dnannsumkbn( N, x1, 2, out1, 1 ); +var v = dnannsumkbn( 4, x1, 2, out1, 1 ); // returns [ 5.0, 4 ] ``` @@ -115,13 +110,11 @@ While [`typed array`][mdn-typed-array] views mandate a view offset based on the ```javascript var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float64Array( [ 2.0, 1.0, NaN, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); var out = new Float64Array( 4 ); -var N = floor( x.length / 2 ); -var v = dnannsumkbn.ndarray( N, x, 2, 1, out, 2, 1 ); +var v = dnannsumkbn.ndarray( 4, x, 2, 1, out, 2, 1 ); // returns [ 0.0, 5.0, 0.0, 4 ] ``` @@ -146,22 +139,20 @@ var v = dnannsumkbn.ndarray( N, x, 2, 1, out, 2, 1 ); ```javascript -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var Float64Array = require( '@stdlib/array/float64' ); var dnannsumkbn = require( '@stdlib/blas/ext/base/dnannsumkbn' ); -var x; -var i; - -x = new Float64Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = round( randu()*100.0 ); +function rand() { + if ( bernoulli( 0.8 ) > 0 ) { + return discreteUniform( 0, 100 ); } + return NaN; } + +var x = filledarrayBy( 10, 'float64', rand ); console.log( x ); var out = new Float64Array( 2 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.js index 3d93cc4943a..2850c16dd58 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.js @@ -21,7 +21,9 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -40,19 +42,15 @@ var dnannsumkbn = require( './../lib/dnannsumkbn.js' ); */ function createBenchmark( len ) { var out; - var x; - var i; + var x = filledarrayBy( len, 'float64', rand ); + out = new Float64Array( 2 ); + return benchmark; - x = new Float64Array( len ); - for ( i = 0; i < len; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -10, 10 ); } } - out = new Float64Array( 2 ); - return benchmark; function benchmark( b ) { var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.native.js index 99085464232..12f4a9059d8 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.native.js @@ -22,7 +22,9 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -49,19 +51,16 @@ var opts = { */ function createBenchmark( len ) { var out; - var x; - var i; + var x = filledarrayBy( len, 'float64', rand ); + out = new Float64Array( 2 ); + return benchmark; - x = new Float64Array( len ); - for ( i = 0; i < len; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -10, 10 ); } + return NaN; } - out = new Float64Array( 2 ); - return benchmark; function benchmark( b ) { var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.ndarray.js index 7c9c563030f..b7c3c480c34 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.ndarray.js @@ -21,7 +21,9 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -40,19 +42,16 @@ var dnannsumkbn = require( './../lib/ndarray.js' ); */ function createBenchmark( len ) { var out; - var x; - var i; + var x = filledarrayBy( len, 'float64', rand ); + out = new Float64Array( 2 ); + return benchmark; - x = new Float64Array( len ); - for ( i = 0; i < len; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -10, 10 ); } + return NaN; } - out = new Float64Array( 2 ); - return benchmark; function benchmark( b ) { var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.ndarray.native.js index 692c00352cc..37e59f79a79 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/benchmark/benchmark.ndarray.native.js @@ -22,7 +22,9 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -49,19 +51,16 @@ var opts = { */ function createBenchmark( len ) { var out; - var x; - var i; + var x = filledarrayBy( len, 'float64', rand ); + out = new Float64Array( 2 ); + return benchmark; - x = new Float64Array( len ); - for ( i = 0; i < len; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -10, 10 ); } + return NaN; } - out = new Float64Array( 2 ); - return benchmark; function benchmark( b ) { var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/docs/repl.txt index 13ae377d7ab..14010bb16fb 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/docs/repl.txt @@ -3,8 +3,8 @@ Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using an improved Kahan–Babuška algorithm. - The `N` and `stride` parameters determine which elements are accessed at - runtime. + The `N` and `stride` parameters determine which elements in the strided + array are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed array view. @@ -45,26 +45,25 @@ // Using `N` and `stride` parameters: > x = new {{alias:@stdlib/array/float64}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0, NaN, NaN ] ); > out = new {{alias:@stdlib/array/float64}}( 2 ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}( N, x, 2, out, 1 ) + > {{alias}}( 4, x, 2, out, 1 ) [ 1.0, 3 ] // Using view offsets: > var x0 = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, 1.0, NaN, NaN ] ); > var x1 = new {{alias:@stdlib/array/float64}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); - > N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 ); > out = new {{alias:@stdlib/array/float64}}( 2 ); - > {{alias}}( N, x1, 2, out, 1 ) + > {{alias}}( 4, x1, 2, out, 1 ) [ 1.0, 3 ] + {{alias}}.ndarray( N, x, strideX, offsetX, out, strideOut, offsetOut ) Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using an improved Kahan–Babuška algorithm and alternative indexing semantics. While typed array views mandate a view offset based on the underlying - buffer, the `offset` parameter supports indexing semantics based on a - starting index. + buffer, the offsetX and offsetY parameter supports indexing semantics + based on a starting index. Parameters ---------- @@ -105,9 +104,8 @@ // Using offset parameter: > var x = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, 1.0, NaN, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); > out = new {{alias:@stdlib/array/float64}}( 2 ); - > {{alias}}.ndarray( N, x, 2, 1, out, 1, 0 ) + > {{alias}}.ndarray( 4, x, 2, 1, out, 1, 0 ) [ 1.0, 3 ] See Also diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/examples/index.js index 2335e000327..4dd195b30d2 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/examples/index.js @@ -18,25 +18,22 @@ 'use strict'; -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var Float64Array = require( '@stdlib/array/float64' ); var dnannsumkbn = require( './../lib' ); -var out; -var x; -var i; - -x = new Float64Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = round( randu()*100.0 ); +function rand() { + if ( bernoulli( 0.8 ) > 0 ) { + return discreteUniform( 0, 100 ); } + return NaN; } + +var x = filledarrayBy( 10, 'float64', rand ); console.log( x ); -out = new Float64Array( 2 ); +var out = new Float64Array( 2 ); dnannsumkbn( x.length, x, 1, out, 1 ); console.log( out ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/include.gypi b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/include.gypi index 868c5c12e85..26476a8c265 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/include.gypi +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', '[ 5.0, 4 ] */ diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/lib/ndarray.js index 7e32cce3037..48c49682096 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/lib/ndarray.js @@ -48,14 +48,11 @@ var abs = require( '@stdlib/math/base/special/abs' ); * * @example * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); * var out = new Float64Array( 2 ); * -* var N = floor( x.length / 2 ); -* -* var v = dnannsumkbn( N, x, 2, 1, out, 1, 0 ); +* var v = dnannsumkbn( 5, x, 2, 1, out, 1, 0 ); * // returns [ 5.0, 4 ] */ function dnannsumkbn( N, x, strideX, offsetX, out, strideOut, offsetOut ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/lib/ndarray.native.js index 07c023fdd60..e8e546c448a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/lib/ndarray.native.js @@ -20,7 +20,8 @@ // MODULES // -var Float64Array = require( '@stdlib/array/float64' ); +var minViewBufferIndex = require( '@stdlib/strided/base/min-view-buffer-index' ); +var offsetView = require( '@stdlib/strided/base/offset-view' ); var addon = require( './dnannsumkbn.native.js' ); @@ -40,27 +41,24 @@ var addon = require( './dnannsumkbn.native.js' ); * * @example * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); * var out = new Float64Array( 2 ); * -* var N = floor( x.length / 2 ); -* -* var v = dnannsumkbn( N, x, 2, 1, out, 1, 0 ); +* var v = dnannsumkbn( 5, x, 2, 1, out, 1, 0 ); * // returns [ 5.0, 4 ] */ function dnannsumkbn( N, x, strideX, offsetX, out, strideOut, offsetOut ) { var viewOut; var viewX; - if ( strideX < 0 ) { - offsetX += (N-1) * strideX; - } + + offsetX = minViewBufferIndex( N, strideX, offsetX ); if ( strideOut < 0 ) { offsetOut += strideOut; } - viewX = new Float64Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offsetX), x.length-offsetX ); // eslint-disable-line max-len - viewOut = new Float64Array( out.buffer, out.byteOffset+(out.BYTES_PER_ELEMENT*offsetOut), out.length-offsetOut ); // eslint-disable-line max-len + + viewX = offsetView( x, offsetX ); + viewOut = offsetView( out, offsetOut ); addon( N, viewX, strideX, viewOut, strideOut ); return out; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/manifest.json index 9de314f8d1b..718554dcf60 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/manifest.json @@ -1,42 +1,81 @@ { - "options": {}, - "fields": [ - { - "field": "src", - "resolve": true, - "relative": true - }, - { - "field": "include", - "resolve": true, - "relative": true - }, - { - "field": "libraries", - "resolve": false, - "relative": false - }, - { - "field": "libpath", - "resolve": true, - "relative": false - } - ], - "confs": [ - { - "src": [ - "./src/dnannsumkbn.c" - ], - "include": [ - "./include" - ], - "libraries": [ - "-lm" - ], - "libpath": [], - "dependencies": [ - "@stdlib/math/base/assert/is-nan" - ] - } - ] + "options": { + "task": "build" + }, + "fields": [ + { + "field": "src", + "resolve": true, + "relative": true + }, + { + "field": "include", + "resolve": true, + "relative": true + }, + { + "field": "libraries", + "resolve": false, + "relative": false + }, + { + "field": "libpath", + "resolve": true, + "relative": false + } + ], + "confs": [ + { + "task": "build", + "src": [ + "./src/dnannsumkbn.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ + "@stdlib/napi/export", + "@stdlib/napi/argv", + "@stdlib/napi/argv-int64", + "@stdlib/napi/argv-strided-float64array", + "@stdlib/math/base/assert/is-nan" + ] + }, + { + "task": "benchmark", + "src": [ + "./src/dnannsumkbn.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ + "@stdlib/math/base/assert/is-nan" + ] + }, + { + "task": "examples", + "src": [ + "./src/dnannsumkbn.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ + "@stdlib/math/base/assert/is-nan" + ] + } + ] } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/src/addon.c new file mode 100644 index 00000000000..4dc08bb03bc --- /dev/null +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/src/addon.c @@ -0,0 +1,58 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2020 The Stdlib Authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +#include "stdlib/blas/ext/base/dnannsumkbn.h" +#include "stdlib/napi/export.h" +#include "stdlib/napi/argv.h" +#include "stdlib/napi/argv_int64.h" +#include "stdlib/napi/argv_strided_float64array.h" +#include +#include + +/** +* Receives JavaScript callback invocation data. +* +* @private +* @param env environment under which the function is invoked +* @param info callback data +* @return Node-API value +*/ +static napi_value addon( napi_env env, napi_callback_info info ) { + STDLIB_NAPI_ARGV( env, info, argv, argc, 5 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_INT64( env, strideOut, argv, 4 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, Out, 2, strideOut, argv, 3 ); + + int64_t io; + if ( strideOut < 0 ) { + io = -strideOut; + } else { + io = 0; + } + + double *out = Out; + int64_t n; + out[ io ] = stdlib_strided_dnannsumkbn( N, X, strideX, &n ); + out[ io+strideOut ] = (double)n; + + return NULL; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/src/addon.cpp b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/src/addon.cpp deleted file mode 100644 index 83af95906b3..00000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/src/addon.cpp +++ /dev/null @@ -1,162 +0,0 @@ -/** -* @license Apache-2.0 -* -* Copyright (c) 2020 The Stdlib Authors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -#include "stdlib/blas/ext/base/dnannsumkbn.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_blas_ext_base_dnannsumkbn { - - /** - * Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using an improved Kahan–Babuška algorithm. - * - * ## Notes - * - * - When called from JavaScript, the function expects five arguments: - * - * - `N`: number of indexed elements - * - `X`: input array - * - `strideX`: `X` stride length - * - `Out`: output array - * - `strideOut`: `Out` stride length - */ - napi_value node_dnannsumkbn( napi_env env, napi_callback_info info ) { - napi_status status; - - size_t argc = 5; - napi_value argv[ 5 ]; - status = napi_get_cb_info( env, info, &argc, argv, nullptr, nullptr ); - assert( status == napi_ok ); - - if ( argc < 5 ) { - napi_throw_error( env, nullptr, "invalid invocation. Must provide 5 arguments." ); - return nullptr; - } - - napi_valuetype vtype0; - status = napi_typeof( env, argv[ 0 ], &vtype0 ); - assert( status == napi_ok ); - if ( vtype0 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. First argument must be a number." ); - return nullptr; - } - - bool res1; - status = napi_is_typedarray( env, argv[ 1 ], &res1 ); - assert( status == napi_ok ); - if ( res1 == false ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float64Array." ); - return nullptr; - } - - napi_valuetype vtype2; - status = napi_typeof( env, argv[ 2 ], &vtype2 ); - assert( status == napi_ok ); - if ( vtype2 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. Third argument must be a number." ); - return nullptr; - } - - bool res3; - status = napi_is_typedarray( env, argv[ 3 ], &res3 ); - assert( status == napi_ok ); - if ( res3 == false ) { - napi_throw_type_error( env, nullptr, "invalid argument. Fourth argument must be a Float64Array." ); - return nullptr; - } - - napi_valuetype vtype4; - status = napi_typeof( env, argv[ 4 ], &vtype4 ); - assert( status == napi_ok ); - if ( vtype4 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. Fifth argument must be a number." ); - return nullptr; - } - - int64_t N; - status = napi_get_value_int64( env, argv[ 0 ], &N ); - assert( status == napi_ok ); - - int64_t strideX; - status = napi_get_value_int64( env, argv[ 2 ], &strideX ); - assert( status == napi_ok ); - - int64_t strideOut; - status = napi_get_value_int64( env, argv[ 4 ], &strideOut ); - assert( status == napi_ok ); - - napi_typedarray_type vtype1; - size_t xlen; - void *X; - status = napi_get_typedarray_info( env, argv[ 1 ], &vtype1, &xlen, &X, nullptr, nullptr ); - assert( status == napi_ok ); - if ( vtype1 != napi_float64_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float64Array." ); - return nullptr; - } - if ( (N-1)*llabs(strideX) >= (int64_t)xlen ) { - napi_throw_range_error( env, nullptr, "invalid argument. Second argument has insufficient elements based on the associated stride and the number of indexed elements." ); - return nullptr; - } - - napi_typedarray_type vtype3; - size_t olen; - void *Out; - status = napi_get_typedarray_info( env, argv[ 3 ], &vtype3, &olen, &Out, nullptr, nullptr ); - assert( status == napi_ok ); - if ( vtype3 != napi_float64_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Fourth argument must be a Float64Array." ); - return nullptr; - } - if ( llabs(strideOut) > (int64_t)olen ) { - napi_throw_range_error( env, nullptr, "invalid argument. Fourth argument has insufficient elements based on the associated stride and the required number of output elements." ); - return nullptr; - } - - int64_t io; - if ( strideOut < 0 ) { - io = -strideOut; - } else { - io = 0; - } - - double *out = (double *)Out; - int64_t n; - out[ io ] = stdlib_strided_dnannsumkbn( N, (double *)X, strideX, &n ); - out[ io+strideOut ] = (double)n; - - return nullptr; - - } - - napi_value Init( napi_env env, napi_value exports ) { - napi_status status; - napi_value fcn; - status = napi_create_function( env, "exports", NAPI_AUTO_LENGTH, node_dnannsumkbn, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_blas_ext_base_dnannsumkbn diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.dnannsumkbn.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.dnannsumkbn.js index efd489eeac9..37f71ea7bd6 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.dnannsumkbn.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.dnannsumkbn.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float64Array = require( '@stdlib/array/float64' ); var dnannsumkbn = require( './../lib/dnannsumkbn.js' ); @@ -163,7 +162,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns a sum equ tape( 'the function supports `stride` parameters', function test( t ) { var expected; var out; - var N; var x; var v; @@ -181,8 +179,7 @@ tape( 'the function supports `stride` parameters', function test( t ) { ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dnannsumkbn( N, x, 2, out, 2 ); + v = dnannsumkbn( 5, x, 2, out, 2 ); expected = new Float64Array( [ 5.0, 0.0, 4.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -193,7 +190,6 @@ tape( 'the function supports `stride` parameters', function test( t ) { tape( 'the function supports negative `stride` parameters', function test( t ) { var expected; var out; - var N; var x; var v; @@ -211,8 +207,7 @@ tape( 'the function supports negative `stride` parameters', function test( t ) { ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dnannsumkbn( N, x, -2, out, -2 ); + v = dnannsumkbn( 5, x, -2, out, -2 ); expected = new Float64Array( [ 4.0, 0.0, 5.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -244,7 +239,6 @@ tape( 'the function supports view offsets', function test( t ) { var out1; var x0; var x1; - var N; var v; x0 = new Float64Array([ @@ -264,9 +258,8 @@ tape( 'the function supports view offsets', function test( t ) { x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element out1 = new Float64Array( out0.buffer, out0.BYTES_PER_ELEMENT*2 ); // start at the 3rd element - N = floor(x1.length / 2); - v = dnannsumkbn( N, x1, 2, out1, 1 ); + v = dnannsumkbn( 5, x1, 2, out1, 1 ); expected0 = new Float64Array( [ 0.0, 0.0, 5.0, 4.0 ] ); expected1 = new Float64Array( [ 5.0, 4.0 ] ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.dnannsumkbn.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.dnannsumkbn.native.js index e36577ea513..1cd6842af9b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.dnannsumkbn.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.dnannsumkbn.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float64Array = require( '@stdlib/array/float64' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -172,7 +171,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns a sum equ tape( 'the function supports `stride` parameters', opts, function test( t ) { var expected; var out; - var N; var x; var v; @@ -190,8 +188,7 @@ tape( 'the function supports `stride` parameters', opts, function test( t ) { ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dnannsumkbn( N, x, 2, out, 2 ); + v = dnannsumkbn( 5, x, 2, out, 2 ); expected = new Float64Array( [ 5.0, 0.0, 4.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -202,7 +199,6 @@ tape( 'the function supports `stride` parameters', opts, function test( t ) { tape( 'the function supports negative `stride` parameters', opts, function test( t ) { var expected; var out; - var N; var x; var v; @@ -220,8 +216,7 @@ tape( 'the function supports negative `stride` parameters', opts, function test( ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dnannsumkbn( N, x, -2, out, -2 ); + v = dnannsumkbn( 5, x, -2, out, -2 ); expected = new Float64Array( [ 4.0, 0.0, 5.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -253,7 +248,6 @@ tape( 'the function supports view offsets', opts, function test( t ) { var out1; var x0; var x1; - var N; var v; x0 = new Float64Array([ @@ -273,9 +267,8 @@ tape( 'the function supports view offsets', opts, function test( t ) { x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element out1 = new Float64Array( out0.buffer, out0.BYTES_PER_ELEMENT*2 ); // start at the 3rd element - N = floor(x1.length / 2); - v = dnannsumkbn( N, x1, 2, out1, 1 ); + v = dnannsumkbn( 5, x1, 2, out1, 1 ); expected0 = new Float64Array( [ 0.0, 0.0, 5.0, 4.0 ] ); expected1 = new Float64Array( [ 5.0, 4.0 ] ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.ndarray.js index 1ec86995f5f..97d2d396ca0 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.ndarray.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float64Array = require( '@stdlib/array/float64' ); var dnannsumkbn = require( './../lib/ndarray.js' ); @@ -163,7 +162,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first tape( 'the function supports a `stride` parameter', function test( t ) { var expected; var out; - var N; var x; var v; @@ -181,8 +179,7 @@ tape( 'the function supports a `stride` parameter', function test( t ) { ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dnannsumkbn( N, x, 2, 0, out, 2, 0 ); + v = dnannsumkbn( 5, x, 2, 0, out, 2, 0 ); expected = new Float64Array( [ 5.0, 0.0, 4.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -193,7 +190,6 @@ tape( 'the function supports a `stride` parameter', function test( t ) { tape( 'the function supports a negative `stride` parameter', function test( t ) { var expected; var out; - var N; var x; var v; @@ -211,8 +207,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dnannsumkbn( N, x, -2, 8, out, -2, 2 ); + v = dnannsumkbn( 5, x, -2, 8, out, -2, 2 ); expected = new Float64Array( [ 4.0, 0.0, 5.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -240,7 +235,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports `offset` parameters', function test( t ) { var expected; var out; - var N; var x; var v; @@ -257,9 +251,8 @@ tape( 'the function supports `offset` parameters', function test( t ) { NaN // 4 ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dnannsumkbn( N, x, 2, 1, out, 2, 1 ); + v = dnannsumkbn( 5, x, 2, 1, out, 2, 1 ); expected = new Float64Array( [ 0.0, 5.0, 0.0, 4.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.ndarray.native.js index 0ed952bb12a..a44484c7456 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnannsumkbn/test/test.ndarray.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float64Array = require( '@stdlib/array/float64' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -172,7 +171,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first tape( 'the function supports a `stride` parameter', opts, function test( t ) { var expected; var out; - var N; var x; var v; @@ -190,8 +188,7 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dnannsumkbn( N, x, 2, 0, out, 2, 0 ); + v = dnannsumkbn( 5, x, 2, 0, out, 2, 0 ); expected = new Float64Array( [ 5.0, 0.0, 4.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -202,7 +199,6 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { var expected; var out; - var N; var x; var v; @@ -220,8 +216,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dnannsumkbn( N, x, -2, 8, out, -2, 2 ); + v = dnannsumkbn( 5, x, -2, 8, out, -2, 2 ); expected = new Float64Array( [ 4.0, 0.0, 5.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -249,7 +244,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports `offset` parameters', opts, function test( t ) { var expected; var out; - var N; var x; var v; @@ -266,9 +260,8 @@ tape( 'the function supports `offset` parameters', opts, function test( t ) { NaN // 4 ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dnannsumkbn( N, x, 2, 1, out, 2, 1 ); + v = dnannsumkbn( 5, x, 2, 1, out, 2, 1 ); expected = new Float64Array( [ 0.0, 5.0, 0.0, 4.0 ] ); t.deepEqual( v, expected, 'returns expected value' );