mirror of
https://github.com/SheffieldML/GPy.git
synced 2026-05-03 08:42:39 +02:00
Merge pull request #719 from ajgpitch/install_fixes
FIXES - for installing under Python 3.7
This commit is contained in:
commit
313fb7c07e
9 changed files with 45453 additions and 23880 deletions
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -6,6 +6,8 @@ cimport numpy as np
|
||||||
from cython.parallel import prange
|
from cython.parallel import prange
|
||||||
cimport cython
|
cimport cython
|
||||||
|
|
||||||
|
np.import_array()
|
||||||
|
|
||||||
ctypedef np.float64_t DTYPE_t
|
ctypedef np.float64_t DTYPE_t
|
||||||
|
|
||||||
cdef extern from "stationary_utils.h":
|
cdef extern from "stationary_utils.h":
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -493,7 +493,7 @@ cdef class AQcompute_batch_Cython(Q_handling_Cython):
|
||||||
U,S,Vh = self.Q_svd_dict[matrix_index]
|
U,S,Vh = self.Q_svd_dict[matrix_index]
|
||||||
|
|
||||||
square_root = U * np.sqrt(S)
|
square_root = U * np.sqrt(S)
|
||||||
self.Q_suqare_root_dict[matrix_index] = square_root
|
self.Q_square_root_dict[matrix_index] = square_root
|
||||||
|
|
||||||
return square_root
|
return square_root
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -9,6 +9,8 @@ from cython.parallel import prange, parallel
|
||||||
cimport numpy as np
|
cimport numpy as np
|
||||||
cimport scipy.linalg.cython_blas as cblas
|
cimport scipy.linalg.cython_blas as cblas
|
||||||
|
|
||||||
|
np.import_array()
|
||||||
|
|
||||||
def flat_to_triang(double[:, :] flat, int M):
|
def flat_to_triang(double[:, :] flat, int M):
|
||||||
"""take a matrix N x D and return a D X M x M array where
|
"""take a matrix N x D and return a D X M x M array where
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
10
setup.py
10
setup.py
|
|
@ -84,28 +84,28 @@ try:
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
|
||||||
ext_mods = [Extension(name='GPy.kern.src.stationary_cython',
|
ext_mods = [Extension(name='GPy.kern.src.stationary_cython',
|
||||||
sources=['GPy/kern/src/stationary_cython.c',
|
sources=['GPy/kern/src/stationary_cython.pyx',
|
||||||
'GPy/kern/src/stationary_utils.c'],
|
'GPy/kern/src/stationary_utils.c'],
|
||||||
include_dirs=[np.get_include(), '.'],
|
include_dirs=[np.get_include(), '.'],
|
||||||
extra_compile_args=compile_flags,
|
extra_compile_args=compile_flags,
|
||||||
extra_link_args=link_args),
|
extra_link_args=link_args),
|
||||||
Extension(name='GPy.util.choleskies_cython',
|
Extension(name='GPy.util.choleskies_cython',
|
||||||
sources=['GPy/util/choleskies_cython.c'],
|
sources=['GPy/util/choleskies_cython.pyx'],
|
||||||
include_dirs=[np.get_include(), '.'],
|
include_dirs=[np.get_include(), '.'],
|
||||||
extra_link_args=link_args,
|
extra_link_args=link_args,
|
||||||
extra_compile_args=compile_flags),
|
extra_compile_args=compile_flags),
|
||||||
Extension(name='GPy.util.linalg_cython',
|
Extension(name='GPy.util.linalg_cython',
|
||||||
sources=['GPy/util/linalg_cython.c'],
|
sources=['GPy/util/linalg_cython.pyx'],
|
||||||
include_dirs=[np.get_include(), '.'],
|
include_dirs=[np.get_include(), '.'],
|
||||||
extra_compile_args=compile_flags,
|
extra_compile_args=compile_flags,
|
||||||
extra_link_args=link_args),
|
extra_link_args=link_args),
|
||||||
Extension(name='GPy.kern.src.coregionalize_cython',
|
Extension(name='GPy.kern.src.coregionalize_cython',
|
||||||
sources=['GPy/kern/src/coregionalize_cython.c'],
|
sources=['GPy/kern/src/coregionalize_cython.pyx'],
|
||||||
include_dirs=[np.get_include(), '.'],
|
include_dirs=[np.get_include(), '.'],
|
||||||
extra_compile_args=compile_flags,
|
extra_compile_args=compile_flags,
|
||||||
extra_link_args=link_args),
|
extra_link_args=link_args),
|
||||||
Extension(name='GPy.models.state_space_cython',
|
Extension(name='GPy.models.state_space_cython',
|
||||||
sources=['GPy/models/state_space_cython.c'],
|
sources=['GPy/models/state_space_cython.pyx'],
|
||||||
include_dirs=[np.get_include(), '.'],
|
include_dirs=[np.get_include(), '.'],
|
||||||
extra_compile_args=compile_flags,
|
extra_compile_args=compile_flags,
|
||||||
extra_link_args=link_args)]
|
extra_link_args=link_args)]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue