@@ -140,12 +140,12 @@ fn plot() {
140
140
// warmup
141
141
{
142
142
collect:: collect_into (
143
- minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w) ,
143
+ minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w, None ) ,
144
144
v2,
145
145
) ;
146
146
v2. clear ( ) ;
147
147
collect:: collect_and_dedup_into (
148
- minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w) ,
148
+ minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w, None ) ,
149
149
v2,
150
150
) ;
151
151
v2. clear ( ) ;
@@ -212,12 +212,12 @@ fn bench_minimizers(w: usize, k: usize) {
212
212
v. clear ( ) ;
213
213
214
214
collect:: collect_into (
215
- minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w) ,
215
+ minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w, None ) ,
216
216
v2,
217
217
) ;
218
218
v2. clear ( ) ;
219
219
collect:: collect_and_dedup_into (
220
- minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w) ,
220
+ minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w, None ) ,
221
221
v2,
222
222
) ;
223
223
v2. clear ( ) ;
@@ -257,16 +257,16 @@ fn bench_minimizers(w: usize, k: usize) {
257
257
. map ( |( a, r) | a + r)
258
258
} ) ;
259
259
time_v ( v, "nthash" , params, || {
260
- nthash:: nthash_seq_simd :: < false , PackedSeq , H > ( packed_seq, k, w) . 0
260
+ nthash:: nthash_seq_simd :: < false , PackedSeq , H > ( packed_seq, k, w, None ) . 0
261
261
} ) ;
262
262
time_v ( v, "sliding_min" , params, || {
263
- minimizers:: minimizers_seq_simd :: < _ , H > ( packed_seq, k, w) . 0
263
+ minimizers:: minimizers_seq_simd :: < _ , H > ( packed_seq, k, w, None ) . 0
264
264
} ) ;
265
265
266
266
time ( "fwd-collect" , params, || {
267
267
v2. clear ( ) ;
268
268
collect:: collect_into (
269
- minimizers:: minimizers_seq_simd :: < _ , H > ( packed_seq, k, w) ,
269
+ minimizers:: minimizers_seq_simd :: < _ , H > ( packed_seq, k, w, None ) ,
270
270
v2,
271
271
)
272
272
} ) ;
@@ -279,18 +279,18 @@ fn bench_minimizers(w: usize, k: usize) {
279
279
// Inline minimizers_seq_simd.
280
280
let add_remove = packed_seq. par_iter_bp_delayed ( k + w - 1 , k - 1 ) . 0 ;
281
281
// True instead of default false here.
282
- let mut nthash = nthash_mapper :: < true , PackedSeq , H > ( k, w) ;
282
+ let mut nthash = nthash_mapper :: < true , PackedSeq , H > ( k, w, None ) ;
283
283
let mut sliding_min = sliding_min_mapper :: < true > ( w, k, add_remove. len ( ) ) ;
284
284
add_remove. map ( move |( a, rk) | sliding_min ( nthash ( ( a, rk) ) ) )
285
285
} ) ;
286
286
time_v ( v, "canonical-strand" , params, || {
287
- minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w) . 0
287
+ minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w, None ) . 0
288
288
} ) ;
289
289
290
290
time ( "canonical-collect" , params, || {
291
291
v2. clear ( ) ;
292
292
collect:: collect_into (
293
- minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w) ,
293
+ minimizers:: canonical_minimizers_seq_simd :: < _ , H > ( packed_seq, k, w, None ) ,
294
294
v2,
295
295
)
296
296
} ) ;
0 commit comments