projects
/
sort-networks.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8198f10
)
src/sn-merge.c: Bitonic merge works with all numbers, now, not only powers of two.
author
Florian Forster
<octo@leeloo.octo.it>
Tue, 21 Dec 2010 11:05:22 +0000
(12:05 +0100)
committer
Florian Forster
<octo@leeloo.octo.it>
Tue, 21 Dec 2010 11:05:22 +0000
(12:05 +0100)
src/sn-merge.c
patch
|
blob
|
history
diff --git
a/src/sn-merge.c
b/src/sn-merge.c
index
f9d0440
..
77c2429
100644
(file)
--- a/
src/sn-merge.c
+++ b/
src/sn-merge.c
@@
-123,16
+123,6
@@
int main (int argc, char **argv)
exit (EXIT_FAILURE);
}
- if (use_bitonic
- && ((SN_NETWORK_INPUT_NUM (n0) != SN_NETWORK_INPUT_NUM (n1))
- || !is_power_of_two (SN_NETWORK_INPUT_NUM (n0))))
- {
- fprintf (stderr, "Using the bitonic merge is currently only possible "
- "if the number of inputs of both networks is identical and a "
- "power of two\n");
- exit (EXIT_FAILURE);
- }
-
if (use_bitonic)
n = sn_network_combine_bitonic_merge (n0, n1);
else