Merge pull request #1827 from senior-zero/fix-main/github/reduce_by_key_zero_initializable

gevtushenko · web-flow · commit db2ee032fec4 · 2022-11-15T21:24:56.000+04:00
Fix reduce by key for non default initializable iterators
diff --git a/thrust/system/cuda/detail/reduce_by_key.h b/thrust/system/cuda/detail/reduce_by_key.h
@@ -1079,12 +1079,13 @@ namespace __reduce_by_key {
 
     size_type num_items = thrust::distance(keys_first, keys_last);
 
+    pair<KeysOutputIt, ValuesOutputIt> result = thrust::make_pair(keys_output, values_output);
+
     if (num_items == 0)
     {
-      return thrust::make_pair(keys_output, values_output);
+      return result;
     }
 
-    pair<KeysOutputIt, ValuesOutputIt> result{};
     THRUST_INDEX_TYPE_DISPATCH(result,
                                reduce_by_key_dispatch,
                                num_items,

Original file line number	Diff line number	Diff line change
`@@ -1079,12 +1079,13 @@ namespace __reduce_by_key {`
`1079`	`1079`
`1080`	`1080`	`size_type num_items = thrust::distance(keys_first, keys_last);`
`1081`	`1081`
	`1082`	`+ pair<KeysOutputIt, ValuesOutputIt> result = thrust::make_pair(keys_output, values_output);`
	`1083`	`+`
`1082`	`1084`	`if (num_items == 0)`
`1083`	`1085`	`{`
`1084`		`- return thrust::make_pair(keys_output, values_output);`
	`1086`	`+ return result;`
`1085`	`1087`	`}`
`1086`	`1088`
`1087`		`- pair<KeysOutputIt, ValuesOutputIt> result{};`
`1088`	`1089`	`THRUST_INDEX_TYPE_DISPATCH(result,`
`1089`	`1090`	`reduce_by_key_dispatch,`
`1090`	`1091`	`num_items,`