Merge pull request #118 from intel/revert-110-avx2_arg

Revert "Support for AVX2 argsort/argselect/key-value sort"

Author: Raghuveer Devulapalli

lib/x86simdsort-avx2.cpp

@@ -1,8 +1,6 @@
 // AVX2 specific routines:
 #include "avx2-32bit-qsort.hpp"
 #include "avx2-64bit-qsort.hpp"
-#include "avx2-32bit-half.hpp"
-#include "xss-common-argsort.h"
 #include "x86simdsort-internal.h"
 
 #define DEFINE_ALL_METHODS(type) \
@@ -20,17 +18,6 @@
     void partial_qsort(type *arr, size_t k, size_t arrsize, bool hasnan) \
     { \
         avx2_partial_qsort(arr, k, arrsize, hasnan); \
-    }\
-    template <> \
-    std::vector<size_t> argsort(type *arr, size_t arrsize, bool hasnan) \
-    { \
-        return avx2_argsort(arr, arrsize, hasnan); \
-    } \
-    template <> \
-    std::vector<size_t> argselect( \
-            type *arr, size_t k, size_t arrsize, bool hasnan) \
-    { \
-        return avx2_argselect(arr, k, arrsize, hasnan); \
     }
 
 namespace xss {

lib/x86simdsort.cpp

@@ -189,12 +189,12 @@ DISPATCH_ALL(partial_qsort,
              (ISA_LIST("avx512_skx", "avx2")))
 DISPATCH_ALL(argsort,
              (ISA_LIST("none")),
-             (ISA_LIST("avx512_skx", "avx2")),
-             (ISA_LIST("avx512_skx", "avx2")))
+             (ISA_LIST("avx512_skx")),
+             (ISA_LIST("avx512_skx")))
 DISPATCH_ALL(argselect,
              (ISA_LIST("none")),
-             (ISA_LIST("avx512_skx", "avx2")),
-             (ISA_LIST("avx512_skx", "avx2")))
+             (ISA_LIST("avx512_skx")),
+             (ISA_LIST("avx512_skx")))
 
 #define DISPATCH_KEYVALUE_SORT_FORTYPE(type) \
     DISPATCH_KEYVALUE_SORT(type, uint64_t, (ISA_LIST("avx512_skx")))\