From 9b8de3ba2960be86268d1726867003db598483fc Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Sat, 17 Jun 2017 09:30:41 -0400
Subject: [PATCH] remove ifdefs for selecting between plain and hybrid merge
sort. use hybrid only.
---
src/mergesort.h | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/src/mergesort.h b/src/mergesort.h
index 3597db52fb..1df6cb4b81 100644
--- a/src/mergesort.h
+++ b/src/mergesort.h
@@ -22,13 +22,6 @@
// for improved performance, we employ an in-place insertion sort on
// chunks of up to 64 elements and switch to merge sort from then on.
-// compile with -DLMP_USE_MERGE_SORT to switch to a plain merge sort
-
-#if !defined(LMP_USE_MERGE_SORT) && !defined(LMP_USE_HYBRID_SORT)
-#define LMP_USE_HYBRID_SORT
-#endif
-
-#if defined(LMP_USE_HYBRID_SORT)
// part 1. insertion sort for pre-sorting of small chunks
static void insertion_sort(int *index, int num, void *ptr,
@@ -48,7 +41,6 @@ static void insertion_sort(int *index, int num, void *ptr,
}
}
}
-#endif
// part 2. merge two sublists
@@ -78,8 +70,6 @@ static void merge_sort(int *index, int num, void *ptr,
int chunk,i,j;
-#if defined(LMP_USE_HYBRID_SORT)
-
// do insertion sort on chunks of up to 64 elements
chunk = 64;
@@ -92,10 +82,6 @@ static void merge_sort(int *index, int num, void *ptr,
if (chunk >= num) return;
-#else
- chunk = 1;
-#endif
-
// continue with merge sort on the pre-sorted chunks.
// we need an extra buffer for temporary storage and two
// pointers to operate on, so we can swap the pointers
--
GitLab