Skip to content

Commit 6ebb5c9

Browse files
committed
refactor: use generalized utility
--- type: pre_commit_static_analysis_report description: Results of running static analysis checks when committing changes. report: - task: lint_filenames status: passed - task: lint_editorconfig status: passed - task: lint_markdown status: passed - task: lint_package_json status: na - task: lint_repl_help status: na - task: lint_javascript_src status: passed - task: lint_javascript_cli status: na - task: lint_javascript_examples status: passed - task: lint_javascript_tests status: passed - task: lint_javascript_benchmarks status: na - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: na - task: lint_c_examples status: na - task: lint_c_benchmarks status: na - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: passed - task: lint_typescript_tests status: na - task: lint_license_headers status: passed ---
1 parent 24cd22d commit 6ebb5c9

File tree

5 files changed

+11
-88
lines changed

5 files changed

+11
-88
lines changed

lib/node_modules/@stdlib/ndarray/base/quinary-tiling-block-size/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ The function supports the following arguments:
8585
```javascript
8686
var dtypes = require( '@stdlib/ndarray/dtypes' );
8787
var cartesianPower = require( '@stdlib/array/base/cartesian-power' );
88-
var promotionRules = require( '@stdlib/ndarray/promotion-rules' );
88+
var promoteDataTypes = require( '@stdlib/ndarray/base/promote-dtypes' );
8989
var quinaryBlockSize = require( '@stdlib/ndarray/base/quinary-tiling-block-size' );
9090

9191
// Generate a list of input ndarray dtype quintuplets:
@@ -97,8 +97,8 @@ var b;
9797
var i;
9898
console.log( 'block_size, xdtype, ydtype, zdtype, wdtype, udtype, vdtype' );
9999
for ( i = 0; i < dt.length; i++ ) {
100-
t = promotionRules.apply( null, dt[ i ] );
101-
dt[ i ].push( ( t === -1 ) ? 'generic' : t );
100+
t = promoteDataTypes( dt[ i ] );
101+
dt[ i ].push( ( t === null ) ? 'generic' : t );
102102
b = quinaryBlockSize.apply( null, dt[ i ] );
103103
console.log( '%d, %s, %s, %s, %s, %s, %s', b, dt[i][0], dt[i][1], dt[i][2], dt[i][3], dt[i][4], dt[i][5] );
104104
}

lib/node_modules/@stdlib/ndarray/base/quinary-tiling-block-size/examples/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
var dtypes = require( '@stdlib/ndarray/dtypes' );
2222
var cartesianPower = require( '@stdlib/array/base/cartesian-power' );
23-
var promotionRules = require( '@stdlib/ndarray/promotion-rules' );
23+
var promoteDataTypes = require( '@stdlib/ndarray/base/promote-dtypes' );
2424
var quinaryBlockSize = require( './../lib' );
2525

2626
// Generate a list of input ndarray dtype quintuplets:
@@ -32,8 +32,8 @@ var b;
3232
var i;
3333
console.log( 'block_size, xdtype, ydtype, zdtype, wdtype, udtype, vdtype' );
3434
for ( i = 0; i < dt.length; i++ ) {
35-
t = promotionRules.apply( null, dt[ i ] );
36-
dt[ i ].push( ( t === -1 ) ? 'generic' : t );
35+
t = promoteDataTypes( dt[ i ] );
36+
dt[ i ].push( ( t === null ) ? 'generic' : t );
3737
b = quinaryBlockSize.apply( null, dt[ i ] );
3838
console.log( '%d, %s, %s, %s, %s, %s, %s', b, dt[i][0], dt[i][1], dt[i][2], dt[i][3], dt[i][4], dt[i][5] );
3939
}

lib/node_modules/@stdlib/ndarray/base/quinary-tiling-block-size/lib/defaults.js

Lines changed: 0 additions & 34 deletions
This file was deleted.

lib/node_modules/@stdlib/ndarray/base/quinary-tiling-block-size/lib/main.js

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020

2121
// MODULES //
2222

23-
var bytesPerElement = require( '@stdlib/ndarray/base/bytes-per-element' );
24-
var defaults = require( './defaults.js' );
23+
var blockSize = require( '@stdlib/ndarray/base/tiling-block-size' );
2524

2625

2726
// MAIN //
@@ -42,49 +41,7 @@ var defaults = require( './defaults.js' );
4241
* // returns <number>
4342
*/
4443
function quinaryBlockSize( dtypeX, dtypeY, dtypeZ, dtypeW, dtypeU, dtypeV ) {
45-
var nbx;
46-
var nby;
47-
var nbz;
48-
var nbw;
49-
var nbu;
50-
var nbv;
51-
var max;
52-
53-
nbx = bytesPerElement( dtypeX );
54-
nby = bytesPerElement( dtypeY );
55-
nbz = bytesPerElement( dtypeZ );
56-
nbw = bytesPerElement( dtypeW );
57-
nbu = bytesPerElement( dtypeU );
58-
nbv = bytesPerElement( dtypeV );
59-
if (
60-
nbx === null ||
61-
nby === null ||
62-
nbz === null ||
63-
nbw === null ||
64-
nbu === null ||
65-
nbv === null
66-
) {
67-
// e.g., "generic" arrays
68-
return defaults.BLOCK_SIZE_IN_ELEMENTS;
69-
}
70-
// Find the largest element size among all six arrays...
71-
max = nbx;
72-
if ( nby > max ) {
73-
max = nby;
74-
}
75-
if ( nbz > max ) {
76-
max = nbz;
77-
}
78-
if ( nbw > max ) {
79-
max = nbw;
80-
}
81-
if ( nbu > max ) {
82-
max = nbu;
83-
}
84-
if ( nbv > max ) {
85-
max = nbv;
86-
}
87-
return ( defaults.BLOCK_SIZE_IN_BYTES/max )|0; // asm type annotation
44+
return blockSize( [ dtypeX, dtypeY, dtypeZ, dtypeW, dtypeU, dtypeV ] );
8845
}
8946

9047

lib/node_modules/@stdlib/ndarray/base/quinary-tiling-block-size/test/test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var tape = require( 'tape' );
2424
var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimitive;
2525
var dtypes = require( '@stdlib/ndarray/dtypes' );
2626
var cartesianPower = require( '@stdlib/array/base/cartesian-power' );
27-
var promotionRules = require( '@stdlib/ndarray/promotion-rules' );
27+
var promoteDataTypes = require( '@stdlib/ndarray/base/promote-dtypes' );
2828
var quinaryBlockSize = require( './../lib' );
2929

3030

@@ -48,8 +48,8 @@ tape( 'the function returns a block size', function test( t ) {
4848
dt = cartesianPower( dtypes(), 5 );
4949

5050
for ( i = 0; i < dt.length; i++ ) {
51-
pt = promotionRules.apply( null, dt[ i ] );
52-
dt[ i ].push( ( pt === -1 ) ? 'generic' : pt );
51+
pt = promoteDataTypes( dt[ i ] );
52+
dt[ i ].push( ( pt === null ) ? 'generic' : pt );
5353
v = quinaryBlockSize( dt[ i ][ 0 ], dt[ i ][ 1 ], dt[ i ][ 2 ], dt[ i ][ 3 ], dt[ i ][ 4 ], dt[ i ][ 5 ] ); // eslint-disable-line max-len
5454
t.strictEqual( isPositiveInteger( v ), true, 'returns a positive integer when provided ('+dt[ i ].join( ', ' )+')' );
5555
}

0 commit comments

Comments
 (0)