Skip to content

Commit 117067d

Browse files
committed
bench: refactor to use string interpolation in ndarray/base/assign
1 parent be0ff01 commit 117067d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+161
-119
lines changed

lib/node_modules/@stdlib/ndarray/base/assign/benchmark/benchmark.10d_blocked_columnmajor.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var floor = require( '@stdlib/math/base/special/floor' );
2828
var filledarray = require( '@stdlib/array/filled' );
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 assign = require( './../lib/10d_blocked.js' );
3334

@@ -129,17 +130,17 @@ function main() {
129130

130131
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1 ];
131132
f = createBenchmark( len, sh, t1, t2 );
132-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
133+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
133134

134135
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
135136
f = createBenchmark( len, sh, t1, t2 );
136-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
137+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
137138

138139
len = floor( pow( len, 1.0/10.0 ) );
139140
sh = [ len, len, len, len, len, len, len, len, len, len ];
140141
len *= pow( len, 9 );
141142
f = createBenchmark( len, sh, t1, t2 );
142-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
143+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
143144
}
144145
}
145146
}

lib/node_modules/@stdlib/ndarray/base/assign/benchmark/benchmark.10d_blocked_rowmajor.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var floor = require( '@stdlib/math/base/special/floor' );
2828
var filledarray = require( '@stdlib/array/filled' );
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 assign = require( './../lib/10d_blocked.js' );
3334

@@ -129,17 +130,17 @@ function main() {
129130

130131
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1 ];
131132
f = createBenchmark( len, sh, t1, t2 );
132-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
133+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
133134

134135
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
135136
f = createBenchmark( len, sh, t1, t2 );
136-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
137+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
137138

138139
len = floor( pow( len, 1.0/10.0 ) );
139140
sh = [ len, len, len, len, len, len, len, len, len, len ];
140141
len *= pow( len, 9 );
141142
f = createBenchmark( len, sh, t1, t2 );
142-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
143+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
143144
}
144145
}
145146
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var floor = require( '@stdlib/math/base/special/floor' );
2828
var filledarray = require( '@stdlib/array/filled' );
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 assign = require( './../lib/10d.js' );
3334

@@ -129,17 +130,17 @@ function main() {
129130

130131
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1 ];
131132
f = createBenchmark( len, sh, t1, t2 );
132-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
133+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
133134

134135
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
135136
f = createBenchmark( len, sh, t1, t2 );
136-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
137+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
137138

138139
len = floor( pow( len, 1.0/10.0 ) );
139140
sh = [ len, len, len, len, len, len, len, len, len, len ];
140141
len *= pow( len, 9 );
141142
f = createBenchmark( len, sh, t1, t2 );
142-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
143+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
143144
}
144145
}
145146
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var floor = require( '@stdlib/math/base/special/floor' );
2828
var filledarray = require( '@stdlib/array/filled' );
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 assign = require( './../lib/10d.js' );
3334

@@ -129,17 +130,17 @@ function main() {
129130

130131
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1 ];
131132
f = createBenchmark( len, sh, t1, t2 );
132-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
133+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
133134

134135
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
135136
f = createBenchmark( len, sh, t1, t2 );
136-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
137+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
137138

138139
len = floor( pow( len, 1.0/10.0 ) );
139140
sh = [ len, len, len, len, len, len, len, len, len, len ];
140141
len *= pow( len, 9 );
141142
f = createBenchmark( len, sh, t1, t2 );
142-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
143+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
143144
}
144145
}
145146
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var floor = require( '@stdlib/math/base/special/floor' );
2828
var filledarray = require( '@stdlib/array/filled' );
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 assign = require( './../lib/nd.js' );
3334

@@ -129,17 +130,17 @@ function main() {
129130

130131
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1 ];
131132
f = createBenchmark( len, sh, t1, t2 );
132-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
133+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
133134

134135
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
135136
f = createBenchmark( len, sh, t1, t2 );
136-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
137+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
137138

138139
len = floor( pow( len, 1.0/11.0 ) );
139140
sh = [ len, len, len, len, len, len, len, len, len, len, len ];
140141
len *= pow( len, 10 );
141142
f = createBenchmark( len, sh, t1, t2 );
142-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
143+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
143144
}
144145
}
145146
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var floor = require( '@stdlib/math/base/special/floor' );
2828
var filledarray = require( '@stdlib/array/filled' );
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 assign = require( './../lib/nd.js' );
3334

@@ -129,17 +130,17 @@ function main() {
129130

130131
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1 ];
131132
f = createBenchmark( len, sh, t1, t2 );
132-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
133+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
133134

134135
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
135136
f = createBenchmark( len, sh, t1, t2 );
136-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
137+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
137138

138139
len = floor( pow( len, 1.0/11.0 ) );
139140
sh = [ len, len, len, len, len, len, len, len, len, len, len ];
140141
len *= pow( len, 10 );
141142
f = createBenchmark( len, sh, t1, t2 );
142-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
143+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
143144
}
144145
}
145146
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2727
var filledarray = require( '@stdlib/array/filled' );
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 assign = require( './../lib' );
3233

@@ -128,7 +129,7 @@ function main() {
128129

129130
sh = [ len ];
130131
f = createBenchmark( len, sh, t1, t2 );
131-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
132+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
132133
}
133134
}
134135
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2727
var filledarray = require( '@stdlib/array/filled' );
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 assign = require( './../lib' );
3233

@@ -128,7 +129,7 @@ function main() {
128129

129130
sh = [ len ];
130131
f = createBenchmark( len, sh, t1, t2 );
131-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
132+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
132133
}
133134
}
134135
}

lib/node_modules/@stdlib/ndarray/base/assign/benchmark/benchmark.2d_blocked_columnmajor.js

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

@@ -130,17 +131,17 @@ function main() {
130131

131132
sh = [ len/2, 2 ];
132133
f = createBenchmark( len, sh, t1, t2 );
133-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
134+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
134135

135136
sh = [ 2, len/2 ];
136137
f = createBenchmark( len, sh, t1, t2 );
137-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
138+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
138139

139140
len = floor( sqrt( len ) );
140141
sh = [ len, len ];
141142
len *= len;
142143
f = createBenchmark( len, sh, t1, t2 );
143-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
144+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
144145
}
145146
}
146147
}

lib/node_modules/@stdlib/ndarray/base/assign/benchmark/benchmark.2d_blocked_rowmajor.js

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

@@ -130,17 +131,17 @@ function main() {
130131

131132
sh = [ len/2, 2 ];
132133
f = createBenchmark( len, sh, t1, t2 );
133-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
134+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
134135

135136
sh = [ 2, len/2 ];
136137
f = createBenchmark( len, sh, t1, t2 );
137-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
138+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
138139

139140
len = floor( sqrt( len ) );
140141
sh = [ len, len ];
141142
len *= len;
142143
f = createBenchmark( len, sh, t1, t2 );
143-
bench( pkg+'::blocked:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',yorder='+order+',xtype='+t1+',ytype='+t2, f );
144+
bench( format( '%s::blocked:ndims=%d,len=%d,shape=[%s],xorder=%s,yorder=%s,xtype=%s,ytype=%s', pkg, sh.length, len, sh.join( ',' ), order, order, t1, t2 ), f );
144145
}
145146
}
146147
}

0 commit comments

Comments
 (0)