From 0903dca08666d87ccf125408fac1be7764be83ad Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 21 Dec 2010 12:05:22 +0100 Subject: [PATCH] src/sn-merge.c: Bitonic merge works with all numbers, now, not only powers of two. --- src/sn-merge.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/sn-merge.c b/src/sn-merge.c index f9d0440..77c2429 100644 --- 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 -- 2.11.0