From c987015d35de01504ea78fde384095b5783b2db7 Mon Sep 17 00:00:00 2001 From: lovelindhoni Date: Mon, 4 Mar 2024 19:12:36 +0530 Subject: [PATCH 1/6] refactor: update blas/ext/base/ssumors to follow current project conventions --- .../@stdlib/blas/ext/base/ssumors/README.md | 30 ++--- .../ext/base/ssumors/benchmark/benchmark.js | 19 ++- .../ssumors/benchmark/benchmark.native.js | 15 +-- .../ssumors/benchmark/benchmark.ndarray.js | 19 ++- .../benchmark/benchmark.ndarray.native.js | 15 +-- .../blas/ext/base/ssumors/docs/repl.txt | 15 ++- .../blas/ext/base/ssumors/examples/index.js | 15 +-- .../blas/ext/base/ssumors/include.gypi | 2 +- .../blas/ext/base/ssumors/lib/index.js | 6 +- .../blas/ext/base/ssumors/lib/ndarray.js | 6 +- .../ext/base/ssumors/lib/ndarray.native.js | 15 +-- .../blas/ext/base/ssumors/manifest.json | 71 ++++++----- .../@stdlib/blas/ext/base/ssumors/src/addon.c | 49 ++++++++ .../blas/ext/base/ssumors/src/addon.cpp | 117 ------------------ .../ext/base/ssumors/test/test.ndarray.js | 11 +- .../base/ssumors/test/test.ndarray.native.js | 11 +- .../ext/base/ssumors/test/test.ssumors.js | 11 +- .../base/ssumors/test/test.ssumors.native.js | 11 +- 18 files changed, 165 insertions(+), 273 deletions(-) create mode 100644 lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.c delete mode 100644 lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.cpp diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/README.md b/lib/node_modules/@stdlib/blas/ext/base/ssumors/README.md index 27f3e43d2554..af6851786f41 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/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. @@ -56,16 +56,14 @@ The function has the following parameters: - **x**: input [`Float32Array`][@stdlib/array/float32]. - **stride**: index increment for `x`. -The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the sum of every other element in `x`, +The `N` and `stride` parameters determine which elements in the strided array are accessed at runtime. For example, to compute the sum of every other element in `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 N = floor( x.length / 2 ); -var v = ssumors( N, x, 2 ); +var v = ssumors( 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, 2.0, -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 = ssumors( N, x1, 2 ); +var v = ssumors( 4, x1, 2 ); // returns 5.0 ``` @@ -108,12 +103,10 @@ While [`typed array`][mdn-typed-array] views mandate a view offset based on the ```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 N = floor( x.length / 2 ); -var v = ssumors.ndarray( N, x, 2, 1 ); +var v = ssumors.ndarray( 4, x, 2, 1 ); // returns 5.0 ``` @@ -139,18 +132,11 @@ var v = ssumors.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 ssumors = require( '@stdlib/blas/ext/base/ssumors' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( randu()*100.0 ); -} +var x = filledarrayBy( 10, 'float32', discreteUniform( -100.0, 100.0) ); console.log( x ); var v = ssumors( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.js index 14202a4ae21c..e2ced82c9d3f 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/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 ssumors = require( './../lib/ssumors.js' ); +// VARIABLES // + +var rand = uniform( -100.0, 100.0 ); + + // FUNCTIONS // /** @@ -39,13 +44,7 @@ var ssumors = require( './../lib/ssumors.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*10.0 ) - 20.0; - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.native.js index 182af8a0d188..4704db358d01 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/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 ssumors = tryRequire( resolve( __dirname, './../lib/ssumors.native.js' ) ); var opts = { 'skip': ( ssumors instanceof Error ) }; +var rand = uniform( -100.0, 100.0 ); // FUNCTIONS // @@ -48,13 +49,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*10.0 ) - 20.0; - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.ndarray.js index d1e87438aa6f..1914b4ca36bc 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/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. @@ -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 ssumors = require( './../lib/ndarray.js' ); +// VARIABLES // + +var rand = uniform( -100.0, 100.0 ); + + // FUNCTIONS // /** @@ -39,13 +44,7 @@ var ssumors = 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++ ) { - x[ i ] = ( randu()*10.0 ) - 20.0; - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.ndarray.native.js index 00e628e2e825..0b4ef48d0518 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/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. @@ -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 ssumors = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ); var opts = { 'skip': ( ssumors instanceof Error ) }; +var rand = uniform( -100.0, 100.0 ); // FUNCTIONS // @@ -48,13 +49,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*10.0 ) - 20.0; - } + var x = filledarrayBy( len, 'float32', rand); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt index 679ad382d367..d00c0af3730f 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt @@ -3,8 +3,8 @@ Computes the sum of single-precision floating-point strided array elements using ordinary recursive summation. - The `N` and `stride` parameters determine which elements in `x` are accessed - at runtime. + The `N` and `stride` parameters determine which elements in the strided + array are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed array view. @@ -36,19 +36,18 @@ // Using `N` and `stride` parameters: > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); > var stride = 2; - > {{alias}}( N, x, stride ) + > {{alias}}( 3, 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 ] ); > 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}}( 3, x1, stride ) -1.0 + {{alias}}.ndarray( N, x, stride, offset ) Computes the sum of single-precision floating-point strided array elements using ordinary recursive summation and alternative indexing semantics. @@ -85,10 +84,10 @@ // Using offset parameter: > var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, x, 2, 1 ) + > {{alias}}.ndarray( 3, x, 2, 1 ) -1.0 + See Also -------- diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/ssumors/examples/index.js index abce62d2367c..b558dc6ed42e 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/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,18 +18,11 @@ '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 ssumors = require( './../lib' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( randu()*100.0 ); -} +var x = filledarrayBy( 10, 'float32', discreteUniform( -100.0, 100.0 ) ); console.log( x ); var v = ssumors( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/include.gypi b/lib/node_modules/@stdlib/blas/ext/base/ssumors/include.gypi index 868c5c12e852..26476a8c2655 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/include.gypi +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', ' +#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); + + napi_value v; + napi_status status = napi_create_double(env, (double)stdlib_strided_ssumors(N, (float *)X, stride), &v); + assert(status == napi_ok); + + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN(addon) diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.cpp b/lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.cpp deleted file mode 100644 index 59e7b26886d2..000000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/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/ssumors.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_blas_ext_base_ssumors { - - /** - * Computes the sum of single-precision floating-point strided array elements using ordinary recursive summation. - * - * ## Notes - * - * - When called from JavaScript, the function expects three arguments: - * - * - `N`: number of indexed elements - * - `X`: input array - * - `stride`: stride length - */ - napi_value node_ssumors( 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_ssumors( 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_ssumors, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_blas_ext_base_ssumors diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ndarray.js index 98f1e751fa5b..6c36f24a0184 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.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. @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var Float32Array = require( '@stdlib/array/float32' ); var ssumors = require( './../lib/ndarray.js' ); @@ -36,7 +35,7 @@ tape( 'main export is a function', function test( t ) { }); tape( 'the function has an arity of 4', function test( t ) { - t.strictEqual( ssumors.length, 4, 'has expected arity' ); + t.strictEqual( ssumors.length, 4, 'returns expected value' ); t.end(); }); @@ -110,7 +109,7 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); + N = 4; v = ssumors( N, x, 2, 0 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -133,7 +132,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); + N = 4; v = ssumors( N, x, -2, 6 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -167,7 +166,7 @@ tape( 'the function supports an `offset` parameter', function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); + N = 4; v = ssumors( N, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ndarray.native.js index d296d7925a46..17708b47b5de 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.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. @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -45,7 +44,7 @@ tape( 'main export is a function', opts, function test( t ) { }); tape( 'the function has an arity of 4', opts, function test( t ) { - t.strictEqual( ssumors.length, 4, 'has expected arity' ); + t.strictEqual( ssumors.length, 4, 'returns expected value' ); t.end(); }); @@ -119,7 +118,7 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); + N = 4; v = ssumors( N, x, 2, 0 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -142,7 +141,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); + N = 4; v = ssumors( N, x, -2, 6 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -176,7 +175,7 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); + N = 4; v = ssumors( N, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ssumors.js b/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ssumors.js index f2c2bf43b422..275aa3635b14 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ssumors.js +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ssumors.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,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var Float32Array = require( '@stdlib/array/float32' ); var ssumors = require( './../lib/ssumors.js' ); @@ -36,7 +35,7 @@ tape( 'main export is a function', function test( t ) { }); tape( 'the function has an arity of 3', function test( t ) { - t.strictEqual( ssumors.length, 3, 'has expected arity' ); + t.strictEqual( ssumors.length, 3, 'returns expected value' ); t.end(); }); @@ -110,7 +109,7 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); + N = 4; v = ssumors( N, x, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -133,7 +132,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); + N = 4; v = ssumors( N, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -171,7 +170,7 @@ 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); + N = 4; v = ssumors( N, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ssumors.native.js b/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ssumors.native.js index 862d2dc95fb2..26570499999c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ssumors.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/test/test.ssumors.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,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -45,7 +44,7 @@ tape( 'main export is a function', opts, function test( t ) { }); tape( 'the function has an arity of 3', opts, function test( t ) { - t.strictEqual( ssumors.length, 3, 'has expected arity' ); + t.strictEqual( ssumors.length, 3, 'returns expected value' ); t.end(); }); @@ -201,7 +200,7 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); + N = 4; v = ssumors( N, x, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -224,7 +223,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); + N = 4; v = ssumors( N, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -262,7 +261,7 @@ 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); + N = 4; v = ssumors( N, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); From e7f6a1c728f0fa0b7e238dcd136cb7506a4767d8 Mon Sep 17 00:00:00 2001 From: Athan Date: Mon, 4 Mar 2024 12:50:44 -0800 Subject: [PATCH 2/6] Apply suggestions from code review Signed-off-by: Athan --- .../@stdlib/blas/ext/base/ssumors/README.md | 2 +- .../benchmark/benchmark.ndarray.native.js | 2 +- .../@stdlib/blas/ext/base/ssumors/docs/repl.txt | 1 - .../@stdlib/blas/ext/base/ssumors/src/addon.c | 17 ++++++++--------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/README.md b/lib/node_modules/@stdlib/blas/ext/base/ssumors/README.md index af6851786f41..1bb2708c2ad7 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/README.md @@ -136,7 +136,7 @@ var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; var filledarrayBy = require( '@stdlib/array/filled-by' ); var ssumors = require( '@stdlib/blas/ext/base/ssumors' ); -var x = filledarrayBy( 10, 'float32', discreteUniform( -100.0, 100.0) ); +var x = filledarrayBy( 10, 'float32', discreteUniform( -100.0, 100.0 ) ); console.log( x ); var v = ssumors( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.ndarray.native.js index 0b4ef48d0518..8ecc9047e1e4 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/benchmark/benchmark.ndarray.native.js @@ -49,7 +49,7 @@ var rand = uniform( -100.0, 100.0 ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x = filledarrayBy( len, 'float32', rand); + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt index d00c0af3730f..d9b9f6460d27 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt @@ -87,7 +87,6 @@ > {{alias}}.ndarray( 3, x, 2, 1 ) -1.0 - See Also -------- diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.c index bd3d943a91a5..0a4363035976 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.c @@ -24,7 +24,6 @@ #include #include - /** * Receives JavaScript callback invocation data. * @@ -33,17 +32,17 @@ * @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); +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 ); napi_value v; - napi_status status = napi_create_double(env, (double)stdlib_strided_ssumors(N, (float *)X, stride), &v); - assert(status == napi_ok); + napi_status status = napi_create_double( env, (double)stdlib_strided_ssumors( N, (float *)X, stride ), &v ); + assert( status == napi_ok ); return v; } -STDLIB_NAPI_MODULE_EXPORT_FCN(addon) +STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) From 2583a2a4c5e24ed9774a4bbe0183a1f99d047f2a Mon Sep 17 00:00:00 2001 From: Athan Date: Mon, 4 Mar 2024 12:52:15 -0800 Subject: [PATCH 3/6] Apply suggestions from code review Signed-off-by: Athan --- .../@stdlib/blas/ext/base/ssumors/src/addon.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.c index 0a4363035976..5555e3ea73e1 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/src/addon.c @@ -33,16 +33,16 @@ * @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 ); + 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 ); - napi_value v; - napi_status status = napi_create_double( env, (double)stdlib_strided_ssumors( N, (float *)X, stride ), &v ); - assert( status == napi_ok ); + napi_value v; + napi_status status = napi_create_double( env, (double)stdlib_strided_ssumors( N, (float *)X, stride ), &v ); + assert( status == napi_ok ); - return v; + return v; } STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) From 77ee4c4f03020894f8bbbfed8702f903aca9b013 Mon Sep 17 00:00:00 2001 From: Athan Date: Mon, 4 Mar 2024 12:53:05 -0800 Subject: [PATCH 4/6] Update repl.txt Signed-off-by: Athan --- .../@stdlib/blas/ext/base/ssumors/docs/repl.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt index d9b9f6460d27..1446e4e653f3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/docs/repl.txt @@ -36,15 +36,13 @@ // Using `N` and `stride` parameters: > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ] ); - > var stride = 2; - > {{alias}}( 3, x, stride ) + > {{alias}}( 3, x, 2 ) 1.0 // Using view offsets: > var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); > var x1 = new {{alias:@stdlib/array/float32}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); - > stride = 2; - > {{alias}}( 3, x1, stride ) + > {{alias}}( 3, x1, 2 ) -1.0 @@ -83,7 +81,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 ] ); + > x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); > {{alias}}.ndarray( 3, x, 2, 1 ) -1.0 From 317f487e8a660ff2bfd310e32db2f88dae6de84d Mon Sep 17 00:00:00 2001 From: Lovelin <100030865+lovelindhoni@users.noreply.github.com> Date: Tue, 5 Mar 2024 07:57:48 +0530 Subject: [PATCH 5/6] chore: switch to 2 space indentation in manifest.json Signed-off-by: Lovelin <100030865+lovelindhoni@users.noreply.github.com> --- .../@stdlib/blas/ext/base/ssumors/manifest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/ssumors/manifest.json index 35005bd24663..8e0904cf83fd 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/manifest.json @@ -1,6 +1,6 @@ { - "options": {}, - "fields": [ + "options": {}, + "fields": [ { "field": "src", "resolve": true, @@ -21,8 +21,8 @@ "resolve": true, "relative": false } - ], - "confs": [ + ], + "confs": [ { "src": [ "./src/ssumors.c" @@ -41,5 +41,5 @@ "stdlib/napi/argv_strided_float32array.h" ] } - ] + ] } From 6c61beda971aac4cf202e7a347f80cec9ae3a1fe Mon Sep 17 00:00:00 2001 From: Philipp Burckhardt Date: Mon, 4 Mar 2024 21:49:02 -0500 Subject: [PATCH 6/6] Fix indentation Signed-off-by: Philipp Burckhardt --- .../blas/ext/base/ssumors/manifest.json | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/ssumors/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/ssumors/manifest.json index 8e0904cf83fd..3b8d23a2712c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/ssumors/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/ssumors/manifest.json @@ -1,45 +1,45 @@ { - "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/ssumors.c" - ], - "include": [ - "./include" - ], - "libraries": [ - "-lm" - ], - "libpath": [], - "dependencies": [ - "stdlib/napi/export.h", - "stdlib/napi/argv.h", - "stdlib/napi/argv_int64.h", - "stdlib/napi/argv_strided_float32array.h" - ] - } - ] + "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/ssumors.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ + "stdlib/napi/export.h", + "stdlib/napi/argv.h", + "stdlib/napi/argv_int64.h", + "stdlib/napi/argv_strided_float32array.h" + ] + } + ] }