Skip to content

Commit fad9fc8

Browse files
authored
bench: refactor to use string interpolation in ndarray/base/fill
PR-URL: #11058 Ref: #8647 Reviewed-by: Athan Reines <kgryte@gmail.com>
1 parent dd9e9c9 commit fad9fc8

38 files changed

+148
-146
lines changed

lib/node_modules/@stdlib/ndarray/base/fill/benchmark/benchmark.10d_columnmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2727
var floor = require( '@stdlib/math/base/special/floor' );
2828
var filledarrayBy = require( '@stdlib/array/filled-by' );
2929
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
30+
var format = require( '@stdlib/string/format' );
3031
var pkg = require( './../package.json' ).name;
3132
var fill = require( './../lib' );
3233

@@ -115,17 +116,16 @@ function main() {
115116

116117
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1 ];
117118
f = createBenchmark( len, sh, t1 );
118-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
119+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
119120

120121
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
121122
f = createBenchmark( len, sh, t1 );
122-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
123-
123+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
124124
len = floor( pow( len, 1.0/10.0 ) );
125125
sh = [ len, len, len, len, len, len, len, len, len, len ];
126126
len *= pow( len, 9 );
127127
f = createBenchmark( len, sh, t1 );
128-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
128+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
129129
}
130130
}
131131
}

lib/node_modules/@stdlib/ndarray/base/fill/benchmark/benchmark.10d_columnmajor_accessors.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var floor = require( '@stdlib/math/base/special/floor' );
2828
var filledarrayBy = require( '@stdlib/array/filled-by' );
2929
var ctors = require( '@stdlib/array/typed-complex-ctors' );
3030
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
31+
var format = require( '@stdlib/string/format' );
3132
var pkg = require( './../package.json' ).name;
3233
var fill = require( './../lib' );
3334

@@ -121,17 +122,16 @@ function main() {
121122

122123
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1 ];
123124
f = createBenchmark( len, sh, t1 );
124-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
125+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
125126

126127
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
127128
f = createBenchmark( len, sh, t1 );
128-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
129-
129+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
130130
len = floor( pow( len, 1.0/10.0 ) );
131131
sh = [ len, len, len, len, len, len, len, len, len, len ];
132132
len *= floor( pow( len, 9 ));
133133
f = createBenchmark( len, sh, t1 );
134-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
134+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
135135
}
136136
}
137137
}

lib/node_modules/@stdlib/ndarray/base/fill/benchmark/benchmark.10d_rowmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2727
var floor = require( '@stdlib/math/base/special/floor' );
2828
var filledarrayBy = require( '@stdlib/array/filled-by' );
2929
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
30+
var format = require( '@stdlib/string/format' );
3031
var pkg = require( './../package.json' ).name;
3132
var fill = require( './../lib' );
3233

@@ -115,17 +116,16 @@ function main() {
115116

116117
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1 ];
117118
f = createBenchmark( len, sh, t1 );
118-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
119+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
119120

120121
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
121122
f = createBenchmark( len, sh, t1 );
122-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
123-
123+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
124124
len = floor( pow( len, 1.0/10.0 ) );
125125
sh = [ len, len, len, len, len, len, len, len, len, len ];
126126
len *= pow( len, 9 );
127127
f = createBenchmark( len, sh, t1 );
128-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
128+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
129129
}
130130
}
131131
}

lib/node_modules/@stdlib/ndarray/base/fill/benchmark/benchmark.10d_rowmajor_accessors.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var floor = require( '@stdlib/math/base/special/floor' );
2828
var filledarrayBy = require( '@stdlib/array/filled-by' );
2929
var ctors = require( '@stdlib/array/typed-complex-ctors' );
3030
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
31+
var format = require( '@stdlib/string/format' );
3132
var pkg = require( './../package.json' ).name;
3233
var fill = require( './../lib' );
3334

@@ -121,17 +122,16 @@ function main() {
121122

122123
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1 ];
123124
f = createBenchmark( len, sh, t1 );
124-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
125+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
125126

126127
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
127128
f = createBenchmark( len, sh, t1 );
128-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
129-
129+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
130130
len = floor( pow( len, 1.0/10.0 ) );
131131
sh = [ len, len, len, len, len, len, len, len, len, len ];
132132
len *= floor( pow( len, 9 ));
133133
f = createBenchmark( len, sh, t1 );
134-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
134+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
135135
}
136136
}
137137
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' );
2525
var pow = require( '@stdlib/math/base/special/pow' );
2626
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
2727
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
28+
var format = require( '@stdlib/string/format' );
2829
var pkg = require( './../package.json' ).name;
2930
var fill = require( './../lib' );
3031

@@ -113,7 +114,7 @@ function main() {
113114

114115
sh = [ len ];
115116
f = createBenchmark( len, sh, t1 );
116-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
117+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join(','), order, t1 ), f );
117118
}
118119
}
119120
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' );
2525
var pow = require( '@stdlib/math/base/special/pow' );
2626
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
2727
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
28+
var format = require( '@stdlib/string/format' );
2829
var pkg = require( './../package.json' ).name;
2930
var fill = require( './../lib' );
3031

@@ -113,7 +114,7 @@ function main() {
113114

114115
sh = [ len ];
115116
f = createBenchmark( len, sh, t1 );
116-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
117+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join(','), order, t1 ), f );
117118
}
118119
}
119120
}

lib/node_modules/@stdlib/ndarray/base/fill/benchmark/benchmark.2d_columnmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var floor = require( '@stdlib/math/base/special/floor' );
2828
var sqrt = require( '@stdlib/math/base/special/sqrt' );
2929
var filledarrayBy = require( '@stdlib/array/filled-by' );
3030
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
31+
var format = require( '@stdlib/string/format' );
3132
var pkg = require( './../package.json' ).name;
3233
var fill = require( './../lib' );
3334

@@ -116,17 +117,16 @@ function main() {
116117

117118
sh = [ len/2, 2 ];
118119
f = createBenchmark( len, sh, t1 );
119-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
120+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
120121

121122
sh = [ 2, len/2 ];
122123
f = createBenchmark( len, sh, t1 );
123-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
124-
124+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
125125
len = floor( sqrt( len ) );
126126
sh = [ len, len ];
127127
len *= len;
128128
f = createBenchmark( len, sh, t1 );
129-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
129+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
130130
}
131131
}
132132
}

lib/node_modules/@stdlib/ndarray/base/fill/benchmark/benchmark.2d_columnmajor_accessors.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var sqrt = require( '@stdlib/math/base/special/sqrt' );
2929
var filledarrayBy = require( '@stdlib/array/filled-by' );
3030
var ctors = require( '@stdlib/array/typed-complex-ctors' );
3131
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
32+
var format = require( '@stdlib/string/format' );
3233
var pkg = require( './../package.json' ).name;
3334
var fill = require( './../lib' );
3435

@@ -122,17 +123,16 @@ function main() {
122123

123124
sh = [ len/2, 2 ];
124125
f = createBenchmark( len, sh, t1 );
125-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
126+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
126127

127128
sh = [ 2, len/2 ];
128129
f = createBenchmark( len, sh, t1 );
129-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
130-
130+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
131131
len = floor( sqrt( len ) );
132132
sh = [ len, len ];
133133
len *= len;
134134
f = createBenchmark( len, sh, t1 );
135-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
135+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
136136
}
137137
}
138138
}

lib/node_modules/@stdlib/ndarray/base/fill/benchmark/benchmark.2d_rowmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var floor = require( '@stdlib/math/base/special/floor' );
2828
var sqrt = require( '@stdlib/math/base/special/sqrt' );
2929
var filledarrayBy = require( '@stdlib/array/filled-by' );
3030
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
31+
var format = require( '@stdlib/string/format' );
3132
var pkg = require( './../package.json' ).name;
3233
var fill = require( './../lib' );
3334

@@ -116,17 +117,16 @@ function main() {
116117

117118
sh = [ len/2, 2 ];
118119
f = createBenchmark( len, sh, t1 );
119-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
120+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
120121

121122
sh = [ 2, len/2 ];
122123
f = createBenchmark( len, sh, t1 );
123-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
124-
124+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
125125
len = floor( sqrt( len ) );
126126
sh = [ len, len ];
127127
len *= len;
128128
f = createBenchmark( len, sh, t1 );
129-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
129+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
130130
}
131131
}
132132
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var sqrt = require( '@stdlib/math/base/special/sqrt' );
2929
var filledarrayBy = require( '@stdlib/array/filled-by' );
3030
var ctors = require( '@stdlib/array/typed-complex-ctors' );
3131
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
32+
var format = require( '@stdlib/string/format' );
3233
var pkg = require( './../package.json' ).name;
3334
var fill = require( './../lib' );
3435

@@ -122,17 +123,16 @@ function main() {
122123

123124
sh = [ len/2, 2 ];
124125
f = createBenchmark( len, sh, t1 );
125-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
126+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
126127

127128
sh = [ 2, len/2 ];
128129
f = createBenchmark( len, sh, t1 );
129-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
130-
130+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
131131
len = floor( sqrt( len ) );
132132
sh = [ len, len ];
133133
len *= len;
134134
f = createBenchmark( len, sh, t1 );
135-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
135+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
136136
}
137137
}
138138
}

0 commit comments

Comments
 (0)