From a35a92714c6409278f25aa681189934865571252 Mon Sep 17 00:00:00 2001 From: AuenKr Date: Thu, 14 Mar 2024 20:03:45 +0530 Subject: [PATCH 1/6] refactor: update blas/ext/base/dsapxsum to follow current project conventions --- .../@stdlib/blas/ext/base/dsapxsum/README.md | 36 ++--- .../ext/base/dsapxsum/benchmark/benchmark.js | 17 ++- .../dsapxsum/benchmark/benchmark.native.js | 13 +- .../dsapxsum/benchmark/benchmark.ndarray.js | 17 ++- .../benchmark/benchmark.ndarray.native.js | 13 +- .../blas/ext/base/dsapxsum/docs/repl.txt | 16 +-- .../blas/ext/base/dsapxsum/examples/index.js | 13 +- .../blas/ext/base/dsapxsum/include.gypi | 2 +- .../blas/ext/base/dsapxsum/lib/dsapxsum.js | 3 +- .../ext/base/dsapxsum/lib/dsapxsum.native.js | 3 +- .../blas/ext/base/dsapxsum/lib/index.js | 7 +- .../blas/ext/base/dsapxsum/lib/ndarray.js | 4 +- .../ext/base/dsapxsum/lib/ndarray.native.js | 4 +- .../blas/ext/base/dsapxsum/manifest.json | 36 ++++- .../blas/ext/base/dsapxsum/package.json | 4 +- .../blas/ext/base/dsapxsum/src/addon.c | 49 +++++++ .../blas/ext/base/dsapxsum/src/addon.cpp | 130 ------------------ .../ext/base/dsapxsum/test/test.dsapxsum.js | 15 +- .../dsapxsum/test/test.dsapxsum.native.js | 15 +- .../ext/base/dsapxsum/test/test.ndarray.js | 15 +- .../base/dsapxsum/test/test.ndarray.native.js | 15 +- 21 files changed, 153 insertions(+), 274 deletions(-) create mode 100644 lib/node_modules/@stdlib/blas/ext/base/dsapxsum/src/addon.c delete mode 100644 lib/node_modules/@stdlib/blas/ext/base/dsapxsum/src/addon.cpp diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/README.md b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/README.md index 406a7dca47a..f145d06db91 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/README.md @@ -44,9 +44,8 @@ Adds a constant to each single-precision floating-point strided array element an var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -var N = x.length; -var v = dsapxsum( N, 5.0, x, 1 ); +var v = dsapxsum( 3, 5.0, x, 1 ); // returns 16.0 ``` @@ -56,16 +55,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 access every other element in `x`, +The `N` and `stride` parameters determine which elements in the strided array are accessed at runtime. For example, to access 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, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ] ); -var N = floor( x.length / 2 ); -var v = dsapxsum( N, 5.0, x, 2 ); +var v = dsapxsum( 4, 5.0, x, 2 ); // returns 25.0 ``` @@ -75,14 +72,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 = dsapxsum( N, 5.0, x1, 2 ); +var v = dsapxsum( 4, 5.0, x1, 2 ); // returns 25.0 ``` @@ -94,9 +88,8 @@ Adds a constant to each single-precision floating-point strided array element an var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -var N = x.length; -var v = dsapxsum.ndarray( N, 5.0, x, 1, 0 ); +var v = dsapxsum.ndarray( 3, 5.0, x, 1, 0 ); // returns 16.0 ``` @@ -104,16 +97,14 @@ The function has the following additional parameters: - **offset**: starting index for `x`. -While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, the `offset` parameter supports indexing semantics based on a starting index. For example, to access 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 access 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, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -var N = floor( x.length / 2 ); -var v = dsapxsum.ndarray( N, 5.0, x, 2, 1 ); +var v = dsapxsum.ndarray( 4, 5.0, x, 2, 1 ); // returns 25.0 ``` @@ -139,18 +130,11 @@ var v = dsapxsum.ndarray( N, 5.0, 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 dsapxsum = require( '@stdlib/blas/ext/base/dsapxsum' ); -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( 0, 100 ) ); console.log( x ); var v = dsapxsum( x.length, 5.0, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.js index 1bc8431b4cc..87bf2ee909f 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.js @@ -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 dsapxsum = require( './../lib/dsapxsum.js' ); +// VARIABLES // + +var rand = uniform( -10.0, 10.0 ); + + // FUNCTIONS // /** @@ -39,13 +44,7 @@ var dsapxsum = require( './../lib/dsapxsum.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()*20.0 ) - 10.0; - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.native.js index 4877ac1f68e..66defd69e51 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.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,6 +36,7 @@ var dsapxsum = tryRequire( resolve( __dirname, './../lib/dsapxsum.native.js' ) ) var opts = { 'skip': ( dsapxsum instanceof Error ) }; +var rand = uniform( -10.0, 10.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()*20.0 ) - 10.0; - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.ndarray.js index 0a646c147af..6299c00494a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.ndarray.js @@ -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 dsapxsum = require( './../lib/ndarray.js' ); +// VARIABLES // + +var rand = uniform( -10.0, 10.0 ); + + // FUNCTIONS // /** @@ -39,13 +44,7 @@ var dsapxsum = 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()*20.0 ) - 10.0; - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.ndarray.native.js index 6bc4c27d0ab..28c13c39de3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/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,6 +36,7 @@ var dsapxsum = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ); var opts = { 'skip': ( dsapxsum instanceof Error ) }; +var rand = uniform( -10.0, 10.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()*20.0 ) - 10.0; - } + var x = filledarrayBy( len, 'float32', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/docs/repl.txt index a8ef3a36771..2db59660008 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/docs/repl.txt @@ -4,8 +4,8 @@ element and computes the sum using extended accumulation and returning an extended precision result. - 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. @@ -40,19 +40,16 @@ // 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, 5.0, x, stride ) + > {{alias}}( 3, 5.0, x, 2 ) 16.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, 5.0, x1, stride ) + > {{alias}}( 3, 5.0, x1, 2 ) 14.0 + {{alias}}.ndarray( N, alpha, x, stride, offset ) Adds a constant to each single-precision floating-point strided array element and computes the sum using extended accumulation and alternative @@ -93,8 +90,7 @@ // 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, 5.0, x, 2, 1 ) + > {{alias}}.ndarray( 3, 5.0, x, 2, 1 ) 14.0 See Also diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/examples/index.js index 5cc9839becc..aa265f623fe 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/examples/index.js @@ -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 dsapxsum = 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( 0, 100 )); console.log( x ); var v = dsapxsum( x.length, 5.0, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/include.gypi b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/include.gypi index 868c5c12e85..26476a8c265 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/include.gypi +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/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, 4 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_DOUBLE( env, N, argv, 1 ); + STDLIB_NAPI_ARGV_INT64( env, stride, argv, 3 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 2 ); + + napi_value v; + status = napi_create_double( env, stdlib_strided_dsapxsum( N, (float)alpha, (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/dsapxsum/src/addon.cpp b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/src/addon.cpp deleted file mode 100644 index be1bbe59606..00000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/src/addon.cpp +++ /dev/null @@ -1,130 +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/dsapxsum.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_blas_ext_base_dsapxsum { - - /** - * Adds a constant to each single-precision floating-point strided array element and computes the sum using extended accumulation and returning an extended precision result. - * - * ## Notes - * - * - When called from JavaScript, the function expects four arguments: - * - * - `N`: number of indexed elements - * - `alpha`: constant - * - `X`: input array - * - `stride`: stride length - */ - napi_value node_dsapxsum( napi_env env, napi_callback_info info ) { - napi_status status; - - size_t argc = 4; - napi_value argv[ 4 ]; - status = napi_get_cb_info( env, info, &argc, argv, nullptr, nullptr ); - assert( status == napi_ok ); - - if ( argc < 4 ) { - napi_throw_error( env, nullptr, "invalid invocation. Must provide 4 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 res; - status = napi_is_typedarray( env, argv[ 2 ], &res ); - assert( status == napi_ok ); - if ( res == 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; - } - - int64_t N; - status = napi_get_value_int64( env, argv[ 0 ], &N ); - assert( status == napi_ok ); - - double alpha; - status = napi_get_value_double( env, argv[ 1 ], &alpha ); - assert( status == napi_ok ); - - int64_t stride; - status = napi_get_value_int64( env, argv[ 3 ], &stride ); - 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(stride) >= (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_value v; - status = napi_create_double( env, stdlib_strided_dsapxsum( N, (float)alpha, (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_dsapxsum, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_blas_ext_base_dsapxsum diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.dsapxsum.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.dsapxsum.js index 035e7d40d23..017eaf731d7 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.dsapxsum.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.dsapxsum.js @@ -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 dsapxsum = require( './../lib/dsapxsum.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( dsapxsum.length, 4, 'has expected arity' ); + t.strictEqual( dsapxsum.length, 4, 'returns expected value' ); t.end(); }); @@ -103,7 +102,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; @@ -118,15 +116,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dsapxsum( N, 5.0, x, 2 ); + v = dsapxsum( 4, 5.0, x, 2 ); t.strictEqual( v, 25.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; @@ -142,8 +138,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dsapxsum( N, 5.0, x, -2 ); + v = dsapxsum( 4, 5.0, x, -2 ); t.strictEqual( v, 25.0, 'returns expected value' ); @@ -172,7 +167,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([ @@ -188,9 +182,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 = dsapxsum( N, 5.0, x1, 2 ); + v = dsapxsum( 4, 5.0, x1, 2 ); t.strictEqual( v, 25.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.dsapxsum.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.dsapxsum.native.js index 927c98c898a..49f2fc85fac 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.dsapxsum.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.dsapxsum.native.js @@ -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( dsapxsum.length, 4, 'has expected arity' ); + t.strictEqual( dsapxsum.length, 4, 'returns expected value' ); t.end(); }); @@ -221,7 +220,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; @@ -236,15 +234,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dsapxsum( N, 5.0, x, 2 ); + v = dsapxsum( 4, 5.0, x, 2 ); t.strictEqual( v, 25.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; @@ -260,8 +256,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dsapxsum( N, 5.0, x, -2 ); + v = dsapxsum( 4, 5.0, x, -2 ); t.strictEqual( v, 25.0, 'returns expected value' ); @@ -290,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([ @@ -306,9 +300,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 = dsapxsum( N, 5.0, x1, 2 ); + v = dsapxsum( 4, 5.0, x1, 2 ); t.strictEqual( v, 25.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.ndarray.js index 53762d5de58..a0909502021 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.ndarray.js @@ -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 dsapxsum = require( './../lib/ndarray.js' ); @@ -36,7 +35,7 @@ tape( 'main export is a function', function test( t ) { }); tape( 'the function has an arity of 5', function test( t ) { - t.strictEqual( dsapxsum.length, 5, 'has expected arity' ); + t.strictEqual( dsapxsum.length, 5, 'returns expected value' ); t.end(); }); @@ -103,7 +102,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; @@ -118,15 +116,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dsapxsum( N, 5.0, x, 2, 0 ); + v = dsapxsum( 4, 5.0, x, 2, 0 ); t.strictEqual( v, 25.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; @@ -142,8 +138,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dsapxsum( N, 5.0, x, -2, 6 ); + v = dsapxsum( 4, 5.0, x, -2, 6 ); t.strictEqual( v, 25.0, 'returns expected value' ); @@ -170,7 +165,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', function test( t ) { - var N; var x; var v; @@ -184,9 +178,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = dsapxsum( N, 5.0, x, 2, 1 ); + v = dsapxsum( 4, 5.0, x, 2, 1 ); t.strictEqual( v, 25.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.ndarray.native.js index 35bbebbfc1e..59fb184148a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/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 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 5', opts, function test( t ) { - t.strictEqual( dsapxsum.length, 5, 'has expected arity' ); + t.strictEqual( dsapxsum.length, 5, 'returns expected value' ); t.end(); }); @@ -112,7 +111,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; @@ -127,15 +125,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = dsapxsum( N, 5.0, x, 2, 0 ); + v = dsapxsum( 4, 5.0, x, 2, 0 ); t.strictEqual( v, 25.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; @@ -151,8 +147,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dsapxsum( N, 5.0, x, -2, 6 ); + v = dsapxsum( 4, 5.0, x, -2, 6 ); t.strictEqual( v, 25.0, 'returns expected value' ); @@ -179,7 +174,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', opts, function test( t ) { - var N; var x; var v; @@ -193,9 +187,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = dsapxsum( N, 5.0, x, 2, 1 ); + v = dsapxsum( 4, 5.0, x, 2, 1 ); t.strictEqual( v, 25.0, 'returns expected value' ); t.end(); From 1cfa1ea1b722e47198d390f0250aa70946644467 Mon Sep 17 00:00:00 2001 From: AuenKr Date: Thu, 14 Mar 2024 22:19:57 +0530 Subject: [PATCH 2/6] fix: refactor ndarray.native.js file --- .../blas/ext/base/dsapxsum/lib/ndarray.native.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/lib/ndarray.native.js index e7300cca66c..90bafc1bd16 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/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( './dsapxsum.native.js' ); @@ -46,10 +47,9 @@ var addon = require( './dsapxsum.native.js' ); */ function dsapxsum( N, alpha, 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, alpha, view, stride ); } From f64bf054440291682f88b9b048a10820b041fafd Mon Sep 17 00:00:00 2001 From: AuenKr Date: Fri, 15 Mar 2024 21:50:54 +0530 Subject: [PATCH 3/6] fix: fixed indentation issue --- .../blas/ext/base/dsapxsum/manifest.json | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json index 11bcfa18863..58107261f2c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json @@ -1,49 +1,49 @@ { - "options": {}, - "fields": [ - { - "field": "src", - "resolve": true, - "relative": true - }, - { - "field": "include", - "resolve": true, - "relative": true - }, - { - "field": "libraries", - "resolve": false, - "relative": false - }, - { - "field": "libpath", - "resolve": true, - "relative": false - } - ], - "confs": [ - { + "options": {}, + "fields": [ + { + "field": "src", + "resolve": true, + "relative": true + }, + { + "field": "include", + "resolve": true, + "relative": true + }, + { + "field": "libraries", + "resolve": false, + "relative": false + }, + { + "field": "libpath", + "resolve": true, + "relative": false + } + ], + "confs": [ + { "task": "build", - "src": [ - "./src/dsapxsum.c" - ], - "include": [ - "./include" - ], - "libraries": [ - "-lm" - ], - "libpath": [], - "dependencies": [ + "src": [ + "./src/dsapxsum.c" + ], + "include": [ + "./include" + ], + "libraries": [ + "-lm" + ], + "libpath": [], + "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-double", "@stdlib/napi/argv-strided-float32array", - "@stdlib/blas/ext/base/dsapxsumpw" - ] - }, + "@stdlib/blas/ext/base/dsapxsumpw" + ] + }, { "task": "benchmark", "src": [ @@ -72,5 +72,5 @@ "libpath": [], "dependencies": [] } - ] + ] } From 985b655c78a8b73e0737859d0228c54a048fcc3f Mon Sep 17 00:00:00 2001 From: AuenKr Date: Tue, 19 Mar 2024 20:57:52 +0530 Subject: [PATCH 4/6] fix: applied all suggestions --- .../@stdlib/blas/ext/base/dsapxsum/manifest.json | 6 ++++-- lib/node_modules/@stdlib/blas/ext/base/dsapxsum/src/addon.c | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json index 58107261f2c..e35b2ae0e9c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json @@ -1,5 +1,7 @@ { - "options": {}, + "options": { + "task": "build" + }, "fields": [ { "field": "src", @@ -39,7 +41,7 @@ "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", - "@stdlib/napi/argv-double", + "@stdlib/napi/argv-float", "@stdlib/napi/argv-strided-float32array", "@stdlib/blas/ext/base/dsapxsumpw" ] diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/src/addon.c index 8f7d57696b8..2353e1825aa 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/src/addon.c @@ -20,7 +20,7 @@ #include "stdlib/napi/export.h" #include "stdlib/napi/argv.h" #include "stdlib/napi/argv_int64.h" -#include "stdlib/napi/argv_double.h" +#include "stdlib/napi/argv_float.h" #include "stdlib/napi/argv_strided_float32array.h" #include #include @@ -36,12 +36,12 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV( env, info, argv, argc, 4 ); STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); - STDLIB_NAPI_ARGV_DOUBLE( env, N, argv, 1 ); + STDLIB_NAPI_ARGV_FLOAT( env, N, argv, 1 ); STDLIB_NAPI_ARGV_INT64( env, stride, argv, 3 ); STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 2 ); napi_value v; - status = napi_create_double( env, stdlib_strided_dsapxsum( N, (float)alpha, (float *)X, stride ), &v ); + status = napi_create_double( env, stdlib_strided_dsapxsum( N, alpha, X, stride ), &v ); assert( status == napi_ok ); return v; } From f8fbab54f1fd4310aab84f86027204e9597a30de Mon Sep 17 00:00:00 2001 From: AuenKr Date: Thu, 21 Mar 2024 18:27:10 +0530 Subject: [PATCH 5/6] fix: applied suggestion from similar PR --- .../@stdlib/blas/ext/base/dsapxsum/docs/repl.txt | 2 +- .../@stdlib/blas/ext/base/dsapxsum/examples/index.js | 2 +- .../@stdlib/blas/ext/base/dsapxsum/manifest.json | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/docs/repl.txt index 2db59660008..dc49fe91b05 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/docs/repl.txt @@ -89,7 +89,7 @@ 16.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, 5.0, x, 2, 1 ) 14.0 diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/examples/index.js index aa265f623fe..b3278a6935c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/examples/index.js @@ -22,7 +22,7 @@ var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; var filledarrayBy = require( '@stdlib/array/filled-by' ); var dsapxsum = require( './../lib' ); -var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 )); +var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) ); console.log( x ); var v = dsapxsum( x.length, 5.0, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json index e35b2ae0e9c..5949d551813 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json @@ -58,7 +58,9 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/ext/base/dsapxsumpw" + ] }, { "task": "examples", @@ -72,7 +74,9 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/ext/base/dsapxsumpw" + ] } ] } From 4f3296af1b22f9d5d404b4be770fcdb669831af4 Mon Sep 17 00:00:00 2001 From: Philipp Burckhardt Date: Thu, 21 Mar 2024 09:16:26 -0400 Subject: [PATCH 6/6] Apply suggestions from code review Signed-off-by: Philipp Burckhardt --- lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json index 5949d551813..876f14a2ca3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dsapxsum/manifest.json @@ -49,7 +49,7 @@ { "task": "benchmark", "src": [ - "./src/dcusum.c" + "./src/dsapxsum.c" ], "include": [ "./include" @@ -65,7 +65,7 @@ { "task": "examples", "src": [ - "./src/dcusum.c" + "./src/dsapxsum.c" ], "include": [ "./include"