Try to fix ubuntu fail

xia-mc · Nov 16, 2024 · f9ba138 · f9ba138
1 parent fb9be5b
commit f9ba138
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/pyfastutil/src/utils/simd/BitonicSort.cpp b/pyfastutil/src/utils/simd/BitonicSort.cpp
@@ -19,9 +19,6 @@
 #include "utils/memory/AlignedAllocator.h"
 #include "utils/memory/PreFetch.h"
 
-template <typename T>
-concept IntOrLongLong = std::same_as<T, int> || std::same_as<T, long long>;
-
 namespace simd {
 #if !defined(__arm__) && !defined(__arm64__)
     struct alignas(32) AVX2_MARKS {
@@ -374,7 +371,7 @@ namespace simd {
      * Merge sorted blocks with SIMD optimization, or fallback
      * make sure aligned
      */
-    template <IntOrLongLong T>
+    template <typename T, typename = std::enable_if_t<std::is_same_v<T, int> || std::is_same_v<T, long long>>>
     __forceinline void mergeSortedBlocks(std::vector<T, AlignedAllocator<T, 64>> &data, const size_t &blockSize) {
         const size_t total = data.size();
         auto temp = std::vector<T, AlignedAllocator<T, 64>>(total);
@@ -408,7 +405,7 @@ namespace simd {
     /**
      * Merge sorted blocks with SIMD optimization reversed, or fallback
      */
-    template <IntOrLongLong T>
+    template <typename T, typename = std::enable_if_t<std::is_same_v<T, int> || std::is_same_v<T, long long>>>
     __forceinline void
     mergeSortedBlocksReversed(std::vector<T, AlignedAllocator<T, 64>> &data, const size_t &blockSize) {
         const size_t total = data.size();

diff --git a/tests/benchmark/benchmark_BigIntArrayList.py b/tests/benchmark/benchmark_BigIntArrayList.py
@@ -31,8 +31,7 @@ def python_sort():
 
 def pyfastutil_sort():
     global pyFastUtilList
-    # pyFastUtilList.sort()
-    print("Skipped sort.")
+    pyFastUtilList.sort()
 
 
 def python_append():

diff --git a/tests/benchmark/benchmark_IntArrayList.py b/tests/benchmark/benchmark_IntArrayList.py
@@ -27,8 +27,7 @@ def python_sort():
 
 def pyfastutil_sort():
     global pyFastUtilList
-    # pyFastUtilList.sort()
-    print("skipped sort")
+    pyFastUtilList.sort()
 
 
 def python_append():