提交 6cdcb6fd authored 作者: Pierre Luc Carrier's avatar Pierre Luc Carrier

Code formating and simplification

上级 21c11dc1
...@@ -426,14 +426,12 @@ class GpuAdvancedIncSubtensor1(HideC, tensor.AdvancedIncSubtensor1): ...@@ -426,14 +426,12 @@ class GpuAdvancedIncSubtensor1(HideC, tensor.AdvancedIncSubtensor1):
elif y.ndim == x.ndim: elif y.ndim == x.ndim:
assert len(y) == len(idx) assert len(y) == len(idx)
firstIdxY, firstIdxX = enumerate(idx).next() k = self.getInplElemwiseAdditionKernel(x[0], y[0])
k = self.getInplElemwiseAdditionKernel(x[firstIdxX],
y[firstIdxY])
for (j, i) in enumerate(idx): for (j, i) in enumerate(idx):
k(x[i], y[j], broadcast=False) k(x[i], y[j], broadcast=False)
else: else:
nb_dims_to_add = (x[idx[0]].ndim - y.ndim) nb_dims_to_add = (x.ndim - 1) - y.ndim
reshaped_y = y.reshape((1,)*nb_dims_to_add + y.shape) reshaped_y = y.reshape((1,)*nb_dims_to_add + y.shape)
k = self.getInplElemwiseAdditionKernel(x[0], k = self.getInplElemwiseAdditionKernel(x[0],
reshaped_y) reshaped_y)
...@@ -593,4 +591,4 @@ class GpuAdvancedIncSubtensor1_dev20(GpuAdvancedIncSubtensor1): ...@@ -593,4 +591,4 @@ class GpuAdvancedIncSubtensor1_dev20(GpuAdvancedIncSubtensor1):
return; return;
} }
""" %locals() """ %locals()
\ No newline at end of file
...@@ -25,7 +25,7 @@ class G_subtensor(T_subtensor): ...@@ -25,7 +25,7 @@ class G_subtensor(T_subtensor):
shared=gpuarray_shared_constructor, shared=gpuarray_shared_constructor,
sub=GpuSubtensor, sub=GpuSubtensor,
inc_sub=GpuIncSubtensor, inc_sub=GpuIncSubtensor,
adv_incsub1 = GpuAdvancedIncSubtensor1, adv_incsub1=GpuAdvancedIncSubtensor1,
mode=mode_with_gpu, mode=mode_with_gpu,
# avoid errors with limited devices # avoid errors with limited devices
dtype='float32', dtype='float32',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论