diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdssum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/sdssum/benchmark/benchmark.js index 45ad56d28e32..7f95b2d2d203 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdssum/benchmark/benchmark.js @@ -21,14 +21,18 @@ // 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 sdssum = require( './../lib/sdssum.js' ); +// VARIABLES // + +var rand = uniform( -100.0, 100.0 ); // FUNCTIONS // /** @@ -39,13 +43,7 @@ var sdssum = require( './../lib/sdssum.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/sdssum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdssum/benchmark/benchmark.native.js index 9fc27ec9a9df..5f012d96e172 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdssum/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 sdssum = tryRequire( resolve( __dirname, './../lib/sdssum.native.js' ) ); var opts = { 'skip': ( sdssum 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/sdssum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdssum/benchmark/benchmark.ndarray.js index 47369512a264..37d236c32d4b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdssum/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 sdssum = require( './../lib/ndarray.js' ); +// VARIABLES // + +var rand = uniform( -100.0, 100.0 ); + + // FUNCTIONS // /** @@ -39,13 +44,7 @@ var sdssum = 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/sdssum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdssum/benchmark/benchmark.ndarray.native.js index 5c1eabd5195b..77a8c7dc9296 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdssum/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,8 +36,7 @@ var sdssum = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ); var opts = { 'skip': ( sdssum instanceof Error ) }; - - +var rand = uniform( -100.0, 100.0 ); // FUNCTIONS // /** @@ -48,13 +47,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/sdssum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/sdssum/examples/index.js index de37a237b1fa..6830497ba4fe 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdssum/examples/index.js @@ -18,19 +18,12 @@ '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 sdssum = 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, 'float64', discreteUniform( -100, 100 ) ); console.log( x ); - var v = sdssum( x.length, x, 1 ); console.log( v ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdssum/include.gypi b/lib/node_modules/@stdlib/blas/ext/base/sdssum/include.gypi index 868c5c12e852..26476a8c2655 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/include.gypi +++ b/lib/node_modules/@stdlib/blas/ext/base/sdssum/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, strideX, argv, 2); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY(env, X, N, strideX, argv, 1); + + napi_value v; + napi_status status = napi_create_double(env, c_sdssum(N, (float *)X, strideX), &v); + assert(status == napi_ok); + + return v; +} +STDLIB_NAPI_MODULE_EXPORT_FCN(addon) diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdssum/src/addon.cpp b/lib/node_modules/@stdlib/blas/ext/base/sdssum/src/addon.cpp deleted file mode 100644 index 430e6989a8a9..000000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/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/sdssum.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_blas_ext_base_sdssum { - - /** - * Computes the sum of single-precision floating-point strided array elements using extended accumulation. - * - * ## Notes - * - * - When called from JavaScript, the function expects three arguments: - * - * - `N`: number of indexed elements - * - `X`: input array - * - `stride`: stride length - */ - napi_value node_sdssum( 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_sdssum( 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_sdssum, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_blas_ext_base_sdssum diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.ndarray.js index 104dfe998dd7..36a5f18bf332 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdssum/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 sdssum = 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( sdssum.length, 4, 'has expected arity' ); + t.strictEqual( sdssum.length, 4, 'returns expected value' ); t.end(); }); @@ -118,7 +117,7 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); + N = 2; v = sdssum( N, x, 2, 0 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -142,7 +141,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); + N = 2; v = sdssum( N, x, -2, 6 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -184,7 +183,7 @@ tape( 'the function supports an `offset` parameter', function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); + N = 3; v = sdssum( N, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.ndarray.native.js index 0f15411fbc47..b89420008031 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdssum/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 4', opts, function test( t ) { - t.strictEqual( sdssum.length, 4, 'has expected arity' ); + t.strictEqual( sdssum.length, 4, 'returns expected value' ); t.end(); }); @@ -127,7 +126,7 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); + N = 2; v = sdssum( N, x, 2, 0 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -151,7 +150,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); + N = 2; v = sdssum( N, x, -2, 6 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -193,7 +192,7 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); + N = 3; v = sdssum( N, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.sdssum.js b/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.sdssum.js index e021071a69a7..d7da7765d991 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.sdssum.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.sdssum.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 sdssum = require( './../lib/sdssum.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( sdssum.length, 3, 'has expected arity' ); + t.strictEqual( sdssum.length, 3, 'returns expected value' ); t.end(); }); @@ -118,7 +117,7 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); + N = 3; v = sdssum( N, x, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.sdssum.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.sdssum.native.js index d4768789037f..2b1150b4adb5 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.sdssum.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sdssum/test/test.sdssum.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' ); @@ -209,7 +208,7 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); + N = 3; v = sdssum( N, x, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -233,7 +232,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); + N = 2; v = sdssum( N, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -279,7 +278,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 = 3; v = sdssum( N, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' );