From b4fdaacc15ac3b6cd2466e955e4ff913f2a7e2b7 Mon Sep 17 00:00:00 2001 From: rxbryan Date: Mon, 18 Mar 2024 13:15:17 +0100 Subject: [PATCH 01/13] refactor: update blas/ext/base/scusumors updates blas/ext/base/scusumors to follow current project conventions Fixes: #1519 --- .../@stdlib/blas/ext/base/scusumors/README.md | 32 ++-- .../ext/base/scusumors/benchmark/benchmark.js | 10 +- .../scusumors/benchmark/benchmark.native.js | 10 +- .../scusumors/benchmark/benchmark.ndarray.js | 10 +- .../benchmark/benchmark.ndarray.native.js | 10 +- .../blas/ext/base/scusumors/docs/repl.txt | 17 +- .../blas/ext/base/scusumors/examples/index.js | 11 +- .../blas/ext/base/scusumors/include.gypi | 2 +- .../blas/ext/base/scusumors/lib/index.js | 4 +- .../blas/ext/base/scusumors/lib/ndarray.js | 4 +- .../ext/base/scusumors/lib/ndarray.native.js | 22 ++- .../blas/ext/base/scusumors/manifest.json | 82 +++++---- .../blas/ext/base/scusumors/package.json | 4 +- .../blas/ext/base/scusumors/src/addon.c | 58 +++++++ .../blas/ext/base/scusumors/src/addon.cpp | 164 ------------------ .../ext/base/scusumors/test/test.ndarray.js | 15 +- .../scusumors/test/test.ndarray.native.js | 15 +- .../ext/base/scusumors/test/test.scusumors.js | 12 +- .../scusumors/test/test.scusumors.native.js | 12 +- 19 files changed, 174 insertions(+), 320 deletions(-) create mode 100644 lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c delete mode 100644 lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.cpp diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md b/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md index 6cd5c5951743..be92abef8f05 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md @@ -65,18 +65,15 @@ The function has the following parameters: - **y**: output [`Float32Array`][@stdlib/array/float32]. - **strideY**: index increment for `y`. -The `N` and `stride` parameters determine which elements in `x` and `y` are accessed at runtime. For example, to compute the cumulative sum of every other element in `x`, +The `N` and `stride` parameters determine which elements in the strided arrays are accessed at runtime. For example, to compute the cumulative sum of every other element in `x`, ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ] ); var y = new Float32Array( x.length ); -var N = floor( x.length / 2 ); - -var v = scusumors( N, 0.0, x, 2, y, 1 ); +var v = scusumors( 4, 0.0, x, 2, y, 1 ); // y => [ 1.0, 3.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ] ``` @@ -86,7 +83,6 @@ 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' ); // Initial arrays... var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); @@ -96,9 +92,7 @@ var y0 = new Float32Array( x0.length ); var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element var y1 = new Float32Array( y0.buffer, y0.BYTES_PER_ELEMENT*3 ); // start at 4th element -var N = floor( x0.length / 2 ); - -scusumors( N, 0.0, x1, -2, y1, 1 ); +scusumors( 4, 0.0, x1, -2, y1, 1 ); // y0 => [ 0.0, 0.0, 0.0, 4.0, 6.0, 4.0, 5.0, 0.0 ] ``` @@ -121,18 +115,15 @@ The function has the following additional parameters: - **offsetX**: starting index for `x`. - **offsetY**: starting index for `y`. -While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, `offsetX` and `offsetY` parameters support indexing semantics based on a starting indices. For example, to calculate the cumulative sum of every other value in `x` starting from the second value and to store in the last `N` elements of `y` starting from the last element +While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, offset parameters support indexing semantics based on a starting indices. For example, to calculate the cumulative sum of every other value in `x` starting from the second value and to store in the last `N` elements of `y` starting from the last element ```javascript 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 ] ); var y = new Float32Array( x.length ); -var N = floor( x.length / 2 ); - -scusumors.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 ); +scusumors.ndarray( 4, 0.0, x, 2, 1, y, -1, y.length-1 ); // y => [ 0.0, 0.0, 0.0, 0.0, 5.0, 1.0, -1.0, 1.0 ] ``` @@ -144,7 +135,7 @@ scusumors.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 ); ## Notes -- If `N <= 0`, both functions return `y` unchanged. +- If `N <= 0`, both functions return the output array unchanged. - Ordinary recursive summation (i.e., a "simple" sum) is performant, but can incur significant numerical error. If performance is paramount and error tolerated, using ordinary recursive summation is acceptable; in all other cases, exercise due caution. @@ -158,20 +149,17 @@ scusumors.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 ); ```javascript -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); +var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; +var filledarrayBy = require( '@stdlib/array/filled-by' ); var Float32Array = require( '@stdlib/array/float32' ); var scusumors = require( '@stdlib/blas/ext/base/scusumors' ); var y; var x; -var i; -x = new Float32Array( 10 ); +x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) ); y = new Float32Array( x.length ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( randu()*100.0 ); -} + console.log( x ); console.log( y ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.js index 0cd850d46e76..2f42a28b2db3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.js @@ -21,7 +21,8 @@ // 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 isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -41,13 +42,10 @@ var scusumors = require( './../lib/scusumors.js' ); function createBenchmark( len ) { var y; var x; - var i; - x = new Float32Array( len ); + x = filledarrayBy( len, 'float32', uniform( -10.0, 10.0 ) ); y = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.native.js index 1b3f1a4e25b3..4256c5fc0c77 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.native.js @@ -22,7 +22,8 @@ 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 isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -50,13 +51,10 @@ var opts = { function createBenchmark( len ) { var x; var y; - var i; - x = new Float32Array( len ); + x = filledarrayBy( len, 'float32', uniform( -10.0, 10.0 ) ); y = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.ndarray.js index e4c8659972a1..2c987c262a8a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.ndarray.js @@ -21,7 +21,8 @@ // 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 isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -41,13 +42,10 @@ var scusumors = require( './../lib/ndarray.js' ); function createBenchmark( len ) { var x; var y; - var i; - x = new Float32Array( len ); + x = filledarrayBy( len, 'float32', uniform( -10.0, 10.0 ) ); y = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.ndarray.native.js index c90db53814c7..37cc520539ab 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/benchmark/benchmark.ndarray.native.js @@ -22,7 +22,8 @@ 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 isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -50,13 +51,10 @@ var opts = { function createBenchmark( len ) { var x; var y; - var i; - x = new Float32Array( len ); + x = filledarrayBy( len, 'float32', uniform( -10.0, 10.0 ) ); y = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/scusumors/docs/repl.txt index 86553568a61b..9f31c7811b61 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/docs/repl.txt @@ -3,8 +3,8 @@ Computes the cumulative sum of single-precision floating-point strided array elements using ordinary recursive summation. - The `N` and `stride` parameters determine which elements in `x` and `y` are - accessed at runtime. + The `N` and stride parameters determine which elements in the strided arrays + are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed array view. @@ -44,11 +44,11 @@ > {{alias}}( x.length, 0.0, x, 1, y, 1 ) [ 1.0, -1.0, 1.0 ] - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ] ); > y = new {{alias:@stdlib/array/float32}}( x.length ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}( N, 0.0, x, 2, y, 2 ) + + > {{alias}}( 3, 0.0, x, 2, y, 2 ) [ -2.0, 0.0, -1.0, 0.0, 1.0, 0.0 ] // Using view offsets: @@ -56,12 +56,12 @@ > var y0 = new {{alias:@stdlib/array/float32}}( x0.length ); > var x1 = new {{alias:@stdlib/array/float32}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); > var y1 = new {{alias:@stdlib/array/float32}}( y0.buffer, y0.BYTES_PER_ELEMENT*3 ); - > N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 ); - > {{alias}}( N, 0.0, x1, 2, y1, 1 ) + > {{alias}}( 3, 0.0, x1, 2, y1, 1 ) [ -2.0, 0.0, -1.0 ] > y0 [ 0.0, 0.0, 0.0, -2.0, 0.0, -1.0 ] + {{alias}}.ndarray( N, sum, x, strideX, offsetX, y, strideY, offsetY ) Computes the cumulative sum of single-precision floating-point strided array elements using ordinary recursive summation and alternative indexing @@ -113,8 +113,7 @@ // Advanced indexing: > x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); > y = new {{alias:@stdlib/array/float32}}( x.length ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, 0.0, x, 2, 1, y, -1, y.length-1 ) + > {{alias}}.ndarray( 3, 0.0, x, 2, 1, y, -1, y.length-1 ) [ 0.0, 0.0, 0.0, -1.0, 0.0, -2.0 ] See Also diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js index cc8eb5a7773c..bfe60c7bbed5 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js @@ -18,20 +18,17 @@ '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 scusumors = require( './../lib' ); var y; var x; -var i; -x = new Float32Array( 10 ); +x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) ); y = new Float32Array( x.length ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( randu()*100.0 ); -} + console.log( x ); console.log( y ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/include.gypi b/lib/node_modules/@stdlib/blas/ext/base/scusumors/include.gypi index 868c5c12e852..26476a8c2655 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/include.gypi +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', ' [ 1.0, -1.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ] */ diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/lib/ndarray.js index f05bb342b5ba..210f8a30aa55 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/lib/ndarray.js @@ -40,13 +40,11 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); * * @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 ] ); * var y = new Float32Array( x.length ); -* var N = floor( x.length / 2 ); * -* var v = scusumors( N, 0.0, x, 2, 1, y, 1, 0 ); +* var v = scusumors( 4, 0.0, x, 2, 1, y, 1, 0 ); * // returns [ 1.0, -1.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ] */ function scusumors( N, sum, x, strideX, offsetX, y, strideY, offsetY ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/lib/ndarray.native.js index 7edd250e3ee3..1e5087b5aa64 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/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( './scusumors.native.js' ); @@ -41,26 +42,23 @@ var addon = require( './scusumors.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 ] ); * var y = new Float32Array( x.length ); -* var N = floor( x.length / 2 ); * -* var v = scusumors( N, 0.0, x, 2, 1, y, 1, 0 ); +* var v = scusumors( 4, 0.0, x, 2, 1, y, 1, 0 ); * // returns [ 1.0, -1.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ] */ function scusumors( N, sum, x, strideX, offsetX, y, strideY, offsetY ) { var viewX; var viewY; - if ( strideX < 0 ) { - offsetX += (N-1) * strideX; - } - if ( strideY < 0 ) { - offsetY += (N-1) * strideY; - } - viewX = new Float32Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offsetX), x.length-offsetX ); // eslint-disable-line max-len - viewY = new Float32Array( y.buffer, y.byteOffset+(y.BYTES_PER_ELEMENT*offsetY), y.length-offsetY ); // eslint-disable-line max-len + + offsetX = minViewBufferIndex( N, strideX, offsetX ); + offsetY = minViewBufferIndex( N, strideY, offsetY ); + + viewX = offsetView( x, offsetX ); + viewY = offsetView( y, offsetY ); + addon( N, sum, viewX, strideX, viewY, strideY ); return y; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/scusumors/manifest.json index dd9cf0d5f8f5..3912f9dc88e7 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/manifest.json @@ -1,40 +1,46 @@ { - "options": {}, - "fields": [ - { - "field": "src", - "resolve": true, - "relative": true - }, - { - "field": "include", - "resolve": true, - "relative": true - }, - { - "field": "libraries", - "resolve": false, - "relative": false - }, - { - "field": "libpath", - "resolve": true, - "relative": false - } - ], - "confs": [ - { - "src": [ - "./src/scusumors.c" - ], - "include": [ - "./include" - ], - "libraries": [ - "-lm" - ], - "libpath": [], - "dependencies": [] - } - ] + "options": {}, + "fields": [ + { + "field": "src", + "resolve": true, + "relative": true + }, + { + "field": "include", + "resolve": true, + "relative": true + }, + { + "field": "libraries", + "resolve": false, + "relative": false + }, + { + "field": "libpath", + "resolve": true, + "relative": false + } + ], + "confs": [ + { + "src": [ + "./src/scusumors.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ + "@stdlib/napi/export", + "@stdlib/napi/argv", + "@stdlib/napi/argv-float", + "@stdlib/napi/argv-int64", + "@stdlib/napi/argv-strided-float32array" + ] + } + ] } diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/package.json b/lib/node_modules/@stdlib/blas/ext/base/scusumors/package.json index 5c17c6a8bd56..f0d3a1630627 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/package.json +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/package.json @@ -76,5 +76,7 @@ "single", "float32array" ], - "__stdlib__": {} + "__stdlib__": { + "wasm": false + } } diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c new file mode 100644 index 000000000000..cbf12732fc26 --- /dev/null +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c @@ -0,0 +1,58 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2020 The Stdlib Authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +#include "stdlib/blas/ext/base/scusumors.h" +#include "stdlib/napi/export.h" +#include "stdlib/napi/argv.h" +#include "stdlib/napi/argv_float.h" +#include "stdlib/napi/argv_int64.h" +#include "stdlib/napi/argv_strided_float32array.h" +#include + + +/** +* Computes the cumulative sum of single-precision floating-point strided array elements using ordinary recursive summation. +* +* ## Notes +* +* - When called from JavaScript, the function expects six arguments: +* +* - `N`: number of indexed elements +* - `sum`: initial sum +* - `X`: input array +* - `strideX`: `X` stride length +* - `Y`: output array +* - `strideY`: `Y` stride length +*/ +static napi_value addon( napi_env env, napi_callback_info info ) { + STDLIB_NAPI_ARGV( env, info, argv, argc, 6 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_FLOAT( env, sum, argv, 1 ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 3 ); + STDLIB_NAPI_ARGV_INT64( env, strideY, argv, 5 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, Y, N, strideY, argv, 4 ); + + stdlib_strided_scusumors( N, (float)sum, (float *)X, strideX, (float *)Y, strideY ); + + return NULL; +} + + +STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) + diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.cpp b/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.cpp deleted file mode 100644 index d3152f5005fa..000000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.cpp +++ /dev/null @@ -1,164 +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/scusumors.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_blas_ext_base_scusumors { - - /** - * Computes the cumulative sum of single-precision floating-point strided array elements using ordinary recursive summation. - * - * ## Notes - * - * - When called from JavaScript, the function expects six arguments: - * - * - `N`: number of indexed elements - * - `sum`: initial sum - * - `X`: input array - * - `strideX`: `X` stride length - * - `Y`: output array - * - `strideY`: `Y` stride length - */ - napi_value node_scusumors( napi_env env, napi_callback_info info ) { - napi_status status; - - size_t argc = 6; - napi_value argv[ 6 ]; - status = napi_get_cb_info( env, info, &argc, argv, nullptr, nullptr ); - assert( status == napi_ok ); - - if ( argc < 6 ) { - napi_throw_error( env, nullptr, "invalid invocation. Must provide 6 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; - } - - napi_valuetype vtype1; - status = napi_typeof( env, argv[ 1 ], &vtype1 ); - assert( status == napi_ok ); - if ( vtype1 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a number." ); - return nullptr; - } - - bool res2; - status = napi_is_typedarray( env, argv[ 2 ], &res2 ); - assert( status == napi_ok ); - if ( res2 == false ) { - napi_throw_type_error( env, nullptr, "invalid argument. Third argument must be a Float32Array." ); - return nullptr; - } - - napi_valuetype vtype3; - status = napi_typeof( env, argv[ 3 ], &vtype3 ); - assert( status == napi_ok ); - if ( vtype3 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. Fourth argument must be a number." ); - return nullptr; - } - - bool res4; - status = napi_is_typedarray( env, argv[ 4 ], &res4 ); - assert( status == napi_ok ); - if ( res4 == false ) { - napi_throw_type_error( env, nullptr, "invalid argument. Fifth argument must be a Float32Array." ); - return nullptr; - } - - napi_valuetype vtype5; - status = napi_typeof( env, argv[ 5 ], &vtype5 ); - assert( status == napi_ok ); - if ( vtype5 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. Sixth argument must be a number." ); - return nullptr; - } - - int64_t N; - status = napi_get_value_int64( env, argv[ 0 ], &N ); - assert( status == napi_ok ); - - double sum; - status = napi_get_value_double( env, argv[ 1 ], &sum ); - assert( status == napi_ok ); - - int64_t strideX; - status = napi_get_value_int64( env, argv[ 3 ], &strideX ); - assert( status == napi_ok ); - - int64_t strideY; - status = napi_get_value_int64( env, argv[ 5 ], &strideY ); - assert( status == napi_ok ); - - napi_typedarray_type vtype2; - size_t xlen; - void *X; - status = napi_get_typedarray_info( env, argv[ 2 ], &vtype2, &xlen, &X, nullptr, nullptr ); - assert( status == napi_ok ); - if ( vtype2 != napi_float32_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Third argument must be a Float32Array." ); - return nullptr; - } - if ( (N-1)*llabs(strideX) >= (int64_t)xlen ) { - napi_throw_range_error( env, nullptr, "invalid argument. Third argument has insufficient elements based on the associated stride and the number of indexed elements." ); - return nullptr; - } - - napi_typedarray_type vtype4; - size_t ylen; - void *Y; - status = napi_get_typedarray_info( env, argv[ 4 ], &vtype4, &ylen, &Y, nullptr, nullptr ); - assert( status == napi_ok ); - if ( vtype4 != napi_float32_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Fifth argument must be a Float32Array." ); - return nullptr; - } - if ( (N-1)*llabs(strideY) >= (int64_t)ylen ) { - napi_throw_range_error( env, nullptr, "invalid argument. Fifth argument has insufficient elements based on the associated stride and the number of indexed elements." ); - return nullptr; - } - - stdlib_strided_scusumors( N, (float)sum, (float *)X, strideX, (float *)Y, strideY ); - - return nullptr; - } - - napi_value Init( napi_env env, napi_value exports ) { - napi_status status; - napi_value fcn; - status = napi_create_function( env, "exports", NAPI_AUTO_LENGTH, node_scusumors, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_blas_ext_base_scusumors diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.js index 5137803a2b94..74283bd10a23 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var Float32Array = require( '@stdlib/array/float32' ); var scusumors = require( './../lib/ndarray.js' ); @@ -141,7 +140,7 @@ tape( 'the function returns a reference to the output array', function test( t ) t.end(); }); -tape( 'if provided an `N` parameter less than or equal to `0`, the function returns `y` unchanged', function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output unchanged', function test( t ) { var expected; var x; var y; @@ -152,10 +151,10 @@ tape( 'if provided an `N` parameter less than or equal to `0`, the function retu expected = new Float32Array( [ 6.0, 7.0, 8.0, 9.0, 10.0 ] ); scusumors( -1, 0.0, x, 1, 0, y, 1, 0 ); - t.deepEqual( y, expected, 'returns `y` unchanged' ); + t.deepEqual( y, expected, 'returns expected value' ); scusumors( 0, 0.0, x, 1, 0, y, 1, 0 ); - t.deepEqual( y, expected, 'returns `y` unchanged' ); + t.deepEqual( y, expected, 'returns expected value' ); t.end(); }); @@ -268,7 +267,6 @@ tape( 'the function supports negative strides', function test( t ) { tape( 'the function supports an `x` offset', function test( t ) { var expected; - var N; var x; var y; @@ -292,9 +290,8 @@ tape( 'the function supports an `x` offset', function test( t ) { 0.0, 0.0 ]); - N = floor( x.length / 2 ); - scusumors( N, 0.0, x, 2, 1, y, 1, 0 ); + scusumors( 4, 0.0, x, 2, 1, y, 1, 0 ); expected = new Float32Array( [ 1.0, -1.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ] ); @@ -304,7 +301,6 @@ tape( 'the function supports an `x` offset', function test( t ) { tape( 'the function supports a `y` offset', function test( t ) { var expected; - var N; var x; var y; @@ -328,9 +324,8 @@ tape( 'the function supports a `y` offset', function test( t ) { 0.0, 0.0 // 3 ]); - N = floor( x.length / 2 ); - scusumors( N, 0.0, x, 1, 0, y, 2, 1 ); + scusumors( 4, 0.0, x, 1, 0, y, 2, 1 ); expected = new Float32Array( [ 0.0, 2.0, 0.0, 3.0, 0.0, 5.0, 0.0, 3.0 ] ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.native.js index 6afb73a6a122..d7f646642558 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/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 isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -150,7 +149,7 @@ tape( 'the function returns a reference to the output array', opts, function tes t.end(); }); -tape( 'if provided an `N` parameter less than or equal to `0`, the function returns `y` unchanged', opts, function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output unchanged', opts, function test( t ) { var expected; var x; var y; @@ -161,10 +160,10 @@ tape( 'if provided an `N` parameter less than or equal to `0`, the function retu expected = new Float32Array( [ 6.0, 7.0, 8.0, 9.0, 10.0 ] ); scusumors( -1, 0.0, x, 1, 0, y, 1, 0 ); - t.deepEqual( y, expected, 'returns `y` unchanged' ); + t.deepEqual( y, expected, 'returns expected value' ); scusumors( 0, 0.0, x, 1, 0, y, 1, 0 ); - t.deepEqual( y, expected, 'returns `y` unchanged' ); + t.deepEqual( y, expected, 'returns expected value' ); t.end(); }); @@ -277,7 +276,6 @@ tape( 'the function supports negative strides', opts, function test( t ) { tape( 'the function supports an `x` offset', opts, function test( t ) { var expected; - var N; var x; var y; @@ -301,9 +299,8 @@ tape( 'the function supports an `x` offset', opts, function test( t ) { 0.0, 0.0 ]); - N = floor( x.length / 2 ); - scusumors( N, 0.0, x, 2, 1, y, 1, 0 ); + scusumors( 4, 0.0, x, 2, 1, y, 1, 0 ); expected = new Float32Array( [ 1.0, -1.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ] ); @@ -313,7 +310,6 @@ tape( 'the function supports an `x` offset', opts, function test( t ) { tape( 'the function supports a `y` offset', opts, function test( t ) { var expected; - var N; var x; var y; @@ -337,9 +333,8 @@ tape( 'the function supports a `y` offset', opts, function test( t ) { 0.0, 0.0 // 3 ]); - N = floor( x.length / 2 ); - scusumors( N, 0.0, x, 1, 0, y, 2, 1 ); + scusumors( 4, 0.0, x, 1, 0, y, 2, 1 ); expected = new Float32Array( [ 0.0, 2.0, 0.0, 3.0, 0.0, 5.0, 0.0, 3.0 ] ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.js index 5cdc4875ad20..2604f50a38fd 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var Float32Array = require( '@stdlib/array/float32' ); var scusumors = require( './../lib/scusumors.js' ); @@ -141,7 +140,7 @@ tape( 'the function returns a reference to the output array', function test( t ) t.end(); }); -tape( 'if provided an `N` parameter less than or equal to `0`, the function returns `y` unchanged', function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output unchanged', function test( t ) { var expected; var x; var y; @@ -152,10 +151,10 @@ tape( 'if provided an `N` parameter less than or equal to `0`, the function retu expected = new Float32Array( [ 6.0, 7.0, 8.0, 9.0, 10.0 ] ); scusumors( -1, 0.0, x, 1, y, 1 ); - t.deepEqual( y, expected, 'returns `y` unchanged' ); + t.deepEqual( y, expected, 'returns expected value' ); scusumors( 0, 0.0, x, 1, y, 1 ); - t.deepEqual( y, expected, 'returns `y` unchanged' ); + t.deepEqual( y, expected, 'returns expected value' ); t.end(); }); @@ -304,7 +303,6 @@ tape( 'the function supports view offsets', function test( t ) { var y0; var x1; var y1; - var N; // Initial arrays... x0 = new Float32Array([ @@ -328,9 +326,7 @@ tape( 'the function supports view offsets', function test( t ) { x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // begin at 2nd element y1 = new Float32Array( y0.buffer, y0.BYTES_PER_ELEMENT*3 ); // begin at the 4th element - N = floor( x0.length / 2 ); - - scusumors( N, 0.0, x1, -2, y1, 1 ); + scusumors( 3, 0.0, x1, -2, y1, 1 ); expected = new Float32Array( [ 0.0, 0.0, 0.0, 6.0, 10.0, 12.0 ] ); t.deepEqual( y0, expected, 'returns expected value' ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.native.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.native.js index 7a32188b0b38..839a7175ad48 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -150,7 +149,7 @@ tape( 'the function returns a reference to the output array', opts, function tes t.end(); }); -tape( 'if provided an `N` parameter less than or equal to `0`, the function returns `y` unchanged', opts, function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output unchanged', opts, function test( t ) { var expected; var x; var y; @@ -161,10 +160,10 @@ tape( 'if provided an `N` parameter less than or equal to `0`, the function retu expected = new Float32Array( [ 6.0, 7.0, 8.0, 9.0, 10.0 ] ); scusumors( -1, 0.0, x, 1, y, 1 ); - t.deepEqual( y, expected, 'returns `y` unchanged' ); + t.deepEqual( y, expected, 'returns expected value' ); scusumors( 0, 0.0, x, 1, y, 1 ); - t.deepEqual( y, expected, 'returns `y` unchanged' ); + t.deepEqual( y, expected, 'returns expected value' ); t.end(); }); @@ -313,7 +312,6 @@ tape( 'the function supports view offsets', opts, function test( t ) { var y0; var x1; var y1; - var N; // Initial arrays... x0 = new Float32Array([ @@ -337,9 +335,7 @@ tape( 'the function supports view offsets', opts, function test( t ) { x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // begin at 2nd element y1 = new Float32Array( y0.buffer, y0.BYTES_PER_ELEMENT*3 ); // begin at the 4th element - N = floor( x0.length / 2 ); - - scusumors( N, 0.0, x1, -2, y1, 1 ); + scusumors( 3, 0.0, x1, -2, y1, 1 ); expected = new Float32Array( [ 0.0, 0.0, 0.0, 6.0, 10.0, 12.0 ] ); t.deepEqual( y0, expected, 'returns expected value' ); From eff293f1a8fd9b722ea4590d7a5707035e56c3d1 Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:17:31 +0100 Subject: [PATCH 02/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.native.js Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- .../blas/ext/base/scusumors/test/test.scusumors.native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.native.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.native.js index 839a7175ad48..f8241221beb7 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.native.js @@ -149,7 +149,7 @@ tape( 'the function returns a reference to the output array', opts, function tes t.end(); }); -tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output unchanged', opts, function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output array unchanged', opts, function test( t ) { var expected; var x; var y; From b83c033a1c2c8a4843b8212bd63ec41456c4c18e Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:18:01 +0100 Subject: [PATCH 03/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.js Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- .../@stdlib/blas/ext/base/scusumors/test/test.scusumors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.js index 2604f50a38fd..eaec9e782bce 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.scusumors.js @@ -140,7 +140,7 @@ tape( 'the function returns a reference to the output array', function test( t ) t.end(); }); -tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output unchanged', function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output array unchanged', function test( t ) { var expected; var x; var y; From d9bd61e6f4b02561b11120163a5f762b965224ee Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:18:22 +0100 Subject: [PATCH 04/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md b/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md index be92abef8f05..cc4864aea8b5 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md @@ -65,7 +65,7 @@ The function has the following parameters: - **y**: output [`Float32Array`][@stdlib/array/float32]. - **strideY**: index increment for `y`. -The `N` and `stride` parameters determine which elements in the strided arrays are accessed at runtime. For example, to compute the cumulative sum of every other element in `x`, +The `N` and stride parameters determine which elements in the strided arrays are accessed at runtime. For example, to compute the cumulative sum of every other element in `x`, ```javascript var Float32Array = require( '@stdlib/array/float32' ); From bbc4750bf57fabd33b82e65d90555cd61e99bd2f Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:19:01 +0100 Subject: [PATCH 05/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md b/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md index cc4864aea8b5..13a541df94ed 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md @@ -157,8 +157,8 @@ var scusumors = require( '@stdlib/blas/ext/base/scusumors' ); var y; var x; -x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) ); -y = new Float32Array( x.length ); +var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) ); +var y = new Float32Array( x.length ); console.log( x ); console.log( y ); From 68a4cd83fae76a1d15fb63bad25d2b718e409720 Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:19:09 +0100 Subject: [PATCH 06/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md b/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md index 13a541df94ed..bc247cf7aae6 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/README.md @@ -154,9 +154,6 @@ var filledarrayBy = require( '@stdlib/array/filled-by' ); var Float32Array = require( '@stdlib/array/float32' ); var scusumors = require( '@stdlib/blas/ext/base/scusumors' ); -var y; -var x; - var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) ); var y = new Float32Array( x.length ); From 4297105ebbeb0ea58876375179624e60f65b4b00 Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:19:26 +0100 Subject: [PATCH 07/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/docs/repl.txt Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- lib/node_modules/@stdlib/blas/ext/base/scusumors/docs/repl.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/scusumors/docs/repl.txt index 9f31c7811b61..c16d450b275c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/docs/repl.txt @@ -47,7 +47,6 @@ // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ] ); > y = new {{alias:@stdlib/array/float32}}( x.length ); - > {{alias}}( 3, 0.0, x, 2, y, 2 ) [ -2.0, 0.0, -1.0, 0.0, 1.0, 0.0 ] From 5fe51001bc9c393a2317ac3c9e5235f0baf6827d Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:19:34 +0100 Subject: [PATCH 08/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- .../@stdlib/blas/ext/base/scusumors/examples/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js index bfe60c7bbed5..7d5e6ad3f89c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js @@ -23,9 +23,6 @@ var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; var filledarrayBy = require( '@stdlib/array/filled-by' ); var scusumors = require( './../lib' ); -var y; -var x; - x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) ); y = new Float32Array( x.length ); From af262ef09057fd832b521a63bc3855baf738b779 Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:19:45 +0100 Subject: [PATCH 09/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c index cbf12732fc26..83e692830786 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c @@ -24,7 +24,6 @@ #include "stdlib/napi/argv_strided_float32array.h" #include - /** * Computes the cumulative sum of single-precision floating-point strided array elements using ordinary recursive summation. * From fd7879164694bed86b718bec5d95b6aa36a203c2 Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:19:56 +0100 Subject: [PATCH 10/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- .../@stdlib/blas/ext/base/scusumors/src/addon.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c index 83e692830786..b6d3dcfe2099 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c @@ -25,18 +25,12 @@ #include /** -* Computes the cumulative sum of single-precision floating-point strided array elements using ordinary recursive summation. +* Receives JavaScript callback invocation data. * -* ## Notes -* -* - When called from JavaScript, the function expects six arguments: -* -* - `N`: number of indexed elements -* - `sum`: initial sum -* - `X`: input array -* - `strideX`: `X` stride length -* - `Y`: output array -* - `strideY`: `Y` stride length +* @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, 6 ); From 8187825b4add418d448caf4748cd45c0760acc97 Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:20:15 +0100 Subject: [PATCH 11/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.native.js Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- .../@stdlib/blas/ext/base/scusumors/test/test.ndarray.native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.native.js index d7f646642558..e62212021968 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.native.js @@ -149,7 +149,7 @@ tape( 'the function returns a reference to the output array', opts, function tes t.end(); }); -tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output unchanged', opts, function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output array unchanged', opts, function test( t ) { var expected; var x; var y; From db244e0df6ef01020530f3af11d42007813d8f9e Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:20:21 +0100 Subject: [PATCH 12/13] Update lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.js Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- .../@stdlib/blas/ext/base/scusumors/test/test.ndarray.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.js index 74283bd10a23..fd828a164066 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/test/test.ndarray.js @@ -140,7 +140,7 @@ tape( 'the function returns a reference to the output array', function test( t ) t.end(); }); -tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output unchanged', function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns the output array unchanged', function test( t ) { var expected; var x; var y; From cd12a1ab3cc25ec19c79ebcb33f247c6fd84c847 Mon Sep 17 00:00:00 2001 From: Bryan Elee Date: Wed, 20 Mar 2024 03:20:53 +0100 Subject: [PATCH 13/13] refactor: update @stdlib/blas/ext/base/scusumors/src/manifest Co-authored-by: Philipp Burckhardt Signed-off-by: Bryan Elee --- .../blas/ext/base/scusumors/examples/index.js | 4 +-- .../blas/ext/base/scusumors/manifest.json | 29 +++++++++++++++++++ .../blas/ext/base/scusumors/src/addon.c | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js index 7d5e6ad3f89c..7bb9a381a349 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/examples/index.js @@ -23,8 +23,8 @@ var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; var filledarrayBy = require( '@stdlib/array/filled-by' ); var scusumors = require( './../lib' ); -x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) ); -y = new Float32Array( x.length ); +var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) ); +var y = new Float32Array( x.length ); console.log( x ); console.log( y ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/scusumors/manifest.json index 3912f9dc88e7..775a06ad5c48 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/manifest.json @@ -24,6 +24,7 @@ ], "confs": [ { + "task": "build", "src": [ "./src/scusumors.c" ], @@ -41,6 +42,34 @@ "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array" ] + }, + { + "task": "benchmark", + "src": [ + "./src/scusumors.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [] + }, + { + "task": "examples", + "src": [ + "./src/scusumors.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [] } ] } diff --git a/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c index b6d3dcfe2099..ace217d1c331 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/scusumors/src/addon.c @@ -41,7 +41,7 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 2 ); STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, Y, N, strideY, argv, 4 ); - stdlib_strided_scusumors( N, (float)sum, (float *)X, strideX, (float *)Y, strideY ); + stdlib_strided_scusumors( N, sum, X, strideX, Y, strideY ); return NULL; }