diff --git a/CHANGELOG.md b/CHANGELOG.md index 13c7e9c13..b7db44d59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@
-## Unreleased (2024-08-18) +## Unreleased (2024-09-02)
@@ -62,10 +62,12 @@ ### Contributors -A total of 2 people contributed to this release. Thank you to the following contributors: +A total of 4 people contributed to this release. Thank you to the following contributors: - Aman Bhansali - Athan Reines +- Philipp Burckhardt +- yaswanth
@@ -77,6 +79,8 @@ A total of 2 people contributed to this release. Thank you to the following cont
+- [`e9f4e07`](https://github.com/stdlib-js/stdlib/commit/e9f4e0759a14b8da93d4e0837b886d8ed56bc696) - **refactor:** update `blas/ext/base/dsnansumpw` to follow current conventions _(by yaswanth, Philipp Burckhardt)_ +- [`e0cef99`](https://github.com/stdlib-js/stdlib/commit/e0cef995e884021db3001dc1a3cfef0ca7b368c2) - **style:** remove extra spaces for regular expressions in publish script _(by Philipp Burckhardt)_ - [`da12183`](https://github.com/stdlib-js/stdlib/commit/da121832eca80c36e1e32929e994fef44ca8a4cc) - **feat:** add `blas/base/dspr` [(#2794)](https://github.com/stdlib-js/stdlib/pull/2794) _(by Aman Bhansali, Athan Reines)_
diff --git a/base/dgemm/README.md b/base/dgemm/README.md index d63b585e9..37a124e79 100644 --- a/base/dgemm/README.md +++ b/base/dgemm/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the matrix-matrix operation `C = α*op(A)*op(B) + β*C` where `op(X)` is one of the `op(X) = X`, or `op(X) = X^T`. -
+
## Usage diff --git a/base/dgemv/README.md b/base/dgemv/README.md index f3b302f27..ab38a7abd 100644 --- a/base/dgemv/README.md +++ b/base/dgemv/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform one of the matrix-vector operations `y = α*A*x + β*y` or `y = α*A**T*x + β*y`. -
+
## Usage diff --git a/base/dspmv/README.md b/base/dspmv/README.md index 2b2aa9725..a219c0bac 100644 --- a/base/dspmv/README.md +++ b/base/dspmv/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the matrix-vector operation `y = α*A*x + β*y` where `α` and `β` are scalars, `x` and `y` are `N` element vectors and, `A` is an `N` by `N` symmetric matrix supplied in packed form. -
+
## Usage diff --git a/base/dspr/README.md b/base/dspr/README.md index 9c5443124..eb930c6c6 100644 --- a/base/dspr/README.md +++ b/base/dspr/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the symmetric rank 1 operation `A = α*x*x^T + A`. -
+
## Usage diff --git a/base/dsymv/README.md b/base/dsymv/README.md index 4168a81bd..01a45f257 100644 --- a/base/dsymv/README.md +++ b/base/dsymv/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the matrix-vector operation `y = α*A*x + β*y` where `α` and `β` are scalars, `x` and `y` are `N` element vectors, and `A` is an `N` by `N` symmetric matrix. -
+
## Usage diff --git a/base/dsyr/README.md b/base/dsyr/README.md index 988613098..62b1b6179 100644 --- a/base/dsyr/README.md +++ b/base/dsyr/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the symmetric rank 1 operation `A = α*x*x^T + A`. -
+
## Usage diff --git a/base/dsyr2/README.md b/base/dsyr2/README.md index ca0868250..a94a443ea 100644 --- a/base/dsyr2/README.md +++ b/base/dsyr2/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the symmetric rank 2 operation `A = α*x*y^T + α*y*x^T + A`. -
+
## Usage diff --git a/base/dtrmv/README.md b/base/dtrmv/README.md index 5a4f30f9a..67c35dd7c 100644 --- a/base/dtrmv/README.md +++ b/base/dtrmv/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform one of the matrix-vector operations `x = A*x` or `x = A^T*x`. -
+
## Usage diff --git a/base/dtrsv/README.md b/base/dtrsv/README.md index acc57ba98..0a8cd0d23 100644 --- a/base/dtrsv/README.md +++ b/base/dtrsv/README.md @@ -22,7 +22,7 @@ limitations under the License. > Solve one of the systems of equations `A*x = b` or `A^T*x = b`. -
+
## Usage diff --git a/base/sgemm/README.md b/base/sgemm/README.md index d5970688d..e3356fcba 100644 --- a/base/sgemm/README.md +++ b/base/sgemm/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the matrix-matrix operation `C = α*op(A)*op(B) + β*C` where `op(X)` is one of the `op(X) = X`, or `op(X) = X^T`. -
+
## Usage diff --git a/base/sgemv/README.md b/base/sgemv/README.md index e445a2524..3a65df1b8 100644 --- a/base/sgemv/README.md +++ b/base/sgemv/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform one of the matrix-vector operations `y = α*A*x + β*y` or `y = α*A^T*x + β*y`. -
+
## Usage diff --git a/base/sspmv/README.md b/base/sspmv/README.md index d302ac8e5..ccf70b261 100644 --- a/base/sspmv/README.md +++ b/base/sspmv/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the matrix-vector operation `y = α*A*x + β*y` where `α` and `β` are scalars, `x` and `y` are `N` element vectors and, `A` is an `N` by `N` symmetric matrix supplied in packed form. -
+
## Usage diff --git a/base/sspr/README.md b/base/sspr/README.md index af54f711f..7e5a6511d 100644 --- a/base/sspr/README.md +++ b/base/sspr/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the symmetric rank 1 operation `A = α*x*x^T + A`. -
+
## Usage diff --git a/base/ssymv/README.md b/base/ssymv/README.md index 0acda8012..5d9e8c040 100644 --- a/base/ssymv/README.md +++ b/base/ssymv/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the matrix-vector operation `y = α*A*x + β*y` where `α` and `β` are scalars, `x` and `y` are `N` element vectors, and `A` is an `N` by `N` symmetric matrix. -
+
## Usage diff --git a/base/ssyr/README.md b/base/ssyr/README.md index 7e9c68911..4b9c40a8a 100644 --- a/base/ssyr/README.md +++ b/base/ssyr/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the symmetric rank 1 operation `A = α*x*x**T + A`. -
+
## Usage diff --git a/base/ssyr2/README.md b/base/ssyr2/README.md index 1901c5737..ec57dfc1c 100644 --- a/base/ssyr2/README.md +++ b/base/ssyr2/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform the symmetric rank 2 operation `A = α*x*y^T + α*y*x^T + A`. -
+
## Usage diff --git a/base/strmv/README.md b/base/strmv/README.md index 40138deb6..0f88ca758 100644 --- a/base/strmv/README.md +++ b/base/strmv/README.md @@ -22,7 +22,7 @@ limitations under the License. > Perform one of the matrix-vector operations `x = A*x` or `x = A^T*x`. -
+
## Usage diff --git a/base/strsv/README.md b/base/strsv/README.md index 7505430df..35278437b 100644 --- a/base/strsv/README.md +++ b/base/strsv/README.md @@ -22,7 +22,7 @@ limitations under the License. > Solve one of the systems of equations `A*x = b` or `A^T*x = b`. -
+
## Usage diff --git a/ext/base/dsnansumpw/README.md b/ext/base/dsnansumpw/README.md index 8bae2dd0a..731d6df06 100644 --- a/ext/base/dsnansumpw/README.md +++ b/ext/base/dsnansumpw/README.md @@ -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, NaN, -7.0, NaN, 3.0, 4.0, 2.0 ] ); -var N = floor( x.length / 2 ); -var v = dsnansumpw( N, x, 2 ); +var v = dsnansumpw( 4, x, 2 ); // returns 5.0 ``` @@ -75,14 +73,11 @@ Note that indexing is relative to the first index. To introduce an offset, use [ ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x0 = new Float32Array( [ 2.0, 1.0, NaN, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element -var N = floor( x0.length / 2 ); - -var v = dsnansumpw( N, x1, 2 ); +var v = dsnansumpw( 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, NaN, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -var N = floor( x.length / 2 ); -var v = dsnansumpw.ndarray( N, x, 2, 1 ); +var v = dsnansumpw.ndarray( 4, x, 2, 1 ); // returns 5.0 ``` @@ -139,22 +132,19 @@ var v = dsnansumpw.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' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var dsnansumpw = require( '@stdlib/blas/ext/base/dsnansumpw' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = round( randu()*100.0 ); +function rand() { + if ( bernoulli( 0.8 ) > 0 ) { + return NaN; } + return discreteUniform( 0, 100 ); } + +var x = filledarrayBy( 10, 'float32', rand ); console.log( x ); var v = dsnansumpw( x.length, x, 1 ); diff --git a/ext/base/dsnansumpw/benchmark/benchmark.js b/ext/base/dsnansumpw/benchmark/benchmark.js index 3fa9f530c..189a4dc4c 100644 --- a/ext/base/dsnansumpw/benchmark/benchmark.js +++ b/ext/base/dsnansumpw/benchmark/benchmark.js @@ -21,10 +21,11 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var pkg = require( './../package.json' ).name; var dsnansumpw = require( './../lib/dsnansumpw.js' ); @@ -39,18 +40,15 @@ var dsnansumpw = require( './../lib/dsnansumpw.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float32', rand ); + return benchmark; - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.8 ) > 0 ) { + return NaN; } + return uniform( -10, 10 ); } - return benchmark; function benchmark( b ) { var v; diff --git a/ext/base/dsnansumpw/benchmark/benchmark.native.js b/ext/base/dsnansumpw/benchmark/benchmark.native.js index c9ca264d7..99559b0f4 100644 --- a/ext/base/dsnansumpw/benchmark/benchmark.native.js +++ b/ext/base/dsnansumpw/benchmark/benchmark.native.js @@ -22,10 +22,11 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -48,18 +49,15 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float32', rand ); + return benchmark; - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.8 ) > 0 ) { + return NaN; } + return uniform( -10, 10 ); } - return benchmark; function benchmark( b ) { var v; diff --git a/ext/base/dsnansumpw/benchmark/benchmark.ndarray.js b/ext/base/dsnansumpw/benchmark/benchmark.ndarray.js index eca454fd1..1312a749f 100644 --- a/ext/base/dsnansumpw/benchmark/benchmark.ndarray.js +++ b/ext/base/dsnansumpw/benchmark/benchmark.ndarray.js @@ -21,10 +21,11 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var pkg = require( './../package.json' ).name; var dsnansumpw = require( './../lib/ndarray.js' ); @@ -39,18 +40,15 @@ var dsnansumpw = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float32', rand ); + return benchmark; - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.8 ) > 0 ) { + return NaN; } + return uniform( -10, 10 ); } - return benchmark; function benchmark( b ) { var v; diff --git a/ext/base/dsnansumpw/benchmark/benchmark.ndarray.native.js b/ext/base/dsnansumpw/benchmark/benchmark.ndarray.native.js index 1313a66d4..80823aabf 100644 --- a/ext/base/dsnansumpw/benchmark/benchmark.ndarray.native.js +++ b/ext/base/dsnansumpw/benchmark/benchmark.ndarray.native.js @@ -22,10 +22,11 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -48,18 +49,15 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; + var x = filledarrayBy( len, 'float32', rand ); + return benchmark; - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*10.0 ) - 20.0; + function rand() { + if ( bernoulli( 0.8 ) > 0 ) { + return NaN; } + return uniform( -10, 10 ); } - return benchmark; function benchmark( b ) { var v; diff --git a/ext/base/dsnansumpw/docs/repl.txt b/ext/base/dsnansumpw/docs/repl.txt index 415b18ec3..18a09d034 100644 --- a/ext/base/dsnansumpw/docs/repl.txt +++ b/ext/base/dsnansumpw/docs/repl.txt @@ -4,8 +4,8 @@ ignoring `NaN` values, using pairwise summation with 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. @@ -37,19 +37,16 @@ // Using `N` and `stride` parameters: > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0, NaN, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > var stride = 2; - > {{alias}}( N, x, stride ) + > {{alias}}( 4, x, 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, NaN, NaN ] ); > var x1 = new {{alias:@stdlib/array/float32}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); - > N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 ); - > stride = 2; - > {{alias}}( N, x1, stride ) + > {{alias}}( 4, x1, 2 ) -1.0 + {{alias}}.ndarray( N, x, stride, offset ) Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using pairwise summation with extended @@ -87,8 +84,7 @@ // Using offset parameter: > var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, x, 2, 1 ) + > {{alias}}.ndarray( 4, x, 2, 1 ) -1.0 See Also diff --git a/ext/base/dsnansumpw/examples/index.js b/ext/base/dsnansumpw/examples/index.js index 311997caf..797acd7d3 100644 --- a/ext/base/dsnansumpw/examples/index.js +++ b/ext/base/dsnansumpw/examples/index.js @@ -18,22 +18,19 @@ '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' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var dsnansumpw = require( './../lib' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = round( randu()*100.0 ); +function rand() { + if ( bernoulli( 0.8 ) > 0 ) { + return NaN; } + return discreteUniform( 0, 100 ); } + +var x = filledarrayBy( 10, 'float32', rand ); console.log( x ); var v = dsnansumpw( x.length, x, 1 ); diff --git a/ext/base/dsnansumpw/include.gypi b/ext/base/dsnansumpw/include.gypi index 868c5c12e..26476a8c2 100644 --- a/ext/base/dsnansumpw/include.gypi +++ b/ext/base/dsnansumpw/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', ' +#include + +/** +* Receives JavaScript callback invocation data. +* +* @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, stdlib_strided_dsnansumpw( N, X, stride ), &v ); + assert( status == napi_ok ); + + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) diff --git a/ext/base/dsnansumpw/src/addon.cpp b/ext/base/dsnansumpw/src/addon.cpp deleted file mode 100644 index 15f765180..000000000 --- a/ext/base/dsnansumpw/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/dsnansumpw.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_blas_ext_base_dsnansumpw { - - /** - * Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using pairwise summation with extended accumulation, and returning an extended precision result. - * - * ## Notes - * - * - When called from JavaScript, the function expects three arguments: - * - * - `N`: number of indexed elements - * - `X`: input array - * - `stride`: stride length - */ - napi_value node_dsnansumpw( 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, stdlib_strided_dsnansumpw( 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_dsnansumpw, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_blas_ext_base_dsnansumpw diff --git a/ext/base/dsnansumpw/test/test.dsnansumpw.js b/ext/base/dsnansumpw/test/test.dsnansumpw.js index d5a939f81..1ae603873 100644 --- a/ext/base/dsnansumpw/test/test.dsnansumpw.js +++ b/ext/base/dsnansumpw/test/test.dsnansumpw.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float32Array = require( '@stdlib/array/float32' ); var dsnansumpw = require( './../lib/dsnansumpw.js' ); @@ -125,7 +124,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -142,15 +140,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dsnansumpw( N, x, 2 ); + v = dsnansumpw( 5, x, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; var i; @@ -168,8 +164,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dsnansumpw( N, x, -2 ); + v = dsnansumpw( 5, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -198,7 +193,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports view offsets', function test( t ) { var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -216,9 +210,8 @@ tape( 'the function supports view offsets', function test( t ) { ]); x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = dsnansumpw( N, x1, 2 ); + v = dsnansumpw( 5, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/ext/base/dsnansumpw/test/test.dsnansumpw.native.js b/ext/base/dsnansumpw/test/test.dsnansumpw.native.js index 29651021e..03b587912 100644 --- a/ext/base/dsnansumpw/test/test.dsnansumpw.native.js +++ b/ext/base/dsnansumpw/test/test.dsnansumpw.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -216,7 +215,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -233,15 +231,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dsnansumpw( N, x, 2 ); + v = dsnansumpw( 5, x, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; var i; @@ -259,8 +255,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dsnansumpw( N, x, -2 ); + v = dsnansumpw( 5, x, -2 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -289,7 +284,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports view offsets', opts, function test( t ) { var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -307,9 +301,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 = dsnansumpw( N, x1, 2 ); + v = dsnansumpw( 5, x1, 2 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/ext/base/dsnansumpw/test/test.ndarray.js b/ext/base/dsnansumpw/test/test.ndarray.js index bca0b353b..e964f47e1 100644 --- a/ext/base/dsnansumpw/test/test.ndarray.js +++ b/ext/base/dsnansumpw/test/test.ndarray.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float32Array = require( '@stdlib/array/float32' ); var dsnansumpw = require( './../lib/ndarray.js' ); @@ -125,7 +124,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -142,15 +140,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dsnansumpw( N, x, 2, 0 ); + v = dsnansumpw( 5, x, 2, 0 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; var i; @@ -168,8 +164,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dsnansumpw( N, x, -2, 8 ); + v = dsnansumpw( 5, x, -2, 8 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -196,7 +191,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', function test( t ) { - var N; var x; var v; @@ -212,9 +206,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = dsnansumpw( N, x, 2, 1 ); + v = dsnansumpw( 5, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); diff --git a/ext/base/dsnansumpw/test/test.ndarray.native.js b/ext/base/dsnansumpw/test/test.ndarray.native.js index 2ae15f6df..ce60a1071 100644 --- a/ext/base/dsnansumpw/test/test.ndarray.native.js +++ b/ext/base/dsnansumpw/test/test.ndarray.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); @@ -134,7 +133,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -151,15 +149,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dsnansumpw( N, x, 2, 0 ); + v = dsnansumpw( 5, x, 2, 0 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; var i; @@ -177,8 +173,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dsnansumpw( N, x, -2, 8 ); + v = dsnansumpw( 5, x, -2, 8 ); t.strictEqual( v, 5.0, 'returns expected value' ); @@ -205,7 +200,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', opts, function test( t ) { - var N; var x; var v; @@ -221,9 +215,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = dsnansumpw( N, x, 2, 1 ); + v = dsnansumpw( 5, x, 2, 1 ); t.strictEqual( v, 5.0, 'returns expected value' ); t.end();