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

[param] indexing fix, this can be memory intensive if millions of parameters

Browse source
This commit is contained in:
Max Zwießele 2014-09-04 17:30:06 +01:00
parent ca03714331
commit e49bef9b94
1 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
GPy/core/parameterization/param.py
View file

@ -246,21 +246,6 @@ class Param(Parameterizable, ObsAr):
# get a int-array containing all indices in the first axis. # get a int-array containing all indices in the first axis.
if slice_index is None: if slice_index is None:
slice_index = self._current_slice_ slice_index = self._current_slice_
if isinstance(slice_index, (tuple, list)):
clean_curr_slice = [s for s in slice_index if numpy.any(s != Ellipsis)]
for i in range(self._realndim_-len(clean_curr_slice)):
i+=1
clean_curr_slice += [range(self._realshape_[i])]
if (all(isinstance(n, (numpy.ndarray, list, tuple)) for n in clean_curr_slice)
and len(set(map(len, clean_curr_slice))) <= 1):
return numpy.fromiter(itertools.izip(*clean_curr_slice),
dtype=[('', int)] * self._realndim_, count=len(clean_curr_slice[0])).view((int, self._realndim_))
try:
expanded_index = list(self._expand_index(slice_index))
indices = numpy.fromiter(itertools.product(*expanded_index),
dtype=[('', int)] * self._realndim_, count=reduce(lambda a, b: a * b.size, expanded_index, 1)).view((int, self._realndim_))
except:
print "Warning: extended indexing was used"
indices = np.indices(self._realshape_, dtype=int) indices = np.indices(self._realshape_, dtype=int)
indices = indices[(slice(None),)+slice_index] indices = indices[(slice(None),)+slice_index]
indices = np.rollaxis(indices, 0, indices.ndim) indices = np.rollaxis(indices, 0, indices.ndim)