apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-04-28 22:36:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Seems to work on windows now

Browse source 
not everything works yet, but I've identified the main issues. Still
TODO: handle missing OMP libraries gracefully
This commit is contained in:
Nicolò Fusi 2013-10-11 16:19:27 -07:00
parent de0a5d0e70
commit 6945ad7aa1
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
GPy/util/misc.py
View file

@ -61,7 +61,7 @@ def fast_array_equal(A, B):
int i, j;
return_val = 1;
#pragma omp parallel for private(i, j)
// #pragma omp parallel for private(i, j)
for(i=0;i<N;i++){
for(j=0;j<D;j++){
if(A(i, j) != B(i, j)){
@ -76,7 +76,7 @@ def fast_array_equal(A, B):
int i, j, z;
return_val = 1;
#pragma omp parallel for private(i, j, z)
// #pragma omp parallel for private(i, j, z)
for(i=0;i<N;i++){
for(j=0;j<D;j++){
for(z=0;z<Q;z++){
@ -90,7 +90,7 @@ def fast_array_equal(A, B):
"""
support_code = """
#include <omp.h>
// #include <omp.h>
#include <math.h>
"""
@ -107,15 +107,17 @@ def fast_array_equal(A, B):
return False
elif A.shape == B.shape:
if A.ndim == 2:
N, D = A.shape
value = weave.inline(code2, support_code=support_code, libraries=['gomp'],
N, D = [int(i) for i in A.shape]
value = weave.inline(code2, support_code=support_code,
arg_names=['A', 'B', 'N', 'D'],
type_converters=weave.converters.blitz,**weave_options)
type_converters=weave.converters.blitz)
# libraries=['gomp'], **weave_options)
elif A.ndim == 3:
N, D, Q = A.shape
value = weave.inline(code3, support_code=support_code, libraries=['gomp'],
N, D, Q = [int(i) for i in A.shape]
value = weave.inline(code3, support_code=support_code,
arg_names=['A', 'B', 'N', 'D', 'Q'],
type_converters=weave.converters.blitz,**weave_options)
type_converters=weave.converters.blitz)
#libraries=['gomp'], **weave_options)
else:
value = np.array_equal(A,B)