[bugfix] fix the bug in bitonic_sort

Carsten Griwodz · Carsten Griwodz · commit f93abbe24f00 · 2019-12-18T08:47:07.000+01:00
diff --git a/src/popsift/common/warp_bitonic_sort.h b/src/popsift/common/warp_bitonic_sort.h
@@ -66,8 +66,8 @@ class Warp32
                                          : ( my_val < other_val );
         const bool must_swap   = not ( my_more ^ reverse ^ increasing );
 
-        return ( must_swap ? popsift::shuffle_xor( my_index, 1 << shift )
-                           : my_index );
+        int lane = must_swap ? ( 1 << shift ) : 0;
+        return popsift::shuffle_xor( my_index, lane );
     }
 
     __device__ inline

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ class Warp32`
`66`	`66`	`: ( my_val < other_val );`
`67`	`67`	`const bool must_swap = not ( my_more ^ reverse ^ increasing );`
`68`	`68`
`69`		`- return ( must_swap ? popsift::shuffle_xor( my_index, 1 << shift )`
`70`		`- : my_index );`
	`69`	`+ int lane = must_swap ? ( 1 << shift ) : 0;`
	`70`	`+ return popsift::shuffle_xor( my_index, lane );`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`__device__ inline`