apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-06-05 14:55:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' of https://github.com/SheffieldML/GPy into devel

Browse source
This commit is contained in:
Neil Lawrence 2013-11-14 08:49:20 +00:00
commit f7799ea62b
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
GPy/core/gp_base.py
View file

@ -14,8 +14,11 @@ class GPBase(Model):
Here we define some functions that are use Here we define some functions that are use
""" """
def __init__(self, X, likelihood, kernel, normalize_X=False): def __init__(self, X, likelihood, kernel, normalize_X=False):
if len(X.shape)==1:
X = X.reshape(-1,1)
warning.warn("One dimension output (N,) being reshaped to (N,1)")
self.X = X self.X = X
assert len(self.X.shape) == 2 assert len(self.X.shape) == 2, "too many dimensions for X input"
self.num_data, self.input_dim = self.X.shape self.num_data, self.input_dim = self.X.shape
assert isinstance(kernel, kern.kern) assert isinstance(kernel, kern.kern)
self.kern = kernel self.kern = kernel

15
GPy/util/config.py
View file

@ -5,13 +5,18 @@ import ConfigParser
import os import os
config = ConfigParser.ConfigParser() config = ConfigParser.ConfigParser()
user_file = os.path.join(os.getenv('HOME'),'.gpy_config.cfg') home = os.getenv('HOME') or os.getenv('USERPROFILE')
default_file = os.path.join('..','gpy_config.cfg') user_file = os.path.join(home,'.gpy_config.cfg')
default_file = os.path.abspath(os.path.join(os.path.dirname( __file__ ), '..', 'gpy_config.cfg'))
print user_file, os.path.isfile(user_file)
print default_file, os.path.isfile(default_file)
# 1. check if the user has a ~/.gpy_config.cfg # 1. check if the user has a ~/.gpy_config.cfg
if os.path.isfile(user_file): if os.path.isfile(user_file):
config.read(user_file) config.read(user_file)
else: elif os.path.isfile(default_file):
# 2. if not, use the default one # 2. if not, use the default one
path = os.path.dirname(__file__) config.read(default_file)
config.read(os.path.join(path,default_file)) else:
#3. panic
raise ValueError, "no configuration file found"

2
MANIFEST.in
View file

@ -2,3 +2,5 @@ include *.txt
recursive-include doc *.txt recursive-include doc *.txt
include *.md include *.md
recursive-include doc *.md recursive-include doc *.md
include *.cfg
recursive-include doc *.cfg