Skip to content

Commit 4aece2a

Browse files
committed
MAINT: observable: move cdef extern from into pxd
1 parent 0ca1bdd commit 4aece2a

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

mc_lib/observable.pxd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,10 @@ cdef class RealObservable():
2424

2525
cpdef void add_measurement(self, double value)
2626

27+
28+
# needed to work around cython not understanding std::tuple
29+
cdef extern from "_observable/observable.h" namespace "mc_stats":
30+
void trampoline_mrg(const ScalarObservable[double]& obs,
31+
vector[double] v_av,
32+
vector[double] v_err,
33+
vector[double] v_size)

mc_lib/observable.pyx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22

33
# hack to make cythonize detect c++
44
#from libcpp.vector cimport vector
5-
cdef extern from "_observable/observable.h" namespace "mc_stats":
6-
void trampoline_mrg(const ScalarObservable[double]& obs,
7-
vector[double] v_av,
8-
vector[double] v_err,
9-
vector[double] v_size)
105

116
import numpy as np
127

138
from .observable cimport ScalarObservable
9+
from .observable cimport trampoline_mrg
1410

1511
cdef class RealObservable():
1612

0 commit comments

Comments
 (0)