summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/build_tests.yml4
-rw-r--r--ot/lp/emd_wrap.pyx6
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml
index f4d55d1..2fc6770 100644
--- a/.github/workflows/build_tests.yml
+++ b/.github/workflows/build_tests.yml
@@ -3,9 +3,11 @@ name: Tests
on:
workflow_dispatch:
pull_request:
+ branches:
+ - 'master'
push:
branches:
- - '**'
+ - 'master'
create:
branches:
- 'master'
diff --git a/ot/lp/emd_wrap.pyx b/ot/lp/emd_wrap.pyx
index d79d0ca..de9a700 100644
--- a/ot/lp/emd_wrap.pyx
+++ b/ot/lp/emd_wrap.pyx
@@ -97,8 +97,6 @@ def emd_c(np.ndarray[double, ndim=1, mode="c"] a, np.ndarray[double, ndim=1, mod
cdef np.ndarray[double, ndim=2, mode="c"] G=np.zeros([0, 0])
cdef np.ndarray[double, ndim=1, mode="c"] Gv=np.zeros(0)
- cdef np.ndarray[long, ndim=1, mode="c"] iG=np.zeros(0,dtype=np.int)
- cdef np.ndarray[long, ndim=1, mode="c"] jG=np.zeros(0,dtype=np.int)
if not len(a):
a=np.ones((n1,))/n1
@@ -169,8 +167,8 @@ def emd_1d_sorted(np.ndarray[double, ndim=1, mode="c"] u_weights,
cdef np.ndarray[double, ndim=1, mode="c"] G = np.zeros((n + m - 1, ),
dtype=np.float64)
- cdef np.ndarray[long, ndim=2, mode="c"] indices = np.zeros((n + m - 1, 2),
- dtype=np.int)
+ cdef np.ndarray[long long, ndim=2, mode="c"] indices = np.zeros((n + m - 1, 2),
+ dtype=np.int64)
cdef Py_ssize_t cur_idx = 0
while True:
if metric == 'sqeuclidean':