MAINT: observable: move cdef extern from into pxd

ev-br · Jul 31, 2021 · 4aece2a · 4aece2a
1 parent 0ca1bdd
commit 4aece2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/mc_lib/observable.pxd b/mc_lib/observable.pxd
@@ -24,3 +24,10 @@ cdef class RealObservable():
 
     cpdef void add_measurement(self, double value)
 
+
+# needed to work around cython not understanding std::tuple
+cdef extern from "_observable/observable.h" namespace "mc_stats":
+    void trampoline_mrg(const ScalarObservable[double]& obs,
+                        vector[double] v_av,
+                        vector[double] v_err,
+                        vector[double] v_size)
diff --git a/mc_lib/observable.pyx b/mc_lib/observable.pyx
@@ -2,15 +2,11 @@
 
 # hack to make cythonize detect c++
 #from libcpp.vector cimport vector
-cdef extern from "_observable/observable.h" namespace "mc_stats":
-    void trampoline_mrg(const ScalarObservable[double]& obs,
-                        vector[double] v_av,
-                        vector[double] v_err,
-                        vector[double] v_size)
 
 import numpy as np
 
 from .observable cimport ScalarObservable
+from .observable cimport trampoline_mrg
 
 cdef class RealObservable():