From 137cb7f10b6d676d79ffb4332c94fe67abfd31fc Mon Sep 17 00:00:00 2001 From: AuenKr Date: Thu, 14 Mar 2024 19:16:54 +0530 Subject: [PATCH 1/4] refactor: inital dnansum updates --- .../@stdlib/blas/ext/base/dnansum/README.md | 20 +-- .../blas/ext/base/dnansum/docs/repl.txt | 16 +-- .../blas/ext/base/dnansum/lib/dnansum.js | 3 +- .../ext/base/dnansum/lib/dnansum.native.js | 3 +- .../blas/ext/base/dnansum/lib/index.js | 7 +- .../blas/ext/base/dnansum/lib/ndarray.js | 4 +- .../ext/base/dnansum/lib/ndarray.native.js | 4 +- .../blas/ext/base/dnansum/manifest.json | 35 +++++- .../blas/ext/base/dnansum/package.json | 4 +- .../@stdlib/blas/ext/base/dnansum/src/addon.c | 47 +++++++ .../blas/ext/base/dnansum/src/addon.cpp | 117 ------------------ .../ext/base/dnansum/test/test.dnansum.js | 15 +-- .../base/dnansum/test/test.dnansum.native.js | 15 +-- .../ext/base/dnansum/test/test.ndarray.js | 15 +-- .../base/dnansum/test/test.ndarray.native.js | 15 +-- 15 files changed, 118 insertions(+), 202 deletions(-) create mode 100644 lib/node_modules/@stdlib/blas/ext/base/dnansum/src/addon.c delete mode 100644 lib/node_modules/@stdlib/blas/ext/base/dnansum/src/addon.cpp diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/README.md b/lib/node_modules/@stdlib/blas/ext/base/dnansum/README.md index 0953a2abe6a5..07a9678c6125 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/README.md @@ -56,16 +56,14 @@ The function has the following parameters: - **x**: input [`Float64Array`][@stdlib/array/float64]. - **stride**: index increment for `x`. -The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the sum of every other element in `x`, +The `N` and `stride` parameters determine which elements in the strided array are accessed at runtime. For example, to compute the sum of every other element in the strided array, ```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 N = floor( x.length / 2 ); -var v = dnansum( N, x, 2 ); +var v = dnansum( 4, x, 2 ); // returns 5.0 ``` @@ -75,14 +73,11 @@ 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 -var N = floor( x0.length / 2 ); - -var v = dnansum( N, x1, 2 ); +var v = dnansum( 4, x1, 2 ); // returns 5.0 ``` @@ -94,9 +89,8 @@ Computes the sum of double-precision floating-point strided array elements, igno var Float64Array = require( '@stdlib/array/float64' ); var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var N = x.length; -var v = dnansum.ndarray( N, x, 1, 0 ); +var v = dnansum.ndarray( 4, x, 1, 0 ); // returns 1.0 ``` @@ -104,16 +98,14 @@ The function has the following additional parameters: - **offset**: starting index for `x`. -While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, the `offset` parameter supports indexing semantics based on a starting index. For example, to calculate the sum of every other value in `x` starting from the second value +While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, the offset parameter supports indexing semantics based on a starting index. For example, to calculate the sum of every other value in the strided array starting from the second value ```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 N = floor( x.length / 2 ); -var v = dnansum.ndarray( N, x, 2, 1 ); +var v = dnansum.ndarray( 4, x, 2, 1 ); // returns 5.0 ``` diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/dnansum/docs/repl.txt index 69eb7e0304e2..74ea39830edd 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/docs/repl.txt @@ -3,8 +3,8 @@ Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values. - The `N` and `stride` parameters determine which elements in `x` 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. @@ -36,19 +36,16 @@ // 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 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > var stride = 2; - > {{alias}}( N, x, stride ) + > {{alias}}( 4, x, 2 ) 1.0 // 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 ); - > stride = 2; - > {{alias}}( N, x1, stride ) + > {{alias}}( 4, x1, 2 ) -1.0 + {{alias}}.ndarray( N, x, stride, offset ) Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using alternative indexing semantics. @@ -85,8 +82,7 @@ // 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 ); - > {{alias}}.ndarray( N, x, 2, 1 ) + > {{alias}}.ndarray( 4, x, 2, 1 ) -1.0 See Also diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/dnansum.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/dnansum.js index 3a7e7df3d0db..33916506453c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/dnansum.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/dnansum.js @@ -37,9 +37,8 @@ var dnansumkbn = require( '@stdlib/blas/ext/base/dnansumkbn' ); * var Float64Array = require( '@stdlib/array/float64' ); * * var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = dnansum( N, x, 1 ); +* var v = dnansum( 4, x, 1 ); * // returns 1.0 */ function dnansum( N, x, stride ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/dnansum.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/dnansum.native.js index d865025de3a7..22b5ee028ff1 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/dnansum.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/dnansum.native.js @@ -37,9 +37,8 @@ var addon = require( './../src/addon.node' ); * var Float64Array = require( '@stdlib/array/float64' ); * * var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = dnansum( N, x, 1 ); +* var v = dnansum( 4, x, 1 ); * // returns 1.0 */ function dnansum( N, x, stride ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/index.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/index.js index 0733b06c7be1..e2e092633732 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/index.js @@ -28,20 +28,17 @@ * var dnansum = require( '@stdlib/blas/ext/base/dnansum' ); * * var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = dnansum( N, x, 1 ); +* var v = dnansum( 4, x, 1 ); * // returns 1.0 * * @example * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * var dnansum = require( '@stdlib/blas/ext/base/dnansum' ); * * var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); -* var N = floor( x.length / 2 ); * -* var v = dnansum.ndarray( N, x, 2, 1 ); +* var v = dnansum.ndarray( 5, x, 2, 1 ); * // returns 5.0 */ diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.js index 92da8d9e348d..3a36203ef210 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.js @@ -36,12 +36,10 @@ var dnansumkbn = require( '@stdlib/blas/ext/base/dnansumkbn' ).ndarray; * * @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 N = floor( x.length / 2 ); * -* var v = dnansum( N, x, 2, 1 ); +* var v = dnansum( 5, x, 2, 1 ); * // returns 5.0 */ function dnansum( N, x, stride, offset ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.native.js index 72c79469e7a4..33ccf89ace60 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.native.js @@ -37,12 +37,10 @@ var addon = require( './dnansum.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 N = floor( x.length / 2 ); * -* var v = dnansum( N, x, 2, 1 ); +* var v = dnansum( 5, x, 2, 1 ); * // returns 5.0 */ function dnansum( N, x, stride, offset ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dnansum/manifest.json index 8af6b9d7bbed..c0f2b3ea455f 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/manifest.json @@ -24,6 +24,7 @@ ], "confs": [ { + "task": "build", "src": [ "./src/dnansum.c" ], @@ -35,8 +36,40 @@ ], "libpath": [], "dependencies": [ + "@stdlib/napi/export", + "@stdlib/napi/argv", + "@stdlib/napi/argv-int64", + "@stdlib/napi/argv-strided-float64array", "@stdlib/blas/ext/base/dnansumkbn" ] - } + }, + { + "task": "benchmark", + "src": [ + "./src/dnansum.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [] + }, + { + "task": "examples", + "src": [ + "./src/dnansum.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [] + } ] } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/package.json b/lib/node_modules/@stdlib/blas/ext/base/dnansum/package.json index 87afa6d592c5..d97f58c80206 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/package.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/package.json @@ -72,5 +72,7 @@ "double", "float64array" ], - "__stdlib__": {} + "__stdlib__": { + "wasm": false + } } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/dnansum/src/addon.c new file mode 100644 index 000000000000..3986da7edfe9 --- /dev/null +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/src/addon.c @@ -0,0 +1,47 @@ +/** +* @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/dnansum.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, 3 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, stride, argv, 1 ); + + napi_value v; + status = napi_create_double( env, stdlib_strided_dnansum( N, (double *)X, stride ), &v ); + assert( status == napi_ok ); + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/src/addon.cpp b/lib/node_modules/@stdlib/blas/ext/base/dnansum/src/addon.cpp deleted file mode 100644 index f940e5b56233..000000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/src/addon.cpp +++ /dev/null @@ -1,117 +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/dnansum.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_blas_ext_base_dnansum { - - /** - * Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values. - * - * ## Notes - * - * - When called from JavaScript, the function expects three arguments: - * - * - `N`: number of indexed elements - * - `X`: input array - * - `stride`: stride length - */ - napi_value node_dnansum( napi_env env, napi_callback_info info ) { - napi_status status; - - size_t argc = 3; - napi_value argv[ 3 ]; - status = napi_get_cb_info( env, info, &argc, argv, nullptr, nullptr ); - assert( status == napi_ok ); - - if ( argc < 3 ) { - napi_throw_error( env, nullptr, "invalid invocation. Must provide 3 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 res; - status = napi_is_typedarray( env, argv[ 1 ], &res ); - assert( status == napi_ok ); - if ( res == 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; - } - - int64_t N; - status = napi_get_value_int64( env, argv[ 0 ], &N ); - assert( status == napi_ok ); - - int64_t stride; - status = napi_get_value_int64( env, argv[ 2 ], &stride ); - 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(stride) >= (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_value v; - status = napi_create_double( env, stdlib_strided_dnansum( N, (double *)X, stride ), &v ); - assert( status == napi_ok ); - - return v; - } - - 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_dnansum, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_blas_ext_base_dnansum diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.dnansum.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.dnansum.js index 05f6926805e8..e25debdc7b48 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.dnansum.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.dnansum.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 dnansum = require( './../lib/dnansum.js' ); @@ -35,7 +34,7 @@ tape( 'main export is a function', function test( t ) { }); tape( 'the function has an arity of 3', function test( t ) { - t.strictEqual( dnansum.length, 3, 'has expected arity' ); + t.strictEqual( dnansum.length, 3, 'returns expected value' ); t.end(); }); @@ -106,7 +105,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 N; var x; var v; @@ -123,15 +121,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dnansum( N, x, 2 ); + v = dnansum( 5, x, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -148,8 +144,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dnansum( N, x, -2 ); + v = dnansum( 5, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); @@ -170,7 +165,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports view offsets', function test( t ) { var x0; var x1; - var N; var v; x0 = new Float64Array([ @@ -188,9 +182,8 @@ tape( 'the function supports view offsets', function test( t ) { ]); x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = dnansum( N, x1, 2 ); + v = dnansum( 5, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.dnansum.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.dnansum.native.js index e093e1e4761f..03cda2e6e3c5 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.dnansum.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.dnansum.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' ); @@ -44,7 +43,7 @@ tape( 'main export is a function', opts, function test( t ) { }); tape( 'the function has an arity of 3', opts, function test( t ) { - t.strictEqual( dnansum.length, 3, 'has expected arity' ); + t.strictEqual( dnansum.length, 3, 'returns expected value' ); t.end(); }); @@ -197,7 +196,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 N; var x; var v; @@ -214,15 +212,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dnansum( N, x, 2 ); + v = dnansum( 5, x, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -239,8 +235,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dnansum( N, x, -2 ); + v = dnansum( 5, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); @@ -261,7 +256,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports view offsets', opts, function test( t ) { var x0; var x1; - var N; var v; x0 = new Float64Array([ @@ -279,9 +273,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 - N = floor(x1.length / 2); - v = dnansum( N, x1, 2 ); + v = dnansum( 5, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.ndarray.js index 361ac6999269..48ca7508619b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/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 dnansum = require( './../lib/ndarray.js' ); @@ -35,7 +34,7 @@ tape( 'main export is a function', function test( t ) { }); tape( 'the function has an arity of 4', function test( t ) { - t.strictEqual( dnansum.length, 4, 'has expected arity' ); + t.strictEqual( dnansum.length, 4, 'returns expected value' ); t.end(); }); @@ -106,7 +105,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 N; var x; var v; @@ -123,15 +121,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dnansum( N, x, 2, 0 ); + v = dnansum( 5, x, 2, 0 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -148,8 +144,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dnansum( N, x, -2, 8 ); + v = dnansum( 5, x, -2, 8 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); @@ -168,7 +163,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', function test( t ) { - var N; var x; var v; @@ -184,9 +178,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = dnansum( N, x, 2, 1 ); + v = dnansum( 5, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.ndarray.native.js index a951545d2fca..b8dfd12b141a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/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' ); @@ -44,7 +43,7 @@ tape( 'main export is a function', opts, function test( t ) { }); tape( 'the function has an arity of 4', opts, function test( t ) { - t.strictEqual( dnansum.length, 4, 'has expected arity' ); + t.strictEqual( dnansum.length, 4, 'returns expected value' ); t.end(); }); @@ -115,7 +114,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 N; var x; var v; @@ -132,15 +130,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dnansum( N, x, 2, 0 ); + v = dnansum( 5, x, 2, 0 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -157,8 +153,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dnansum( N, x, -2, 8 ); + v = dnansum( 5, x, -2, 8 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); @@ -177,7 +172,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', opts, function test( t ) { - var N; var x; var v; @@ -193,9 +187,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = dnansum( N, x, 2, 1 ); + v = dnansum( 5, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); From 684bf641557b63d0e0612f84e8c119e2e7b31048 Mon Sep 17 00:00:00 2001 From: AuenKr Date: Fri, 15 Mar 2024 18:55:21 +0530 Subject: [PATCH 2/4] fix: implement random array generation including NaN using bernoulli --- .../@stdlib/blas/ext/base/dnansum/README.md | 20 ++++++++---------- .../ext/base/dnansum/benchmark/benchmark.js | 20 ++++++++---------- .../dnansum/benchmark/benchmark.native.js | 20 ++++++++---------- .../dnansum/benchmark/benchmark.ndarray.js | 20 ++++++++---------- .../benchmark/benchmark.ndarray.native.js | 20 ++++++++---------- .../blas/ext/base/dnansum/examples/index.js | 21 ++++++++----------- .../blas/ext/base/dnansum/include.gypi | 2 +- .../ext/base/dnansum/lib/ndarray.native.js | 10 ++++----- 8 files changed, 60 insertions(+), 73 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/README.md b/lib/node_modules/@stdlib/blas/ext/base/dnansum/README.md index 07a9678c6125..65d2e16fc993 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/README.md @@ -130,22 +130,20 @@ var v = dnansum.ndarray( 4, x, 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 dnansum = require( '@stdlib/blas/ext/base/dnansum' ); -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 clbk() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( 0, 100 ); } + return NaN; } + +var x = filledarrayBy( 10, 'float64', clbk ); console.log( x ); var v = dnansum( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.js index 53d4f922b671..199830c015c1 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.js @@ -21,10 +21,11 @@ // 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' ); var pkg = require( './../package.json' ).name; var dnansum = require( './../lib/dnansum.js' ); @@ -39,18 +40,15 @@ var dnansum = require( './../lib/dnansum.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float64', clbk ); + return benchmark; - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function clbk() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -20, 10 ); } + return NaN; } - return benchmark; function benchmark( b ) { var v; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.native.js index 04f0fe1e1ba2..706eb1430a9a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/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 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' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -48,18 +49,15 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float64', clbk ); + return benchmark; - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function clbk() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -20, 10 ); } + return NaN; } - return benchmark; function benchmark( b ) { var v; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.js index 90f347619bd4..07b066d89926 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.js @@ -21,10 +21,11 @@ // 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' ); var pkg = require( './../package.json' ).name; var dnansum = require( './../lib/ndarray.js' ); @@ -39,18 +40,15 @@ var dnansum = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float64', clbk ); + return benchmark; - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function clbk() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -20, 10 ); } + return NaN; } - return benchmark; function benchmark( b ) { var v; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.native.js index fd8a1af04a37..9bdc56ae36f2 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/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 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' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -48,18 +49,15 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float64', clbk ); + return benchmark; - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function clbk() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( -20, 10 ); } + return NaN; } - return benchmark; function benchmark( b ) { var v; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/examples/index.js index c933d5744061..246ae3a016e3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/examples/index.js @@ -18,22 +18,19 @@ 'use strict'; -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float64Array = require( '@stdlib/array/float64' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var dnansum = require( './../lib' ); -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 clbk() { + if ( bernoulli( 0.7 ) > 0 ) { + return discreteUniform( 0, 100 ); } + return NaN; } + +var x = filledarrayBy( 10, 'float64', clbk ); console.log( x ); var v = dnansum( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/include.gypi b/lib/node_modules/@stdlib/blas/ext/base/dnansum/include.gypi index 868c5c12e852..26476a8c2655 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/include.gypi +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', ' Date: Fri, 15 Mar 2024 19:28:17 +0530 Subject: [PATCH 3/4] chore: apply suggestions from code review Signed-off-by: Pranav <85227306+Pranavchiku@users.noreply.github.com> --- .../@stdlib/blas/ext/base/dnansum/benchmark/benchmark.js | 2 +- .../@stdlib/blas/ext/base/dnansum/benchmark/benchmark.native.js | 2 +- .../blas/ext/base/dnansum/benchmark/benchmark.ndarray.js | 2 +- .../blas/ext/base/dnansum/benchmark/benchmark.ndarray.native.js | 2 +- .../@stdlib/blas/ext/base/dnansum/lib/ndarray.native.js | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.js index 199830c015c1..0fcbb379f7ee 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.js @@ -45,7 +45,7 @@ function createBenchmark( len ) { function clbk() { if ( bernoulli( 0.7 ) > 0 ) { - return discreteUniform( -20, 10 ); + return discreteUniform( -10, 10 ); } return NaN; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.native.js index 706eb1430a9a..4105b34fb5a7 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.native.js @@ -54,7 +54,7 @@ function createBenchmark( len ) { function clbk() { if ( bernoulli( 0.7 ) > 0 ) { - return discreteUniform( -20, 10 ); + return discreteUniform( -10, 10 ); } return NaN; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.js index 07b066d89926..a9a8301bca10 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.js @@ -45,7 +45,7 @@ function createBenchmark( len ) { function clbk() { if ( bernoulli( 0.7 ) > 0 ) { - return discreteUniform( -20, 10 ); + return discreteUniform( -10, 10 ); } return NaN; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.native.js index 9bdc56ae36f2..4555fee4066a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/benchmark/benchmark.ndarray.native.js @@ -54,7 +54,7 @@ function createBenchmark( len ) { function clbk() { if ( bernoulli( 0.7 ) > 0 ) { - return discreteUniform( -20, 10 ); + return discreteUniform( -10, 10 ); } return NaN; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.native.js index ccd653c1a567..7a814a92317e 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/lib/ndarray.native.js @@ -49,6 +49,7 @@ function dnansum( N, x, stride, offset ) { offset = minViewBufferIndex( N, stride, offset ); view = offsetView( x, offset ); + return addon( N, view, stride ); } From 6a8a821ba09f55d82b7723dbba70cb244f750b9a Mon Sep 17 00:00:00 2001 From: AuenKr Date: Fri, 15 Mar 2024 21:35:57 +0530 Subject: [PATCH 4/4] fix: fixed indentation issue --- .../blas/ext/base/dnansum/manifest.json | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dnansum/manifest.json index c0f2b3ea455f..679b7e92cb96 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansum/manifest.json @@ -1,48 +1,48 @@ { - "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": [ - { + "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": [ + { "task": "build", - "src": [ - "./src/dnansum.c" - ], - "include": [ - "./include" - ], - "libraries": [ - "-lm" - ], - "libpath": [], - "dependencies": [ + "src": [ + "./src/dnansum.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float64array", - "@stdlib/blas/ext/base/dnansumkbn" - ] - }, + "@stdlib/blas/ext/base/dnansumkbn" + ] + }, { "task": "benchmark", "src": [ @@ -71,5 +71,5 @@ "libpath": [], "dependencies": [] } - ] + ] }