diff --git a/CHANGELOG.md b/CHANGELOG.md index b7db44d59..de006b65a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,10 +62,11 @@ ### Contributors -A total of 4 people contributed to this release. Thank you to the following contributors: +A total of 5 people contributed to this release. Thank you to the following contributors: - Aman Bhansali - Athan Reines +- HarshaNP - Philipp Burckhardt - yaswanth @@ -79,6 +80,7 @@ A total of 4 people contributed to this release. Thank you to the following cont
+- [`7cc8bb9`](https://github.com/stdlib-js/stdlib/commit/7cc8bb9a96147bb94fe8cfddc180a6ec535fc368) - **refactor:** update `blas/ext/base/dsnannsumors` _(by HarshaNP, Philipp Burckhardt)_ - [`e9f4e07`](https://github.com/stdlib-js/stdlib/commit/e9f4e0759a14b8da93d4e0837b886d8ed56bc696) - **refactor:** update `blas/ext/base/dsnansumpw` to follow current conventions _(by yaswanth, Philipp Burckhardt)_ - [`e0cef99`](https://github.com/stdlib-js/stdlib/commit/e0cef995e884021db3001dc1a3cfef0ca7b368c2) - **style:** remove extra spaces for regular expressions in publish script _(by Philipp Burckhardt)_ - [`da12183`](https://github.com/stdlib-js/stdlib/commit/da121832eca80c36e1e32929e994fef44ca8a4cc) - **feat:** add `blas/base/dspr` [(#2794)](https://github.com/stdlib-js/stdlib/pull/2794) _(by Aman Bhansali, Athan Reines)_ diff --git a/ext/base/dsnannsumors/README.md b/ext/base/dsnannsumors/README.md index b39dad4ca..8f9ea2c37 100644 --- a/ext/base/dsnannsumors/README.md +++ b/ext/base/dsnannsumors/README.md @@ -59,18 +59,16 @@ The function has the following parameters: - **out**: output [`Float64Array`][@stdlib/array/float64] whose first element is the sum and whose second element is the number of non-NaN elements. - **strideOut**: index increment for `out`. -The `N` and `stride` parameters determine which elements are accessed at runtime. For example, to compute the sum of every other element in `x`, +The `N` and stride parameters determine which elements are accessed at runtime. For example, to compute the sum of every other element in `x`, ```javascript var Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float32Array( [ 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 = dsnannsumors( N, x, 2, out, 1 ); +var v = dsnannsumors( 4, x, 2, out, 1 ); // returns [ 5.0, 2 ] ``` @@ -81,7 +79,6 @@ Note that indexing is relative to the first index. To introduce an offset, use [ ```javascript var Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x0 = new Float32Array( [ 2.0, 1.0, NaN, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element @@ -89,9 +86,7 @@ var x1 = new Float32Array( 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 = dsnannsumors( N, x1, 2, out1, 1 ); +var v = dsnannsumors( 4, x1, 2, out1, 1 ); // returns [ 5.0, 4 ] ``` @@ -120,13 +115,11 @@ While [`typed array`][mdn-typed-array] views mandate a view offset based on the ```javascript var Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float32Array( [ 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 = dsnannsumors.ndarray( N, x, 2, 1, out, 2, 1 ); +var v = dsnannsumors.ndarray( 4, x, 2, 1, out, 2, 1 ); // returns [ 0.0, 5.0, 0.0, 4 ] ``` @@ -152,23 +145,23 @@ var v = dsnannsumors.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 discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); var dsnannsumors = require( '@stdlib/blas/ext/base/dsnannsumors' ); var x; -var i; - -x = new Float32Array( 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.5 ) < 0.2 ) { + return NaN; } + return discreteUniform( 0, 100 ); } + +x = filledarrayBy( 10, 'float32', rand ); console.log( x ); var out = new Float64Array( 2 ); diff --git a/ext/base/dsnannsumors/benchmark/benchmark.js b/ext/base/dsnannsumors/benchmark/benchmark.js index 66e26c3b1..df3574b01 100644 --- a/ext/base/dsnannsumors/benchmark/benchmark.js +++ b/ext/base/dsnannsumors/benchmark/benchmark.js @@ -21,10 +21,11 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +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 Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); var pkg = require( './../package.json' ).name; var dsnannsumors = require( './../lib/dsnannsumors.js' ); @@ -42,19 +43,18 @@ var dsnannsumors = require( './../lib/dsnannsumors.js' ); function createBenchmark( len ) { var out; var x; - var i; - x = new Float32Array( len ); - for ( i = 0; i < len; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; - } - } + x = filledarrayBy( len, 'float32', rand ); out = new Float64Array( 2 ); return benchmark; + function rand() { + if ( bernoulli( 0.5 ) < 0.2 ) { + return NaN; + } + return uniform( -10.0, 10.0 ); + } + function benchmark( b ) { var i; diff --git a/ext/base/dsnannsumors/benchmark/benchmark.native.js b/ext/base/dsnannsumors/benchmark/benchmark.native.js index 2d6532f00..b4ec56aa5 100644 --- a/ext/base/dsnannsumors/benchmark/benchmark.native.js +++ b/ext/base/dsnannsumors/benchmark/benchmark.native.js @@ -22,10 +22,11 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +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 Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -51,19 +52,18 @@ var opts = { function createBenchmark( len ) { var out; var x; - var i; - x = new Float32Array( len ); - for ( i = 0; i < len; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; - } - } + x = filledarrayBy( len, 'float32', rand ); out = new Float64Array( 2 ); return benchmark; + function rand() { + if ( bernoulli( 0.5 ) < 0.2 ) { + return NaN; + } + return uniform( -10.0, 10.0 ); + } + function benchmark( b ) { var i; diff --git a/ext/base/dsnannsumors/benchmark/benchmark.ndarray.js b/ext/base/dsnannsumors/benchmark/benchmark.ndarray.js index e41611046..8e047a56a 100644 --- a/ext/base/dsnannsumors/benchmark/benchmark.ndarray.js +++ b/ext/base/dsnannsumors/benchmark/benchmark.ndarray.js @@ -21,10 +21,11 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +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 Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); var pkg = require( './../package.json' ).name; var dsnannsumors = require( './../lib/ndarray.js' ); @@ -42,19 +43,18 @@ var dsnannsumors = require( './../lib/ndarray.js' ); function createBenchmark( len ) { var out; var x; - var i; - x = new Float32Array( len ); - for ( i = 0; i < len; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; - } - } + x = filledarrayBy( len, 'float32', rand ); out = new Float64Array( 2 ); return benchmark; + function rand() { + if ( bernoulli( 0.5 ) < 0.2 ) { + return NaN; + } + return uniform( -10.0, 10.0 ); + } + function benchmark( b ) { var i; diff --git a/ext/base/dsnannsumors/benchmark/benchmark.ndarray.native.js b/ext/base/dsnannsumors/benchmark/benchmark.ndarray.native.js index 0219e75c9..3a21eb6c2 100644 --- a/ext/base/dsnannsumors/benchmark/benchmark.ndarray.native.js +++ b/ext/base/dsnannsumors/benchmark/benchmark.ndarray.native.js @@ -22,10 +22,11 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +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 Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -51,19 +52,18 @@ var opts = { function createBenchmark( len ) { var out; var x; - var i; - x = new Float32Array( len ); - for ( i = 0; i < len; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; - } - } + x = filledarrayBy( len, 'float32', rand ); out = new Float64Array( 2 ); return benchmark; + function rand() { + if ( bernoulli( 0.5 ) < 0.2 ) { + return NaN; + } + return uniform( -10.0, 10.0 ); + } + function benchmark( b ) { var i; diff --git a/ext/base/dsnannsumors/docs/repl.txt b/ext/base/dsnannsumors/docs/repl.txt index 6db756a72..46d20724a 100644 --- a/ext/base/dsnannsumors/docs/repl.txt +++ b/ext/base/dsnannsumors/docs/repl.txt @@ -4,7 +4,7 @@ ignoring `NaN` values, using ordinary recursive summation with extended accumulation, and returning an extended precision result. - The `N` and `stride` parameters determine which elements are accessed at + The `N` and stride parameters determine which elements are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed @@ -43,11 +43,10 @@ > {{alias}}( x.length, x, 1, out, 1 ) [ 1.0, 3 ] - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float32}}( [ -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: @@ -58,13 +57,14 @@ > {{alias}}( N, x1, 2, out, 1 ) [ 1.0, 3 ] + {{alias}}.ndarray( N, x, strideX, offsetX, out, strideOut, offsetOut ) Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation with extended accumulation 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 + buffer, the offset parameter supports indexing semantics based on a starting index. Parameters @@ -106,9 +106,8 @@ // Using offset parameter: > var x = new {{alias:@stdlib/array/float32}}( [ 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/ext/base/dsnannsumors/examples/index.js b/ext/base/dsnannsumors/examples/index.js index d3d72cfc4..ffd52440b 100644 --- a/ext/base/dsnannsumors/examples/index.js +++ b/ext/base/dsnannsumors/examples/index.js @@ -18,24 +18,23 @@ 'use strict'; -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float32Array = require( '@stdlib/array/float32' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var Float64Array = require( '@stdlib/array/float64' ); var dsnannsumors = require( './../lib' ); var out; var x; -var i; -x = new Float32Array( 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.5 ) < 0.2 ) { + return NaN; } + return discreteUniform( 0, 100 ); } + +x = filledarrayBy( 10, 'float32', rand ); console.log( x ); out = new Float64Array( 2 ); diff --git a/ext/base/dsnannsumors/include.gypi b/ext/base/dsnannsumors/include.gypi index 868c5c12e..26476a8c2 100644 --- a/ext/base/dsnannsumors/include.gypi +++ b/ext/base/dsnannsumors/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', '[ 1.0, 3 ] * * @example * var Float32Array = require( '@stdlib/array/float32' ); * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * var dsnannsumors = require( '@stdlib/blas/ext/base/dsnannsumors' ); * * var x = new Float32Array( [ 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 = dsnannsumors.ndarray( N, x, 2, 1, out, 1, 0 ); +* var v = dsnannsumors.ndarray( 5, x, 2, 1, out, 1, 0 ); * // returns [ 5.0, 4 ] */ diff --git a/ext/base/dsnannsumors/lib/ndarray.js b/ext/base/dsnannsumors/lib/ndarray.js index 29c6deb0e..78084bb29 100644 --- a/ext/base/dsnannsumors/lib/ndarray.js +++ b/ext/base/dsnannsumors/lib/ndarray.js @@ -40,14 +40,11 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' ); * @example * var Float32Array = require( '@stdlib/array/float32' ); * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float32Array( [ 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 = dsnannsumors( N, x, 2, 1, out, 1, 0 ); +* var v = dsnannsumors( 5, x, 2, 1, out, 1, 0 ); * // returns [ 5.0, 4 ] */ function dsnannsumors( N, x, strideX, offsetX, out, strideOut, offsetOut ) { diff --git a/ext/base/dsnannsumors/lib/ndarray.native.js b/ext/base/dsnannsumors/lib/ndarray.native.js index 1337a5949..8bfcc42e3 100644 --- a/ext/base/dsnannsumors/lib/ndarray.native.js +++ b/ext/base/dsnannsumors/lib/ndarray.native.js @@ -20,8 +20,8 @@ // MODULES // -var Float32Array = require( '@stdlib/array/float32' ); -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( './dsnannsumors.native.js' ); @@ -42,27 +42,22 @@ var addon = require( './dsnannsumors.native.js' ); * @example * var Float32Array = require( '@stdlib/array/float32' ); * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float32Array( [ 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 = dsnannsumors( N, x, 2, 1, out, 1, 0 ); +* var v = dsnannsumors( 5, x, 2, 1, out, 1, 0 ); * // returns [ 5.0, 4 ] */ function dsnannsumors( N, x, strideX, offsetX, out, strideOut, offsetOut ) { var viewOut; var viewX; - if ( strideX < 0 ) { - offsetX += (N-1) * strideX; - } - if ( strideOut < 0 ) { - offsetOut += strideOut; - } - viewX = new Float32Array( 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 + offsetX = minViewBufferIndex( N, strideX, offsetX ); + offsetOut = minViewBufferIndex( 2, strideOut, offsetOut ); + + viewX = offsetView( x, offsetX ); + viewOut = offsetView( out, offsetOut ); + addon( N, viewX, strideX, viewOut, strideOut ); return out; } diff --git a/ext/base/dsnannsumors/manifest.json b/ext/base/dsnannsumors/manifest.json index 954cdb29d..86df423c2 100644 --- a/ext/base/dsnannsumors/manifest.json +++ b/ext/base/dsnannsumors/manifest.json @@ -1,42 +1,82 @@ { - "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/dsnannsumors.c" - ], - "include": [ - "./include" - ], - "libraries": [ - "-lm" - ], - "libpath": [], - "dependencies": [ - "@stdlib/math/base/assert/is-nanf" - ] - } - ] + "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/dsnannsumors.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ + "@stdlib/napi/export", + "@stdlib/napi/argv", + "@stdlib/napi/argv-int64", + "@stdlib/napi/argv-strided-float32array", + "@stdlib/napi/argv-strided-float64array", + "@stdlib/math/base/assert/is-nanf" + ] + }, + { + "task": "benchmark", + "src": [ + "./src/dsnannsumors.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ + "@stdlib/math/base/assert/is-nanf" + ] + }, + { + "task": "examples", + "src": [ + "./src/dsnannsumors.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ + "@stdlib/math/base/assert/is-nanf" + ] + } + ] } diff --git a/ext/base/dsnannsumors/package.json b/ext/base/dsnannsumors/package.json index 17edf28c0..e86f8808c 100644 --- a/ext/base/dsnannsumors/package.json +++ b/ext/base/dsnannsumors/package.json @@ -74,5 +74,7 @@ "single", "float32array" ], - "__stdlib__": {} + "__stdlib__": { + "wasm": false + } } diff --git a/ext/base/dsnannsumors/src/addon.c b/ext/base/dsnannsumors/src/addon.c new file mode 100644 index 000000000..976788100 --- /dev/null +++ b/ext/base/dsnannsumors/src/addon.c @@ -0,0 +1,59 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2024 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/dsnannsumors.h" +#include "stdlib/napi/export.h" +#include "stdlib/napi/argv.h" +#include "stdlib/napi/argv_int64.h" +#include "stdlib/napi/argv_strided_float32array.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_FLOAT32ARRAY( 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_dsnannsumors( N, X, strideX, &n ); + out[ io + strideOut ] = (double)n; + + return NULL; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) \ No newline at end of file diff --git a/ext/base/dsnannsumors/src/addon.cpp b/ext/base/dsnannsumors/src/addon.cpp deleted file mode 100644 index 870134eee..000000000 --- a/ext/base/dsnannsumors/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/dsnannsumors.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_blas_ext_base_dsnannsumors { - - /** - * Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using ordinary recursive summation with extended accumulation, and returning an extended precision result. - * - * ## 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_dsnannsumors( 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 Float32Array." ); - 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_float32_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float32Array." ); - 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_dsnannsumors( N, (float *)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_dsnannsumors, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_blas_ext_base_dsnannsumors diff --git a/ext/base/dsnannsumors/test/test.dsnannsumors.js b/ext/base/dsnannsumors/test/test.dsnannsumors.js index bb1869259..75204ae0c 100644 --- a/ext/base/dsnannsumors/test/test.dsnannsumors.js +++ b/ext/base/dsnannsumors/test/test.dsnannsumors.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); var dsnannsumors = require( './../lib/dsnannsumors.js' ); @@ -36,7 +35,7 @@ tape( 'main export is a function', function test( t ) { }); tape( 'the function has an arity of 5', function test( t ) { - t.strictEqual( dsnannsumors.length, 5, 'has expected arity' ); + t.strictEqual( dsnannsumors.length, 5, 'returns expected value' ); t.end(); }); @@ -161,10 +160,9 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns a sum equ t.end(); }); -tape( 'the function supports `stride` parameters', function test( t ) { +tape( 'the function supports stride parameters', function test( t ) { var expected; var out; - var N; var x; var v; @@ -182,8 +180,7 @@ tape( 'the function supports `stride` parameters', function test( t ) { ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dsnannsumors( N, x, 2, out, 2 ); + v = dsnannsumors( 5, x, 2, out, 2 ); expected = new Float64Array( [ 5.0, 0.0, 4.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -191,10 +188,9 @@ tape( 'the function supports `stride` parameters', function test( t ) { t.end(); }); -tape( 'the function supports negative `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; @@ -212,8 +208,7 @@ tape( 'the function supports negative `stride` parameters', function test( t ) { ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dsnannsumors( N, x, -2, out, -2 ); + v = dsnannsumors( 5, x, -2, out, -2 ); expected = new Float64Array( [ 4.0, 0.0, 5.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -221,7 +216,7 @@ tape( 'the function supports negative `stride` parameters', function test( t ) { t.end(); }); -tape( 'if provided a `stride` parameter equal to `0`, the function returns a sum equal to the first element', function test( t ) { +tape( 'if provided a stride parameter equal to `0`, the function returns a sum equal to the first element', function test( t ) { var expected; var out; var x; @@ -245,7 +240,6 @@ tape( 'the function supports view offsets', function test( t ) { var out1; var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -265,9 +259,8 @@ tape( 'the function supports view offsets', function test( t ) { x1 = new Float32Array( 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 = dsnannsumors( N, x1, 2, out1, 1 ); + v = dsnannsumors( 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/ext/base/dsnannsumors/test/test.dsnannsumors.native.js b/ext/base/dsnannsumors/test/test.dsnannsumors.native.js index 268734655..a9080e930 100644 --- a/ext/base/dsnannsumors/test/test.dsnannsumors.native.js +++ b/ext/base/dsnannsumors/test/test.dsnannsumors.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -170,10 +169,9 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns a sum equ t.end(); }); -tape( 'the function supports `stride` parameters', opts, function test( t ) { +tape( 'the function supports stride parameters', opts, function test( t ) { var expected; var out; - var N; var x; var v; @@ -191,8 +189,7 @@ tape( 'the function supports `stride` parameters', opts, function test( t ) { ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dsnannsumors( N, x, 2, out, 2 ); + v = dsnannsumors( 5, x, 2, out, 2 ); expected = new Float64Array( [ 5.0, 0.0, 4.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -200,10 +197,9 @@ tape( 'the function supports `stride` parameters', opts, function test( t ) { t.end(); }); -tape( 'the function supports negative `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; @@ -221,8 +217,7 @@ tape( 'the function supports negative `stride` parameters', opts, function test( ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dsnannsumors( N, x, -2, out, -2 ); + v = dsnannsumors( 5, x, -2, out, -2 ); expected = new Float64Array( [ 4.0, 0.0, 5.0, 0.0 ] ); t.deepEqual( v, expected, 'returns expected value' ); @@ -230,7 +225,7 @@ tape( 'the function supports negative `stride` parameters', opts, function test( t.end(); }); -tape( 'if provided a `stride` parameter equal to `0`, the function returns a sum equal to the first element', opts, function test( t ) { +tape( 'if provided a stride parameter equal to `0`, the function returns a sum equal to the first element', opts, function test( t ) { var expected; var out; var x; @@ -254,7 +249,6 @@ tape( 'the function supports view offsets', opts, function test( t ) { var out1; var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -274,9 +268,8 @@ tape( 'the function supports view offsets', opts, function test( t ) { x1 = new Float32Array( 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 = dsnannsumors( N, x1, 2, out1, 1 ); + v = dsnannsumors( 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/ext/base/dsnannsumors/test/test.ndarray.js b/ext/base/dsnannsumors/test/test.ndarray.js index 3783429c4..95ec7e29d 100644 --- a/ext/base/dsnannsumors/test/test.ndarray.js +++ b/ext/base/dsnannsumors/test/test.ndarray.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); var dsnannsumors = require( './../lib/ndarray.js' ); @@ -36,7 +35,7 @@ tape( 'main export is a function', function test( t ) { }); tape( 'the function has an arity of 7', function test( t ) { - t.strictEqual( dsnannsumors.length, 7, 'has expected arity' ); + t.strictEqual( dsnannsumors.length, 7, 'returns expected value' ); t.end(); }); @@ -161,10 +160,9 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first t.end(); }); -tape( 'the function supports a `stride` parameter', function test( t ) { +tape( 'the function supports a stride parameter', function test( t ) { var expected; var out; - var N; var x; var v; @@ -182,8 +180,7 @@ tape( 'the function supports a `stride` parameter', function test( t ) { ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dsnannsumors( N, x, 2, 0, out, 2, 0 ); + v = dsnannsumors( 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' ); @@ -191,10 +188,9 @@ tape( 'the function supports a `stride` parameter', function test( t ) { t.end(); }); -tape( 'the function supports a negative `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; @@ -212,8 +208,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dsnannsumors( N, x, -2, 8, out, -2, 2 ); + v = dsnannsumors( 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' ); @@ -221,7 +216,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) t.end(); }); -tape( 'if provided a `stride` parameter equal to `0`, the function returns the first indexed element', function test( t ) { +tape( 'if provided a stride parameter equal to `0`, the function returns the first indexed element', function test( t ) { var expected; var out; var x; @@ -241,7 +236,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; @@ -258,9 +252,8 @@ tape( 'the function supports `offset` parameters', function test( t ) { NaN // 4 ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dsnannsumors( N, x, 2, 1, out, 2, 1 ); + v = dsnannsumors( 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/ext/base/dsnannsumors/test/test.ndarray.native.js b/ext/base/dsnannsumors/test/test.ndarray.native.js index 3df663345..93fd5f0a0 100644 --- a/ext/base/dsnannsumors/test/test.ndarray.native.js +++ b/ext/base/dsnannsumors/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 Float32Array = require( '@stdlib/array/float32' ); var Float64Array = require( '@stdlib/array/float64' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -170,10 +169,9 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first t.end(); }); -tape( 'the function supports a `stride` parameter', opts, function test( t ) { +tape( 'the function supports a stride parameter', opts, function test( t ) { var expected; var out; - var N; var x; var v; @@ -191,8 +189,7 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dsnannsumors( N, x, 2, 0, out, 2, 0 ); + v = dsnannsumors( 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' ); @@ -200,10 +197,9 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { t.end(); }); -tape( 'the function supports a negative `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; @@ -221,8 +217,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dsnannsumors( N, x, -2, 8, out, -2, 2 ); + v = dsnannsumors( 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' ); @@ -230,7 +225,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test t.end(); }); -tape( 'if provided a `stride` parameter equal to `0`, the function returns the first indexed element', opts, function test( t ) { +tape( 'if provided a stride parameter equal to `0`, the function returns the first indexed element', opts, function test( t ) { var expected; var out; var x; @@ -250,7 +245,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; @@ -267,9 +261,8 @@ tape( 'the function supports `offset` parameters', opts, function test( t ) { NaN // 4 ]); out = new Float64Array( 4 ); - N = floor( x.length / 2 ); - v = dsnannsumors( N, x, 2, 1, out, 2, 1 ); + v = dsnannsumors( 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' );