@@ -140,12 +140,12 @@ fn plot() {
140140 // warmup
141141 {
142142 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 ) ,
144144 v2,
145145 ) ;
146146 v2. clear ( ) ;
147147 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 ) ,
149149 v2,
150150 ) ;
151151 v2. clear ( ) ;
@@ -212,12 +212,12 @@ fn bench_minimizers(w: usize, k: usize) {
212212 v. clear ( ) ;
213213
214214 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 ) ,
216216 v2,
217217 ) ;
218218 v2. clear ( ) ;
219219 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 ) ,
221221 v2,
222222 ) ;
223223 v2. clear ( ) ;
@@ -257,16 +257,16 @@ fn bench_minimizers(w: usize, k: usize) {
257257 . map ( |( a, r) | a + r)
258258 } ) ;
259259 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
261261 } ) ;
262262 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
264264 } ) ;
265265
266266 time ( "fwd-collect" , params, || {
267267 v2. clear ( ) ;
268268 collect:: collect_into (
269- minimizers:: minimizers_seq_simd :: < _ , H > ( packed_seq, k, w) ,
269+ minimizers:: minimizers_seq_simd :: < _ , H > ( packed_seq, k, w, None ) ,
270270 v2,
271271 )
272272 } ) ;
@@ -279,18 +279,18 @@ fn bench_minimizers(w: usize, k: usize) {
279279 // Inline minimizers_seq_simd.
280280 let add_remove = packed_seq. par_iter_bp_delayed ( k + w - 1 , k - 1 ) . 0 ;
281281 // 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 ) ;
283283 let mut sliding_min = sliding_min_mapper :: < true > ( w, k, add_remove. len ( ) ) ;
284284 add_remove. map ( move |( a, rk) | sliding_min ( nthash ( ( a, rk) ) ) )
285285 } ) ;
286286 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
288288 } ) ;
289289
290290 time ( "canonical-collect" , params, || {
291291 v2. clear ( ) ;
292292 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 ) ,
294294 v2,
295295 )
296296 } ) ;
0 commit comments