Merge branch 'feat/base-ndarray-where' of https://github.com/LoayAhmed304/stdlib into feat/base-ndarray-where

Author: LoayAhmed304

lib/node_modules/@stdlib/ndarray/base/where/benchmark/benchmark.11d_columnmajor.js

@@ -49,15 +49,17 @@ var order = 'column-major';
 * @private
 * @param {PositiveInteger} len - ndarray length
 * @param {NonNegativeIntegerArray} shape - ndarray shape
-* @param {string} xtype - first input ndarray data type
-* @param {string} ytype - second input ndarray data type
+* @param {string} ctype - first input ndarray data type
+* @param {string} xtype - second input ndarray data type
+* @param {string} ytype - third input ndarray data type
+* @param {string} otype - output ndarray data type
 * @returns {Function} benchmark function
 */
 function createBenchmark( len, shape, ctype, xtype, ytype, otype ) {
 	var condition;
+	var out;
 	var x;
 	var y;
-	var out;
 
 	condition = filledarrayBy( len, ctype, bernoulli( 0.5 ) );
 	x = filledarrayBy( len, xtype, discreteUniform( -100, 100 ) );

lib/node_modules/@stdlib/ndarray/base/where/benchmark/benchmark.11d_rowmajor.js

@@ -49,15 +49,17 @@ var order = 'row-major';
 * @private
 * @param {PositiveInteger} len - ndarray length
 * @param {NonNegativeIntegerArray} shape - ndarray shape
-* @param {string} xtype - first input ndarray data type
-* @param {string} ytype - second input ndarray data type
+* @param {string} ctype - first input ndarray data type
+* @param {string} xtype - second input ndarray data type
+* @param {string} ytype - third input ndarray data type
+* @param {string} otype - output ndarray data type
 * @returns {Function} benchmark function
 */
 function createBenchmark( len, shape, ctype, xtype, ytype, otype ) {
 	var condition;
+	var out;
 	var x;
 	var y;
-	var out;
 
 	condition = filledarrayBy( len, ctype, bernoulli( 0.5 ) );
 	x = filledarrayBy( len, xtype, discreteUniform( -100, 100 ) );

lib/node_modules/@stdlib/ndarray/base/where/benchmark/benchmark.1d_columnmajor.js

@@ -25,8 +25,6 @@ var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
 var bernoulli = require( '@stdlib/random/base/bernoulli' ).factory;
 var isnan = require( '@stdlib/math/base/assert/is-nan' );
 var pow = require( '@stdlib/math/base/special/pow' );
-var floor = require( '@stdlib/math/base/special/floor' );
-var sqrt = require( '@stdlib/math/base/special/sqrt' );
 var filledarray = require( '@stdlib/array/filled' );
 var filledarrayBy = require( '@stdlib/array/filled-by' );
 var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );

lib/node_modules/@stdlib/ndarray/base/where/benchmark/benchmark.1d_rowmajor.js

@@ -25,8 +25,6 @@ var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
 var bernoulli = require( '@stdlib/random/base/bernoulli' ).factory;
 var isnan = require( '@stdlib/math/base/assert/is-nan' );
 var pow = require( '@stdlib/math/base/special/pow' );
-var floor = require( '@stdlib/math/base/special/floor' );
-var sqrt = require( '@stdlib/math/base/special/sqrt' );
 var filledarray = require( '@stdlib/array/filled' );
 var filledarrayBy = require( '@stdlib/array/filled-by' );
 var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );

lib/node_modules/@stdlib/ndarray/base/where/benchmark/benchmark.2d_rowmajor_accessors.js

@@ -35,7 +35,6 @@ var pkg = require( './../package.json' ).name;
 var where2d = require( './../lib/2d_accessors.js' );
 
 
-
 // VARIABLES //
 
 var conditionTypes = [ 'uint8' ];

lib/node_modules/@stdlib/ndarray/base/where/benchmark/benchmark.2d_rowmajor_accessors_complex.js

@@ -36,7 +36,6 @@ var pkg = require( './../package.json' ).name;
 var where2d = require( './../lib/2d_accessors.js' );
 
 
-
 // VARIABLES //
 
 var conditionTypes = [ 'bool' ];
@@ -104,10 +103,12 @@ function createBenchmark( len, shape, ctype, xtype, ytype, otype ) {
 	ybuf = filledarrayBy( len*2, abtype[ ytype ], discreteUniform( -100, 100 ) );
 	obuf = filledarray( 0.0, len*2, abtype[ otype ] );
 
-	stride = shape2strides( shape, order );
 	// broadcast extra dimension along last axis for the condition array for complex compatibility.
-	cshape = [ ...shape, 2 ];
-	cstrides = [ ...stride, 0 ];
+	stride = shape2strides( shape, order );
+	cshape = shape.slice();
+	cshape.push( 1 );
+	cstrides = stride.slice();
+	cstrides.push( 0 );
 	condition = {
 		'dtype': ctype,
 		'data': new ( ctors( ctype ) )( cbuf.buffer ),

lib/node_modules/@stdlib/ndarray/base/where/benchmark/benchmark.3d_blocked_columnmajor.js

@@ -50,15 +50,17 @@ var order = 'column-major';
 * @private
 * @param {PositiveInteger} len - ndarray length
 * @param {NonNegativeIntegerArray} shape - ndarray shape
-* @param {string} xtype - first input ndarray data type
-* @param {string} ytype - second input ndarray data type
+* @param {string} ctype - first input ndarray data type
+* @param {string} xtype - second input ndarray data type
+* @param {string} ytype - third input ndarray data type
+* @param {string} otype - output ndarray data type
 * @returns {Function} benchmark function
 */
 function createBenchmark( len, shape, ctype, xtype, ytype, otype ) {
 	var condition;
+	var out;
 	var x;
 	var y;
-	var out;
 
 	condition = filledarrayBy( len, ctype, bernoulli( 0.5 ) );
 	x = filledarrayBy( len, xtype, discreteUniform( -100, 100 ) );

lib/node_modules/@stdlib/ndarray/base/where/benchmark/benchmark.3d_blocked_rowmajor.js

@@ -50,15 +50,17 @@ var order = 'row-major';
 * @private
 * @param {PositiveInteger} len - ndarray length
 * @param {NonNegativeIntegerArray} shape - ndarray shape
-* @param {string} xtype - first input ndarray data type
-* @param {string} ytype - second input ndarray data type
+* @param {string} ctype - first input ndarray data type
+* @param {string} xtype - second input ndarray data type
+* @param {string} ytype - third input ndarray data type
+* @param {string} otype - output ndarray data type
 * @returns {Function} benchmark function
 */
 function createBenchmark( len, shape, ctype, xtype, ytype, otype ) {
 	var condition;
+	var out;
 	var x;
 	var y;
-	var out;
 
 	condition = filledarrayBy( len, ctype, bernoulli( 0.5 ) );
 	x = filledarrayBy( len, xtype, discreteUniform( -100, 100 ) );

lib/node_modules/@stdlib/ndarray/base/where/benchmark/benchmark.3d_columnmajor.js

@@ -50,15 +50,17 @@ var order = 'column-major';
 * @private
 * @param {PositiveInteger} len - ndarray length
 * @param {NonNegativeIntegerArray} shape - ndarray shape
-* @param {string} xtype - first input ndarray data type
-* @param {string} ytype - second input ndarray data type
+* @param {string} ctype - first input ndarray data type
+* @param {string} xtype - second input ndarray data type
+* @param {string} ytype - third input ndarray data type
+* @param {string} otype - output ndarray data type
 * @returns {Function} benchmark function
 */
 function createBenchmark( len, shape, ctype, xtype, ytype, otype ) {
 	var condition;
+	var out;
 	var x;
 	var y;
-	var out;
 
 	condition = filledarrayBy( len, ctype, bernoulli( 0.5 ) );
 	x = filledarrayBy( len, xtype, discreteUniform( -100, 100 ) );

lib/node_modules/@stdlib/ndarray/base/where/benchmark/benchmark.3d_rowmajor.js

@@ -50,15 +50,17 @@ var order = 'row-major';
 * @private
 * @param {PositiveInteger} len - ndarray length
 * @param {NonNegativeIntegerArray} shape - ndarray shape
-* @param {string} xtype - first input ndarray data type
-* @param {string} ytype - second input ndarray data type
+* @param {string} ctype - first input ndarray data type
+* @param {string} xtype - second input ndarray data type
+* @param {string} ytype - third input ndarray data type
+* @param {string} otype - output ndarray data type
 * @returns {Function} benchmark function
 */
 function createBenchmark( len, shape, ctype, xtype, ytype, otype ) {
 	var condition;
+	var out;
 	var x;
 	var y;
-	var out;
 
 	condition = filledarrayBy( len, ctype, bernoulli( 0.5 ) );
 	x = filledarrayBy( len, xtype, discreteUniform( -100, 100 ) );
@@ -108,7 +110,6 @@ function createBenchmark( len, shape, ctype, xtype, ytype, otype ) {
 	function benchmark( b ) {
 		var i;
 
-
 		b.tic();
 		console.log(b.iterations);
 		for ( i = 0; i < b.iterations; i++ ) {
@@ -163,7 +164,7 @@ function main() {
 				sh = [ len/2, 2, 1 ];
 				f = createBenchmark( len, sh, tc, t1, t2, t3 );
 				bench( format( '%s:ndims=%d,len=%d,shape=[%s],order=%s,ctype=%s,xtype=%s,ytype=%s,otype=%s', pkg, sh.length, len, sh.join( ',' ), order, tc, t1, t2, t3 ), f );
-				console.log("Finished first benchmark");
+
 				sh = [ 1, 2, len/2 ];
 				f = createBenchmark( len, sh, tc, t1, t2, t3 );
 				bench( format( '%s:ndims=%d,len=%d,shape=[%s],order=%s,ctype=%s,xtype=%s,ytype=%s,otype=%s', pkg, sh.length, len, sh.join( ',' ), order, tc, t1, t2, t3 ), f );