提交 1c0aff18 authored 作者: Pierre Luc Carrier's avatar Pierre Luc Carrier

Convert CudaNdarray_HOST_STRIDES to PyGpuArray_STRIDES in ops GpuSoftmax and GpuSoftmaxWithBias.

上级 d5701e07
...@@ -522,12 +522,12 @@ class GpuSoftmax (Op): ...@@ -522,12 +522,12 @@ class GpuSoftmax (Op):
PyGpuArray_DIMS(%(x)s)[1], PyGpuArray_DIMS(%(x)s)[1],
CudaNdarray_DEV_DATA(%(x)s), CudaNdarray_DEV_DATA(%(x)s),
CudaNdarray_HOST_STRIDES(%(x)s)[0], PyGpuArray_STRIDES(%(x)s)[0],
CudaNdarray_HOST_STRIDES(%(x)s)[1], PyGpuArray_STRIDES(%(x)s)[1],
CudaNdarray_DEV_DATA(%(z)s), CudaNdarray_DEV_DATA(%(z)s),
CudaNdarray_HOST_STRIDES(%(z)s)[0], PyGpuArray_STRIDES(%(z)s)[0],
CudaNdarray_HOST_STRIDES(%(z)s)[1] PyGpuArray_STRIDES(%(z)s)[1]
); );
}else{ }else{
kSoftmax_fixed_shared%(nodename)s kSoftmax_fixed_shared%(nodename)s
...@@ -540,12 +540,12 @@ class GpuSoftmax (Op): ...@@ -540,12 +540,12 @@ class GpuSoftmax (Op):
PyGpuArray_DIMS(%(x)s)[1], PyGpuArray_DIMS(%(x)s)[1],
CudaNdarray_DEV_DATA(%(x)s), CudaNdarray_DEV_DATA(%(x)s),
CudaNdarray_HOST_STRIDES(%(x)s)[0], PyGpuArray_STRIDES(%(x)s)[0],
CudaNdarray_HOST_STRIDES(%(x)s)[1], PyGpuArray_STRIDES(%(x)s)[1],
CudaNdarray_DEV_DATA(%(z)s), CudaNdarray_DEV_DATA(%(z)s),
CudaNdarray_HOST_STRIDES(%(z)s)[0], PyGpuArray_STRIDES(%(z)s)[0],
CudaNdarray_HOST_STRIDES(%(z)s)[1] PyGpuArray_STRIDES(%(z)s)[1]
); );
} }
CNDA_THREAD_SYNC; CNDA_THREAD_SYNC;
...@@ -704,15 +704,15 @@ class GpuSoftmaxWithBias (GpuOp): ...@@ -704,15 +704,15 @@ class GpuSoftmaxWithBias (GpuOp):
PyGpuArray_DIMS(%(x)s)[1], PyGpuArray_DIMS(%(x)s)[1],
CudaNdarray_DEV_DATA(%(x)s), CudaNdarray_DEV_DATA(%(x)s),
CudaNdarray_HOST_STRIDES(%(x)s)[0], PyGpuArray_STRIDES(%(x)s)[0],
CudaNdarray_HOST_STRIDES(%(x)s)[1], PyGpuArray_STRIDES(%(x)s)[1],
CudaNdarray_DEV_DATA(%(b)s), CudaNdarray_DEV_DATA(%(b)s),
CudaNdarray_HOST_STRIDES(%(b)s)[0], PyGpuArray_STRIDES(%(b)s)[0],
CudaNdarray_DEV_DATA(%(z)s), CudaNdarray_DEV_DATA(%(z)s),
CudaNdarray_HOST_STRIDES(%(z)s)[0], PyGpuArray_STRIDES(%(z)s)[0],
CudaNdarray_HOST_STRIDES(%(z)s)[1] PyGpuArray_STRIDES(%(z)s)[1]
); );
}else{ }else{
kSoftmaxWithBias_fixed_shared%(nodename)s kSoftmaxWithBias_fixed_shared%(nodename)s
...@@ -725,15 +725,15 @@ class GpuSoftmaxWithBias (GpuOp): ...@@ -725,15 +725,15 @@ class GpuSoftmaxWithBias (GpuOp):
PyGpuArray_DIMS(%(x)s)[1], PyGpuArray_DIMS(%(x)s)[1],
CudaNdarray_DEV_DATA(%(x)s), CudaNdarray_DEV_DATA(%(x)s),
CudaNdarray_HOST_STRIDES(%(x)s)[0], PyGpuArray_STRIDES(%(x)s)[0],
CudaNdarray_HOST_STRIDES(%(x)s)[1], PyGpuArray_STRIDES(%(x)s)[1],
CudaNdarray_DEV_DATA(%(b)s), CudaNdarray_DEV_DATA(%(b)s),
CudaNdarray_HOST_STRIDES(%(b)s)[0], PyGpuArray_STRIDES(%(b)s)[0],
CudaNdarray_DEV_DATA(%(z)s), CudaNdarray_DEV_DATA(%(z)s),
CudaNdarray_HOST_STRIDES(%(z)s)[0], PyGpuArray_STRIDES(%(z)s)[0],
CudaNdarray_HOST_STRIDES(%(z)s)[1] PyGpuArray_STRIDES(%(z)s)[1]
); );
} }
CNDA_THREAD_SYNC; CNDA_THREAD_SYNC;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论