From fe697c80168770c10f8329d17205237a50edc7c0 Mon Sep 17 00:00:00 2001 From: alexteslin Date: Fri, 8 Mar 2024 12:30:02 +0100 Subject: [PATCH 01/19] refactor: update blas/ext/base/sdsnansum to follow current project conventions --- .../@stdlib/blas/ext/base/sdsnansum/README.md | 43 +++---- .../ext/base/sdsnansum/benchmark/benchmark.js | 92 +++++++------- .../sdsnansum/benchmark/benchmark.native.js | 20 +-- .../sdsnansum/benchmark/benchmark.ndarray.js | 20 ++- .../benchmark/benchmark.ndarray.native.js | 16 +-- .../blas/ext/base/sdsnansum/docs/repl.txt | 11 +- .../ext/base/sdsnansum/docs/types/index.d.ts | 2 +- .../blas/ext/base/sdsnansum/examples/index.js | 20 +-- .../ext/base/sdsnansum/lib/ndarray.native.js | 11 +- .../blas/ext/base/sdsnansum/manifest.json | 6 +- .../blas/ext/base/sdsnansum/package.json | 4 +- .../blas/ext/base/sdsnansum/src/addon.c | 43 +++++++ .../blas/ext/base/sdsnansum/src/addon.cpp | 117 ------------------ .../blas/ext/base/sdsnansum/test/test.js | 2 +- .../ext/base/sdsnansum/test/test.ndarray.js | 13 +- .../sdsnansum/test/test.ndarray.native.js | 13 +- .../ext/base/sdsnansum/test/test.sdsnansum.js | 13 +- .../sdsnansum/test/test.sdsnansum.native.js | 12 +- 18 files changed, 157 insertions(+), 301 deletions(-) create mode 100644 lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c delete mode 100644 lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.cpp diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md index 6eaaac62ab77..5e9b20c45f29 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md @@ -2,7 +2,7 @@ @license Apache-2.0 -Copyright (c) 2020 The Stdlib Authors. +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. @@ -54,18 +54,16 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Float32Array`][@stdlib/array/float32]. -- **stride**: index increment for `x`. +- **stride**: index increment for the strided array. -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 Float32Array = require( '@stdlib/array/float32' ); -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 N = floor( x.length / 2 ); -var v = sdsnansum( N, x, 2 ); +var v = sdsnansum( 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 Float32Array = require( '@stdlib/array/float32' ); -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 -var N = floor( x0.length / 2 ); - -var v = sdsnansum( N, x1, 2 ); +var v = sdsnansum( 4, x1, 2 ); // returns 5.0 ``` @@ -102,18 +97,16 @@ var v = sdsnansum.ndarray( N, x, 1, 0 ); The function has the following additional parameters: -- **offset**: starting index for `x`. +- **offset**: starting index for the strided array. -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 Float32Array = require( '@stdlib/array/float32' ); -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 N = floor( x.length / 2 ); -var v = sdsnansum.ndarray( N, x, 2, 1 ); +var v = sdsnansum.ndarray( 4, x, 2, 1 ); // returns 5.0 ``` @@ -139,22 +132,14 @@ var v = sdsnansum.ndarray( N, x, 2, 1 ); ```javascript -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' ).factory; +var filledarrayBy = require( '@stdlib/array/filled-by' ); var sdsnansum = require( '@stdlib/blas/ext/base/sdsnansum' ); -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 ); - } -} + +var rand = discreteUniform( 0, 100 ); +var i = filledarrayBy( len, 'float32', rand ); +var x = i.map(el => discreteUniform( 0.0, 1.0 ) < 0.2 ? el : NaN) console.log( x ); var v = sdsnansum( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js index df1959714c02..e1042b5a2b26 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2020 The Stdlib Authors. +* 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. @@ -21,14 +21,19 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ).factory; +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 pkg = require( './../package.json' ).name; var sdsnansum = require( './../lib/sdsnansum.js' ); +// VARIABLES // + +var rand = uniform( -20.0, -10.0 ); + + // FUNCTIONS // /** @@ -39,37 +44,28 @@ var sdsnansum = require( './../lib/sdsnansum.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; - } - } - return benchmark; - - function benchmark( b ) { - var v; - var i; - - b.tic(); - for ( i = 0; i < b.iterations; i++ ) { - v = sdsnansum( x.length, x, 1 ); - if ( isnan( v ) ) { - b.fail( 'should not return NaN' ); - } - } - b.toc(); - if ( isnan( v ) ) { - b.fail( 'should not return NaN' ); - } - b.pass( 'benchmark finished' ); - b.end(); - } + var i = filledarrayBy( len, 'float32', rand ); + var x = i.map(el => uniform( 0.0, 1.0 ) < 0.2 ? el : NaN) + return benchmark; + + function benchmark( b ) { + var v; + var i; + + b.tic(); + for ( i = 0; i < b.iterations; i++ ) { + v = sdsnansum( x.length, x, 1 ); + if ( isnan( v ) ) { + b.fail( 'should not return NaN' ); + } + } + b.toc(); + if ( isnan( v ) ) { + b.fail( 'should not return NaN' ); + } + b.pass( 'benchmark finished' ); + b.end(); + } } @@ -81,20 +77,20 @@ function createBenchmark( len ) { * @private */ function main() { - var len; - var min; - var max; - var f; - var i; - - min = 1; // 10^min - max = 6; // 10^max - - for ( i = min; i <= max; i++ ) { - len = pow( 10, i ); - f = createBenchmark( len ); - bench( pkg+':len='+len, f ); - } + var len; + var min; + var max; + var f; + var i; + + min = 1; // 10^min + max = 6; // 10^max + + for ( i = min; i <= max; i++ ) { + len = pow( 10, i ); + f = createBenchmark( len ); + bench( pkg+':len='+len, f ); + } } main(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js index f79c9ad6504a..df5639cde3f6 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2020 The Stdlib Authors. +* 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. @@ -22,10 +22,10 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ).factory; +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 tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -36,6 +36,7 @@ var sdsnansum = tryRequire( resolve( __dirname, './../lib/sdsnansum.native.js' ) var opts = { 'skip': ( sdsnansum instanceof Error ) }; +var rand = uniform( -20.0, -10.0 ); // FUNCTIONS // @@ -48,17 +49,8 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; - } - } + var i = filledarrayBy( len, 'float32', rand ); + var x = i.map(el => uniform( 0.0, 1.0 ) < 0.2 ? el : NaN) return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js index 1d78e126e725..ec13db361020 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2020 The Stdlib Authors. +* 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. @@ -29,6 +29,11 @@ var pkg = require( './../package.json' ).name; var sdsnansum = require( './../lib/ndarray.js' ); +// VARIABLES // + +var rand = uniform( -20.0, -10.0 ); + + // FUNCTIONS // /** @@ -39,17 +44,8 @@ var sdsnansum = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; - } - } + var i = filledarrayBy( len, 'float32', rand ); + var x = i.map(el => uniform( 0.0, 1.0 ) < 0.2 ? el : NaN) return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js index 4a43263d50d7..0aa45c902fd8 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2020 The Stdlib Authors. +* 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. @@ -36,6 +36,7 @@ var sdsnansum = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ) var opts = { 'skip': ( sdsnansum instanceof Error ) }; +var rand = uniform( -20.0, -10.0 ); // FUNCTIONS // @@ -48,17 +49,8 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; - } - } + var i = filledarrayBy( len, 'float32', rand ); + var x = i.map(el => uniform( 0.0, 1.0 ) < 0.2 ? el : NaN) return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt index f569b88ed579..ab3a7d18b240 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt @@ -3,7 +3,7 @@ Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using extended accumulation. - The `N` and `stride` parameters determine which elements in `x` are accessed + 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 @@ -36,17 +36,15 @@ // 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 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); > var stride = 2; - > {{alias}}( N, x, stride ) + > {{alias}}( 4, x, stride ) 1.0 // Using view offsets: > var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] ); > var x1 = new {{alias:@stdlib/array/float32}}( 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, stride ) -1.0 {{alias}}.ndarray( N, x, stride, offset ) @@ -86,8 +84,7 @@ // 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 ); - > {{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/sdsnansum/docs/types/index.d.ts b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/types/index.d.ts index 645a4bcb306d..786c701f2e3c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/types/index.d.ts @@ -1,7 +1,7 @@ /* * @license Apache-2.0 * -* Copyright (c) 2020 The Stdlib Authors. +* 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. diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js index 908f830202a2..b03fb2c2e947 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2020 The Stdlib Authors. +* 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. @@ -18,22 +18,14 @@ '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' ).factory; +var filledarrayBy = require( '@stdlib/array/filled-by' ); var sdsnansum = require( './../lib' ); -var x; -var i; +var rand = discreteUniform( 0, 100 ); +var i = filledarrayBy( len, 'float32', rand ); +var x = i.map(el => discreteUniform( 0.0, 1.0 ) < 0.2 ? el : NaN) -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 ); - } -} console.log( x ); var v = sdsnansum( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js index 750a93a3dd09..621c9bb96841 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js @@ -20,7 +20,8 @@ // MODULES // -var Float32Array = require( '@stdlib/array/float32' ); +var minViewBufferIndex = require( '@stdlib/strided/base/min-view-buffer-index' ); +var offsetView = require( '@stdlib/strided/base/offset-view' ); var addon = require( './sdsnansum.native.js' ); @@ -47,10 +48,10 @@ var addon = require( './sdsnansum.native.js' ); */ function sdsnansum( N, x, stride, offset ) { var view; - if ( stride < 0 ) { - offset += (N-1) * stride; - } - view = new Float32Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offset), x.length-offset ); // eslint-disable-line max-len + + offset = minViewBufferIndex( N, stride, offset ); + view = offsetView( x, offset ); + return addon( N, view, stride ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json index 4c76a7fa5512..751fb8b99c65 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json @@ -35,7 +35,11 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/ext/base/sdsnansumpw" + "@stdlib/blas/ext/base/sdsnansumpw", + "@stdlib/napi/export", + "@stdlib/napi/argv", + "@stdlib/napi/argv-int64", + "@stdlib/napi/argv-strided-float32array" ] } ] diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/package.json b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/package.json index 9cabd29234f6..79596d9b1773 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/package.json +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/package.json @@ -73,5 +73,7 @@ "float", "float32array" ], - "__stdlib__": {} + "__stdlib__": { + "wasm": false + } } diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c new file mode 100644 index 000000000000..f53b343a77cc --- /dev/null +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c @@ -0,0 +1,43 @@ +/** +* @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/sdsnansum.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 + +/** +* 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_FLOAT32ARRAY( env, X, N, stride, argv, 1 ); + c_sdsnansum( N, X, stride ); + return NULL; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.cpp b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.cpp deleted file mode 100644 index 38fbc24d94cb..000000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/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/sdsnansum.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_blas_ext_base_sdsnansum { - - /** - * Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using extended accumulation. - * - * ## Notes - * - * - When called from JavaScript, the function expects three arguments: - * - * - `N`: number of indexed elements - * - `X`: input array - * - `stride`: stride length - */ - napi_value node_sdsnansum( 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 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; - } - - 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_float32_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float32Array." ); - 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, (double)stdlib_strided_sdsnansum( N, (float *)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_sdsnansum, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_blas_ext_base_sdsnansum diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.js index 271b19124ab1..79f036d7d099 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2020 The Stdlib Authors. +* 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. diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.ndarray.js index 60081afec16f..57e2c434459b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/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 sdsnansum = require( './../lib/ndarray.js' ); @@ -125,7 +124,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; @@ -142,15 +140,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = sdsnansum( N, x, 2, 0 ); + v = sdsnansum( 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; var i; @@ -168,8 +164,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = sdsnansum( N, x, -2, 8 ); + v = sdsnansum( 5, x, -2, 8 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -196,7 +191,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; @@ -212,9 +206,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = sdsnansum( N, x, 2, 1 ); + v = sdsnansum( 5, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.ndarray.native.js index 5d26671501dd..525be0756be5 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/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 tryRequire = require( '@stdlib/utils/try-require' ); @@ -134,7 +133,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; @@ -151,15 +149,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = sdsnansum( N, x, 2, 0 ); + v = sdsnansum( 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; var i; @@ -177,8 +173,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = sdsnansum( N, x, -2, 8 ); + v = sdsnansum( 5, x, -2, 8 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -205,7 +200,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; @@ -221,9 +215,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = sdsnansum( N, x, 2, 1 ); + v = sdsnansum( 5, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.js index a0c80602e676..21230435bc4d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.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 sdsnansum = require( './../lib/sdsnansum.js' ); @@ -125,7 +124,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; @@ -142,15 +140,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = sdsnansum( N, x, 2 ); + v = sdsnansum( 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; var i; @@ -168,8 +164,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = sdsnansum( N, x, -2 ); + v = sdsnansum( 5, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -198,7 +193,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 Float32Array([ @@ -216,9 +210,8 @@ tape( 'the function supports view offsets', function test( t ) { ]); x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = sdsnansum( N, x1, 2 ); + v = sdsnansum( 5, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.native.js index d6dbf2e8344f..dfdd475c9ead 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.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 tryRequire = require( '@stdlib/utils/try-require' ); @@ -233,15 +232,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = sdsnansum( N, x, 2 ); + v = sdsnansum( 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; var i; @@ -259,8 +256,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = sdsnansum( N, x, -2 ); + v = sdsnansum( 5, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -289,7 +285,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 Float32Array([ @@ -307,9 +302,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 - N = floor(x1.length / 2); - v = sdsnansum( N, x1, 2 ); + v = sdsnansum( 5, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); From 682b3c62b59d794e71f8c3ff89958d19de54130f Mon Sep 17 00:00:00 2001 From: alexteslin Date: Thu, 14 Mar 2024 12:20:54 +0100 Subject: [PATCH 02/19] change rand to function, change identation to tab --- .../@stdlib/blas/ext/base/sdsnansum/README.md | 13 ++- .../ext/base/sdsnansum/benchmark/benchmark.js | 84 ++++++++++--------- .../sdsnansum/benchmark/benchmark.native.js | 12 ++- .../sdsnansum/benchmark/benchmark.ndarray.js | 20 +++-- .../benchmark/benchmark.ndarray.native.js | 16 ++-- 5 files changed, 83 insertions(+), 62 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md index 5e9b20c45f29..2b4624cabdb1 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md @@ -136,10 +136,15 @@ var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; var filledarrayBy = require( '@stdlib/array/filled-by' ); var sdsnansum = require( '@stdlib/blas/ext/base/sdsnansum' ); - -var rand = discreteUniform( 0, 100 ); -var i = filledarrayBy( len, 'float32', rand ); -var x = i.map(el => discreteUniform( 0.0, 1.0 ) < 0.2 ? el : NaN) +function randOrNan( ) { + if ( discreteUniform( 0.0, 1.0 ) < 0.2 ) { + return NaN + } else { + return discreteUniform( 0, 100 ) + } +} + +var x = filledarrayBy( 10, 'float32', randOrNan ); console.log( x ); var v = sdsnansum( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js index e1042b5a2b26..d9cecb384433 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js @@ -29,13 +29,16 @@ var pkg = require( './../package.json' ).name; var sdsnansum = require( './../lib/sdsnansum.js' ); -// VARIABLES // - -var rand = uniform( -20.0, -10.0 ); - - // FUNCTIONS // +function randOrNan( ) { + if ( uniform( 0.0, 1.0 ) < 0.2 ) { + return NaN + } else { + return uniform( -20.0, -10.0 ) + } +} + /** * Creates a benchmark function. * @@ -44,28 +47,27 @@ var rand = uniform( -20.0, -10.0 ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var i = filledarrayBy( len, 'float32', rand ); - var x = i.map(el => uniform( 0.0, 1.0 ) < 0.2 ? el : NaN) - return benchmark; - - function benchmark( b ) { - var v; - var i; - - b.tic(); - for ( i = 0; i < b.iterations; i++ ) { - v = sdsnansum( x.length, x, 1 ); - if ( isnan( v ) ) { - b.fail( 'should not return NaN' ); - } - } - b.toc(); - if ( isnan( v ) ) { - b.fail( 'should not return NaN' ); - } - b.pass( 'benchmark finished' ); - b.end(); - } + var x = filledarrayBy( len, 'float32', randOrNan ); + return benchmark; + + function benchmark( b ) { + var v; + var i; + + b.tic(); + for ( i = 0; i < b.iterations; i++ ) { + v = sdsnansum( x.length, x, 1 ); + if ( isnan( v ) ) { + b.fail( 'should not return NaN' ); + } + } + b.toc(); + if ( isnan( v ) ) { + b.fail( 'should not return NaN' ); + } + b.pass( 'benchmark finished' ); + b.end(); + } } @@ -77,20 +79,20 @@ function createBenchmark( len ) { * @private */ function main() { - var len; - var min; - var max; - var f; - var i; - - min = 1; // 10^min - max = 6; // 10^max - - for ( i = min; i <= max; i++ ) { - len = pow( 10, i ); - f = createBenchmark( len ); - bench( pkg+':len='+len, f ); - } + var len; + var min; + var max; + var f; + var i; + + min = 1; // 10^min + max = 6; // 10^max + + for ( i = min; i <= max; i++ ) { + len = pow( 10, i ); + f = createBenchmark( len ); + bench( pkg+':len='+len, f ); + } } main(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js index df5639cde3f6..9db182356b41 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js @@ -36,11 +36,18 @@ var sdsnansum = tryRequire( resolve( __dirname, './../lib/sdsnansum.native.js' ) var opts = { 'skip': ( sdsnansum instanceof Error ) }; -var rand = uniform( -20.0, -10.0 ); // FUNCTIONS // +function randOrNan( ) { + if ( uniform( 0.0, 1.0 ) < 0.2 ) { + return NaN + } else { + return uniform( -20.0, -10.0 ) + } +} + /** * Creates a benchmark function. * @@ -49,8 +56,7 @@ var rand = uniform( -20.0, -10.0 ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var i = filledarrayBy( len, 'float32', rand ); - var x = i.map(el => uniform( 0.0, 1.0 ) < 0.2 ? el : NaN) + var x = filledarrayBy( len, 'float32', randOrNan ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js index ec13db361020..c8ed0e3c6212 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js @@ -21,21 +21,24 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ).factory; +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 pkg = require( './../package.json' ).name; var sdsnansum = require( './../lib/ndarray.js' ); -// VARIABLES // - -var rand = uniform( -20.0, -10.0 ); - - // FUNCTIONS // +function randOrNan( ) { + if ( uniform( 0.0, 1.0 ) < 0.2 ) { + return NaN + } else { + return uniform( -20.0, -10.0 ) + } +} + /** * Creates a benchmark function. * @@ -44,8 +47,7 @@ var rand = uniform( -20.0, -10.0 ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var i = filledarrayBy( len, 'float32', rand ); - var x = i.map(el => uniform( 0.0, 1.0 ) < 0.2 ? el : NaN) + var x = filledarrayBy( len, 'float32', randOrNan ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js index 0aa45c902fd8..ee3b16387fd0 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js @@ -22,10 +22,10 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ).factory; +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 tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -36,11 +36,18 @@ var sdsnansum = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ) var opts = { 'skip': ( sdsnansum instanceof Error ) }; -var rand = uniform( -20.0, -10.0 ); // FUNCTIONS // +function randOrNan( ) { + if ( uniform( 0.0, 1.0 ) < 0.2 ) { + return NaN + } else { + return uniform( -20.0, -10.0 ) + } +} + /** * Creates a benchmark function. * @@ -49,8 +56,7 @@ var rand = uniform( -20.0, -10.0 ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var i = filledarrayBy( len, 'float32', rand ); - var x = i.map(el => uniform( 0.0, 1.0 ) < 0.2 ? el : NaN) + var x = filledarrayBy( len, 'float32', randOrNan ); return benchmark; function benchmark( b ) { From 6d031a43a3fe3ffa0fc463887ea0dc526fcb3125 Mon Sep 17 00:00:00 2001 From: alexteslin Date: Thu, 14 Mar 2024 12:23:26 +0100 Subject: [PATCH 03/19] fix: change space to TAB --- .../blas/ext/base/sdsnansum/benchmark/benchmark.native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js index 9db182356b41..be378794b956 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js @@ -56,7 +56,7 @@ function randOrNan( ) { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x = filledarrayBy( len, 'float32', randOrNan ); + var x = filledarrayBy( len, 'float32', randOrNan ); return benchmark; function benchmark( b ) { From a434fa99b4536c8650acb68b3fc9d936a4374979 Mon Sep 17 00:00:00 2001 From: alexteslin Date: Mon, 1 Apr 2024 12:43:52 +0200 Subject: [PATCH 04/19] fixup! fix: change space to TAB --- .../@stdlib/blas/ext/base/sdsnansum/README.md | 9 ++++----- .../blas/ext/base/sdsnansum/benchmark/benchmark.js | 7 +++---- .../ext/base/sdsnansum/benchmark/benchmark.native.js | 7 +++---- .../ext/base/sdsnansum/benchmark/benchmark.ndarray.js | 7 +++---- .../sdsnansum/benchmark/benchmark.ndarray.native.js | 7 +++---- .../@stdlib/blas/ext/base/sdsnansum/docs/repl.txt | 9 ++++++--- .../@stdlib/blas/ext/base/sdsnansum/examples/index.js | 10 +++++++--- .../ext/base/sdsnansum/test/test.sdsnansum.native.js | 1 - 8 files changed, 29 insertions(+), 28 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md index 2b4624cabdb1..132fb7f6e7d9 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md @@ -137,11 +137,10 @@ var filledarrayBy = require( '@stdlib/array/filled-by' ); var sdsnansum = require( '@stdlib/blas/ext/base/sdsnansum' ); function randOrNan( ) { - if ( discreteUniform( 0.0, 1.0 ) < 0.2 ) { - return NaN - } else { - return discreteUniform( 0, 100 ) - } + if ( discreteUniform( 0.0, 1.0 ) < 0.2 ) { + return NaN; + } + return discreteUniform( 0, 100 ); } var x = filledarrayBy( 10, 'float32', randOrNan ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js index d9cecb384433..cac6f4ec22d1 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js @@ -32,11 +32,10 @@ var sdsnansum = require( './../lib/sdsnansum.js' ); // FUNCTIONS // function randOrNan( ) { - if ( uniform( 0.0, 1.0 ) < 0.2 ) { - return NaN - } else { - return uniform( -20.0, -10.0 ) + if ( uniform( 0.0, 1.0 ) < 0.2 ) { + return NaN; } + return uniform( -20.0, -10.0 ); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js index be378794b956..f362947dd500 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js @@ -41,11 +41,10 @@ var opts = { // FUNCTIONS // function randOrNan( ) { - if ( uniform( 0.0, 1.0 ) < 0.2 ) { - return NaN - } else { - return uniform( -20.0, -10.0 ) + if ( uniform( 0.0, 1.0 ) < 0.2 ) { + return NaN; } + return uniform( -20.0, -10.0 ); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js index c8ed0e3c6212..1c15871b5d5d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js @@ -32,11 +32,10 @@ var sdsnansum = require( './../lib/ndarray.js' ); // FUNCTIONS // function randOrNan( ) { - if ( uniform( 0.0, 1.0 ) < 0.2 ) { - return NaN - } else { - return uniform( -20.0, -10.0 ) + if ( uniform( 0.0, 1.0 ) < 0.2 ) { + return NaN; } + return uniform( -20.0, -10.0 ); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js index ee3b16387fd0..b4a60a7a7982 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js @@ -41,11 +41,10 @@ var opts = { // FUNCTIONS // function randOrNan( ) { - if ( uniform( 0.0, 1.0 ) < 0.2 ) { - return NaN - } else { - return uniform( -20.0, -10.0 ) + if ( uniform( 0.0, 1.0 ) < 0.2 ) { + return NaN; } + return uniform( -20.0, -10.0 ); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt index ab3a7d18b240..6354eaafdab0 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt @@ -1,9 +1,11 @@ {{alias}}( N, x, stride ) - Computes the sum of single-precision floating-point strided array elements, - ignoring `NaN` values and using extended accumulation. + Computes the sum of single-precision + floating-point strided array elements, + ignore `NaN` values and using extended accumulation. - The `N` and `stride` parameters determine which elements in the strided array are accessed + 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 @@ -47,6 +49,7 @@ > {{alias}}( 4, x1, stride ) -1.0 + {{alias}}.ndarray( N, x, stride, offset ) Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using extended accumulation and alternative diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js index b03fb2c2e947..e29957e6618c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js @@ -22,9 +22,13 @@ var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; var filledarrayBy = require( '@stdlib/array/filled-by' ); var sdsnansum = require( './../lib' ); -var rand = discreteUniform( 0, 100 ); -var i = filledarrayBy( len, 'float32', rand ); -var x = i.map(el => discreteUniform( 0.0, 1.0 ) < 0.2 ? el : NaN) +function randOrNan( ) { + if ( discreteUniform( 0.0, 1.0 ) < 0.2 ) { + return NaN; + } + return discreteUniform( 0, 100 ); +} +var x = filledarrayBy( 10, 'float32', randOrNan ); console.log( x ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.native.js index dfdd475c9ead..ab9d65d948ee 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.sdsnansum.native.js @@ -215,7 +215,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; From 963d46bd42b12d0c70a2738635c610242d848708 Mon Sep 17 00:00:00 2001 From: alexteslin Date: Sat, 6 Apr 2024 16:40:48 +0200 Subject: [PATCH 05/19] fixup! fixup! fix: change space to TAB --- .../@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js | 1 - lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js index 621c9bb96841..e650c6d3f3d6 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js @@ -48,7 +48,6 @@ var addon = require( './sdsnansum.native.js' ); */ function sdsnansum( N, x, stride, offset ) { var view; - offset = minViewBufferIndex( N, stride, offset ); view = offsetView( x, offset ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c index f53b343a77cc..b64b294d5781 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c @@ -36,7 +36,7 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 ); STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 1 ); - c_sdsnansum( N, X, stride ); + stdlib_strided_sdsnansum( N, X, stride ); return NULL; } From 9909f219942a7688ebbe6462328dd6ca33a31057 Mon Sep 17 00:00:00 2001 From: alexteslin Date: Sat, 6 Apr 2024 19:14:39 +0200 Subject: [PATCH 06/19] fixup! fixup! fixup! fix: change space to TAB --- .../@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js | 6 ++++-- .../blas/ext/base/sdsnansum/benchmark/benchmark.native.js | 6 ++++-- .../blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js | 6 ++++-- .../base/sdsnansum/benchmark/benchmark.ndarray.native.js | 6 ++++-- .../@stdlib/blas/ext/base/sdsnansum/examples/index.js | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js index cac6f4ec22d1..3aa0a70e86b0 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js @@ -32,10 +32,12 @@ var sdsnansum = require( './../lib/sdsnansum.js' ); // FUNCTIONS // function randOrNan( ) { - if ( uniform( 0.0, 1.0 ) < 0.2 ) { + var randReslut = uniform( -20.0, -10.0 ); + var rand1 = uniform( 0.0, 1.0 ); + if ( rand1() < 0.2 ) { return NaN; } - return uniform( -20.0, -10.0 ); + return randReslut(); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js index f362947dd500..5a02c40e71c8 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js @@ -41,10 +41,12 @@ var opts = { // FUNCTIONS // function randOrNan( ) { - if ( uniform( 0.0, 1.0 ) < 0.2 ) { + var randReslut = uniform( -20.0, -10.0 ); + var rand1 = uniform( 0.0, 1.0 ); + if ( rand1() < 0.2 ) { return NaN; } - return uniform( -20.0, -10.0 ); + return randReslut(); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js index 1c15871b5d5d..defad9338c84 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js @@ -32,10 +32,12 @@ var sdsnansum = require( './../lib/ndarray.js' ); // FUNCTIONS // function randOrNan( ) { - if ( uniform( 0.0, 1.0 ) < 0.2 ) { + var randReslut = uniform( -20.0, -10.0 ); + var rand1 = uniform( 0.0, 1.0 ); + if ( rand1() < 0.2 ) { return NaN; } - return uniform( -20.0, -10.0 ); + return randReslut(); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js index b4a60a7a7982..1b9274a44fbf 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js @@ -41,10 +41,12 @@ var opts = { // FUNCTIONS // function randOrNan( ) { - if ( uniform( 0.0, 1.0 ) < 0.2 ) { + var randReslut = uniform( -20.0, -10.0 ); + var rand1 = uniform( 0.0, 1.0 ); + if ( rand1() < 0.2 ) { return NaN; } - return uniform( -20.0, -10.0 ); + return randReslut(); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js index e29957e6618c..e1914714799b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js @@ -23,10 +23,12 @@ var filledarrayBy = require( '@stdlib/array/filled-by' ); var sdsnansum = require( './../lib' ); function randOrNan( ) { - if ( discreteUniform( 0.0, 1.0 ) < 0.2 ) { + var rand10 = discreteUniform( 0, 10 ); + var rand100 = discreteUniform( 0, 100 ); + if ( rand10() < 2 ) { return NaN; } - return discreteUniform( 0, 100 ); + return rand100(); } var x = filledarrayBy( 10, 'float32', randOrNan ); From 7ce0e62762787c7f9f30b853e273913d570ee381 Mon Sep 17 00:00:00 2001 From: alexteslin Date: Sat, 6 Apr 2024 20:02:55 +0200 Subject: [PATCH 07/19] refactor: change from cpp to c in include.gypi --- lib/node_modules/@stdlib/blas/ext/base/sdsnansum/include.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/include.gypi b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/include.gypi index 868c5c12e852..26476a8c2655 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/include.gypi +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', ' Date: Sat, 6 Apr 2024 20:20:05 +0200 Subject: [PATCH 08/19] refactor: addon.c to follow current convention --- .../@stdlib/blas/ext/base/sdsnansum/src/addon.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c index b64b294d5781..0b3668fa0b2e 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c @@ -22,6 +22,7 @@ #include "stdlib/napi/argv_int64.h" #include "stdlib/napi/argv_strided_float32array.h" #include +#include /** * Receives JavaScript callback invocation data. @@ -36,8 +37,12 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 ); STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 1 ); - stdlib_strided_sdsnansum( N, X, stride ); - return NULL; + + napi_value v; + napi_status status = napi_create_double( env, stdlib_strided_sdsnansum( N, X, stride ), &v ); + assert( status == napi_ok ); + + return v; } STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) From 02816a4e5965f011b18d4ea76a707923c558c94c Mon Sep 17 00:00:00 2001 From: alexteslin Date: Sat, 6 Apr 2024 20:44:47 +0200 Subject: [PATCH 09/19] refactor: change manifiest to follow addon.c --- .../blas/ext/base/sdsnansum/manifest.json | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json index 751fb8b99c65..e42404c3fe7a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json @@ -1,5 +1,7 @@ { - "options": {}, + "options": { + "task": "build" + }, "fields": [ { "field": "src", @@ -41,6 +43,33 @@ "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array" ] - } + }, { + "task": "benchmark", + "src": [ + "./src/sdsnansum.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [] + }, + { + "task": "examples", + "src": [ + "./src/sdsnansum.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [] + } ] } From 7987f358e660eba7147ae7d2b66a314bf4added0 Mon Sep 17 00:00:00 2001 From: alexteslin Date: Sat, 6 Apr 2024 20:55:46 +0200 Subject: [PATCH 10/19] fix: change identation in manifest --- .../blas/ext/base/sdsnansum/manifest.json | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json index e42404c3fe7a..b53aeb13ed3a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json @@ -1,49 +1,49 @@ { - "options": { + "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": [ - { - "src": [ - "./src/sdsnansum.c" - ], - "include": [ - "./include" - ], - "libraries": [ - "-lm" - ], - "libpath": [], - "dependencies": [ - "@stdlib/blas/ext/base/sdsnansumpw", + "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/sdsnansum.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ + "@stdlib/blas/ext/base/sdsnansumpw", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array" - ] - }, { + ] + }, { "task": "benchmark", "src": [ "./src/sdsnansum.c" @@ -71,5 +71,5 @@ "libpath": [], "dependencies": [] } - ] + ] } From 52b5f462b3487e5b907fc842505c9d96f73b4c45 Mon Sep 17 00:00:00 2001 From: alexteslin Date: Sat, 6 Apr 2024 22:34:02 +0200 Subject: [PATCH 11/19] refactor: readme to reflect example.js --- .../@stdlib/blas/ext/base/sdsnansum/README.md | 9 +++++---- .../@stdlib/blas/ext/base/sdsnansum/examples/index.js | 2 +- .../@stdlib/blas/ext/base/sdsnansum/lib/index.js | 4 +--- .../@stdlib/blas/ext/base/sdsnansum/lib/ndarray.js | 4 +--- .../blas/ext/base/sdsnansum/lib/ndarray.native.js | 4 +--- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md index 132fb7f6e7d9..1bbc0540f9bb 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md @@ -44,9 +44,8 @@ Computes the sum of single-precision floating-point strided array elements, igno var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var N = x.length; -var v = sdsnansum( N, x, 1 ); +var v = sdsnansum( 4, x, 1 ); // returns 1.0 ``` @@ -137,10 +136,12 @@ var filledarrayBy = require( '@stdlib/array/filled-by' ); var sdsnansum = require( '@stdlib/blas/ext/base/sdsnansum' ); function randOrNan( ) { - if ( discreteUniform( 0.0, 1.0 ) < 0.2 ) { + var rand100 = discreteUniform( 0, 100 ); + var rand10 = discreteUniform( 0, 10 ); + if ( rand10() < 2 ) { return NaN; } - return discreteUniform( 0, 100 ); + return rand100(); } var x = filledarrayBy( 10, 'float32', randOrNan ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js index e1914714799b..46496b587845 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js @@ -23,8 +23,8 @@ var filledarrayBy = require( '@stdlib/array/filled-by' ); var sdsnansum = require( './../lib' ); function randOrNan( ) { - var rand10 = discreteUniform( 0, 10 ); var rand100 = discreteUniform( 0, 100 ); + var rand10 = discreteUniform( 0, 10 ); if ( rand10() < 2 ) { return NaN; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/index.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/index.js index 5612cb8e3eeb..fa822a9988de 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/index.js @@ -35,13 +35,11 @@ * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * var sdsnansum = require( '@stdlib/blas/ext/base/sdsnansum' ); * * var x = new Float32Array( [ 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 = sdsnansum.ndarray( N, x, 2, 1 ); +* var v = sdsnansum.ndarray( 5, x, 2, 1 ); * // returns 5.0 */ diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.js index ed41883a6b7e..10d6a1ffa741 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.js @@ -36,12 +36,10 @@ var sdsnansumpw = require( '@stdlib/blas/ext/base/sdsnansumpw' ).ndarray; * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* 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 N = floor( x.length / 2 ); * -* var v = sdsnansum( N, x, 2, 1 ); +* var v = sdsnansum( 5, x, 2, 1 ); * // returns 5.0 */ function sdsnansum( N, x, stride, offset ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js index e650c6d3f3d6..9fa8b7e91204 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/lib/ndarray.native.js @@ -38,12 +38,10 @@ var addon = require( './sdsnansum.native.js' ); * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* 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 N = floor( x.length / 2 ); * -* var v = sdsnansum( N, x, 2, 1 ); +* var v = sdsnansum( 5, x, 2, 1 ); * // returns 5.0 */ function sdsnansum( N, x, stride, offset ) { From 025928dce87d765bdd0abfc3fbe3348142d5f531 Mon Sep 17 00:00:00 2001 From: alexteslin Date: Sun, 7 Apr 2024 07:48:27 +0200 Subject: [PATCH 12/19] fix: manifest.json --- .../@stdlib/blas/ext/base/sdsnansum/manifest.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json index b53aeb13ed3a..a07c03511246 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json @@ -26,6 +26,7 @@ ], "confs": [ { + "task": "build", "src": [ "./src/sdsnansum.c" ], @@ -55,7 +56,8 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/ext/base/sdsnansumpw"] }, { "task": "examples", @@ -69,7 +71,9 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/ext/base/sdsnansumpw" + ] } ] } From f08a03605b6dc91288812e3b7bd097b68d4c3226 Mon Sep 17 00:00:00 2001 From: Athan Date: Sat, 6 Apr 2024 22:58:01 -0700 Subject: [PATCH 13/19] Apply suggestions from code review Signed-off-by: Athan --- .../@stdlib/blas/ext/base/sdsnansum/manifest.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json index a07c03511246..b973b809e1e3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/manifest.json @@ -44,7 +44,8 @@ "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array" ] - }, { + }, + { "task": "benchmark", "src": [ "./src/sdsnansum.c" @@ -57,7 +58,8 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/ext/base/sdsnansumpw"] + "@stdlib/blas/ext/base/sdsnansumpw" + ] }, { "task": "examples", From 04dac334364f9fffc5819970cccc36677cffed37 Mon Sep 17 00:00:00 2001 From: Athan Date: Sat, 6 Apr 2024 23:00:31 -0700 Subject: [PATCH 14/19] Apply suggestions from code review Signed-off-by: Athan --- .../@stdlib/blas/ext/base/sdsnansum/docs/types/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/types/index.d.ts b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/types/index.d.ts index 786c701f2e3c..645a4bcb306d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/types/index.d.ts @@ -1,7 +1,7 @@ /* * @license Apache-2.0 * -* Copyright (c) 2024 The Stdlib Authors. +* 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. From 945f5bd10029d6ce5802d7a1ff537544b2ce36fe Mon Sep 17 00:00:00 2001 From: Athan Date: Sat, 6 Apr 2024 23:02:40 -0700 Subject: [PATCH 15/19] Apply suggestions from code review Signed-off-by: Athan --- lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c index 0b3668fa0b2e..e414b7dbb25c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/src/addon.c @@ -39,7 +39,7 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 1 ); napi_value v; - napi_status status = napi_create_double( env, stdlib_strided_sdsnansum( N, X, stride ), &v ); + napi_status status = napi_create_double( env, (double)stdlib_strided_sdsnansum( N, X, stride ), &v ); assert( status == napi_ok ); return v; From 5fbc9e2e8ea4506de67385f37b3769229c2f8447 Mon Sep 17 00:00:00 2001 From: Athan Date: Sat, 6 Apr 2024 23:03:20 -0700 Subject: [PATCH 16/19] Apply suggestions from code review Signed-off-by: Athan --- lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.js index 79f036d7d099..271b19124ab1 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/test/test.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2024 The Stdlib Authors. +* 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. From 678d4bd1f8cda5b0ac8c8644a2e209d893269b82 Mon Sep 17 00:00:00 2001 From: Athan Date: Sat, 6 Apr 2024 23:05:59 -0700 Subject: [PATCH 17/19] Apply suggestions from code review Signed-off-by: Athan --- lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt index 6354eaafdab0..3f179f2d7c17 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt @@ -86,7 +86,7 @@ 1.0 // Using offset parameter: - > var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] ); + > x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] ); > {{alias}}.ndarray( 4, x, 2, 1 ) -1.0 From 9d2ef4fe0fba8bfc199bc411d28f5652009bdecd Mon Sep 17 00:00:00 2001 From: alexteslin Date: Sun, 7 Apr 2024 08:35:12 +0200 Subject: [PATCH 18/19] fix: change the repl to follow 80 char rule --- .../@stdlib/blas/ext/base/sdsnansum/docs/repl.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt index 3f179f2d7c17..2a035ced8f64 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/docs/repl.txt @@ -1,8 +1,7 @@ {{alias}}( N, x, stride ) - Computes the sum of single-precision - floating-point strided array elements, - ignore `NaN` values and using extended accumulation. + Computes the sum of single-precision floating-point strided array + elements, ignore `NaN` values and using extended accumulation. The `N` and `stride` parameters determine which elements in the strided array are accessed From 4c892e08106b3d0cb3ac4d3f252e66c5a9983018 Mon Sep 17 00:00:00 2001 From: Philipp Burckhardt Date: Sun, 14 Apr 2024 08:41:38 -0400 Subject: [PATCH 19/19] chore: leave copyright year and change random number generation --- .../@stdlib/blas/ext/base/sdsnansum/README.md | 11 +++++------ .../ext/base/sdsnansum/benchmark/benchmark.js | 13 ++++++------- .../base/sdsnansum/benchmark/benchmark.native.js | 13 ++++++------- .../base/sdsnansum/benchmark/benchmark.ndarray.js | 13 ++++++------- .../benchmark/benchmark.ndarray.native.js | 13 ++++++------- .../blas/ext/base/sdsnansum/examples/index.js | 15 +++++++-------- 6 files changed, 36 insertions(+), 42 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md index 1bbc0540f9bb..e7143da00c09 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/README.md @@ -131,17 +131,16 @@ var v = sdsnansum.ndarray( 4, x, 2, 1 ); ```javascript -var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); var filledarrayBy = require( '@stdlib/array/filled-by' ); var sdsnansum = require( '@stdlib/blas/ext/base/sdsnansum' ); -function randOrNan( ) { - var rand100 = discreteUniform( 0, 100 ); - var rand10 = discreteUniform( 0, 10 ); - if ( rand10() < 2 ) { +function randOrNan() { + if ( bernoulli() < 0.2 ) { return NaN; } - return rand100(); + return discreteUniform( 0, 100 ); } var x = filledarrayBy( 10, 'float32', randOrNan ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js index 3aa0a70e86b0..77d0d4a07ee4 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2024 The Stdlib Authors. +* 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. @@ -21,7 +21,8 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var uniform = require( '@stdlib/random/base/uniform' ).factory; +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' ); @@ -31,13 +32,11 @@ var sdsnansum = require( './../lib/sdsnansum.js' ); // FUNCTIONS // -function randOrNan( ) { - var randReslut = uniform( -20.0, -10.0 ); - var rand1 = uniform( 0.0, 1.0 ); - if ( rand1() < 0.2 ) { +function randOrNan() { + if ( bernoulli() < 0.2 ) { return NaN; } - return randReslut(); + return uniform( -20.0, -10.0 ); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js index 5a02c40e71c8..fa9e2190c25f 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.native.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2024 The Stdlib Authors. +* 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. @@ -22,7 +22,8 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var uniform = require( '@stdlib/random/base/uniform' ).factory; +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' ); @@ -40,13 +41,11 @@ var opts = { // FUNCTIONS // -function randOrNan( ) { - var randReslut = uniform( -20.0, -10.0 ); - var rand1 = uniform( 0.0, 1.0 ); - if ( rand1() < 0.2 ) { +function randOrNan() { + if ( bernoulli() < 0.2 ) { return NaN; } - return randReslut(); + return uniform( -20.0, -10.0 ); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js index defad9338c84..cc71b88507ee 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2024 The Stdlib Authors. +* 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. @@ -21,7 +21,8 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var uniform = require( '@stdlib/random/base/uniform' ).factory; +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' ); @@ -31,13 +32,11 @@ var sdsnansum = require( './../lib/ndarray.js' ); // FUNCTIONS // -function randOrNan( ) { - var randReslut = uniform( -20.0, -10.0 ); - var rand1 = uniform( 0.0, 1.0 ); - if ( rand1() < 0.2 ) { +function randOrNan() { + if ( bernoulli() < 0.2 ) { return NaN; } - return randReslut(); + return uniform( -20.0, -10.0 ); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js index 1b9274a44fbf..ddbbacfd5c04 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/benchmark/benchmark.ndarray.native.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2024 The Stdlib Authors. +* 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. @@ -22,7 +22,8 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var uniform = require( '@stdlib/random/base/uniform' ).factory; +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' ); @@ -40,13 +41,11 @@ var opts = { // FUNCTIONS // -function randOrNan( ) { - var randReslut = uniform( -20.0, -10.0 ); - var rand1 = uniform( 0.0, 1.0 ); - if ( rand1() < 0.2 ) { +function randOrNan() { + if ( bernoulli() < 0.2 ) { return NaN; } - return randReslut(); + return uniform( -20.0, -10.0 ); } /** diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js index 46496b587845..451d8b341c28 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdsnansum/examples/index.js @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2024 The Stdlib Authors. +* 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. @@ -18,20 +18,19 @@ 'use strict'; -var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); var filledarrayBy = require( '@stdlib/array/filled-by' ); var sdsnansum = require( './../lib' ); -function randOrNan( ) { - var rand100 = discreteUniform( 0, 100 ); - var rand10 = discreteUniform( 0, 10 ); - if ( rand10() < 2 ) { +function randOrNan() { + if ( bernoulli() < 0.2 ) { return NaN; } - return rand100(); + return discreteUniform( 0, 100 ); } -var x = filledarrayBy( 10, 'float32', randOrNan ); +var x = filledarrayBy( 10, 'float32', randOrNan ); console.log( x ); var v = sdsnansum( x.length, x, 1 );