Dynamic dispat 8000 ch attempt

Micky774 · Micky774 · Aug 28, 2023 · Aug 28, 2023 · Aug 29, 2023 · Aug 29, 2023
commit dd77b65b7589f95b75d29e7cbc418207814da648
diff --git a/setup.py b/setup.py
@@ -284,7 +284,7 @@ def check_package_status(package, min_version):
             "language": "c++",
             "extra_compile_args": ["-std=c++11"],
             "define_macros": [("DIST_METRICS", None)],
-            "include_dirs": [".", join("..", "..", HWY_INCLUDE_PATH)],
+            "include_dirs": [join("..", "..", HWY_INCLUDE_PATH), "."],
         },
     ],
     "metrics.cluster": [
@@ -512,7 +512,7 @@ def configure_extension_modules():
                 {
                     "language": "c++",
                     "sources": [join(SIMD_DIRECTORY, "simd.cpp")],
-                    "cflags": ["-std=c++14", "-mavx"],
+                    "cflags": ["-std=c++14", "-march=native"],
                     "extra_link_args": ["-std=c++14"],
                     "include_dirs": [SIMD_DIRECTORY, HWY_INCLUDE_PATH],
                 },

diff --git a/sklearn/metrics/_dist_metrics.pxd.tp b/sklearn/metrics/_dist_metrics.pxd.tp
@@ -17,9 +17,10 @@ cdef class DistanceMetric:
     pass
 
 cdef extern from "_simd/_dist_optim.cpp":
-    cdef Type simd_manhattan_dist[Type](Type * x, Type * y, intp_t size) nogil
     cdef Type simd_manhattan_dist_scalar[Type](Type * x, Type * y, intp_t size) nogil
     int WITH_SIMD
+cdef extern from "_simd/_dist_optim.cpp" namespace "manhattan":
+    cdef Type simd_manhattan_dist[Type](Type * x, Type * y, intp_t size) nogil
 
 {{for name_suffix, INPUT_DTYPE_t, INPUT_DTYPE in implementation_specific_values}}
 

diff --git a/sklearn/metrics/_simd/_dist_optim.cpp b/sklearn/metrics/_simd/_dist_optim.cpp
@@ -8,10 +8,6 @@ this file due to cimporting _dist_metrics
 /* If built with SIMD support, include the compiled library code */
 #if WITH_SIMD == 1
 #include "simd.hpp"
-#include "hwy/highway.h"
-
-template<typename T>
-auto simd_manhattan_dist = manhattan::_simd_manhattan_dist;
 #else
 #include <cstddef>
 

diff --git a/sklearn/metrics/_simd/simd.cpp b/sklearn/metrics/_simd/simd.cpp
@@ -5,16 +5,16 @@
 #define HWY_TARGET_INCLUDE "simd.cpp"
 #include "hwy/foreach_target.h"
 #include "hwy/highway.h"
+HWY_BEFORE_NAMESPACE();  // at file scope
 
-HWY_BEFORE_NAMESPACE();
 namespace manhattan {
 
     namespace HWY_NAMESPACE {
         namespace hn = hwy::HWY_NAMESPACE;
 
 
         template <typename Type>
-        HWY_ATTR Type manhattan_dist(
+        inline Type manhattan_dist(
             const Type* x,
             const Type* y,
             const size_t size
@@ -49,8 +49,20 @@ namespace manhattan {
             }
             return scalar_sum;
         }
-    auto manhattan_dist_float = manhattan_dist<float>;
-    auto manhattan_dist_double = manhattan_dist<double>;
+        inline float manhattan_dist_float(
+            const float* x,
+            const float* y,
+            const size_t size
+        ) {
+            return manhattan_dist<float>(x, y, size);
+        }
+        inline double manhattan_dist_double(
+            const double* x,
+            const double* y,
+            const size_t size
+        ) {
+            return manhattan_dist<double>(x, y, size);
+        }
     }
 }
 HWY_AFTER_NAMESPACE();
@@ -63,7 +75,7 @@ namespace manhattan {
     HWY_EXPORT(manhattan_dist_double);
 
     template <typename Type>
-    HWY_DLLEXPORT Type _simd_manhattan_dist(
+    HWY_DLLEXPORT Type simd_manhattan_dist(
         const Type* x,
         const Type* y,
         const size_t size

diff --git a/sklearn/metrics/_simd/simd.hpp b/sklearn/metrics/_simd/simd.hpp
@@ -4,9 +4,10 @@
 
 namespace manhattan{
 
-    HWY_DLLEXPORT float _simd_manhattan_dist(
-        const float* x,
-        const float* y,
+    template <typename Type>
+    HWY_DLLEXPORT Type simd_manhattan_dist(
+        const Type* x,
+        const Type* y,
         const size_t size
     );
 }