Skip to content

P
pytensor
提交 a7cdae3f authored 作者: lamblin's avatar lamblin
浏览文件
操作

Merge pull request #659 from nouiz/gpu_limit

Gpu limit
上级 c1ee7dd5 1a7a5b1c
隐藏空白字符变更
内嵌 并排
正在显示 包含 120 行增加 和 92 行删除
theano/sandbox/cuda/blas.py
浏览文件 @ a7cdae3f
...@@ -843,7 +843,7 @@ class GpuDownsampleFactorMax(GpuOp): ...@@ -843,7 +843,7 @@ class GpuDownsampleFactorMax(GpuOp):
#def perform(self, node, input_storage, output_storage): #def perform(self, node, input_storage, output_storage):
#raise NotImplementedError('only C is implemented') #raise NotImplementedError('only C is implemented')
def c_code_cache_version(self): def c_code_cache_version(self):
return (4) return (5)
def c_code(self, node, nodename, inp, out, sub): def c_code(self, node, nodename, inp, out, sub):
x, = inp x, = inp
...@@ -896,7 +896,8 @@ class GpuDownsampleFactorMax(GpuOp): ...@@ -896,7 +896,8 @@ class GpuDownsampleFactorMax(GpuOp):
} }
} }
{ {
dim3 grid(dims[0] * dims[1], dims[2]); dim3 grid(std::min(dims[0] * dims[1], 65535),
dims[2]);
//dim3 block(std::min(dims[3], 512)); //dim3 block(std::min(dims[3], 512));
//TODO: implement this by supporting more outputs than threads //TODO: implement this by supporting more outputs than threads
dim3 block(dims[3]); dim3 block(dims[3]);
...@@ -943,53 +944,59 @@ class GpuDownsampleFactorMax(GpuOp): ...@@ -943,53 +944,59 @@ class GpuDownsampleFactorMax(GpuOp):
float *z, int zS0, int zS1, int zS2, int zS3) float *z, int zS0, int zS1, int zS2, int zS3)
{ {
float cur_max, cur_x; float cur_max, cur_x;
int i0 = blockIdx.x %% D0; for(int block_x_idx = blockIdx.x;
int i1 = blockIdx.x / D0; block_x_idx < D0 * D1;
int i2 = blockIdx.y; block_x_idx += gridDim.x){
extern __shared__ float xbuf[]; //size [xD3] int i0 = block_x_idx %% D0;
int i1 = block_x_idx / D0;
int i2 = blockIdx.y;
for (int r2 = 0; extern __shared__ float xbuf[]; //size [xD3]
(r2 < pf2) && (%(ignore_border)s || (r2 + i2*pf2 < xD2));
++r2)
{
__syncthreads();
// load the current row of the image into shared memory
for (int j = threadIdx.x; j < xD3; j += blockDim.x)
{
xbuf[j] = x[i0*xS0 + i1*xS1 + (i2*pf2+r2)*xS2 + j*xS3];
}
__syncthreads();
// initialize our max if this is the first row we're loading
cur_max = (r2 == 0) ? xbuf[threadIdx.x*pf3] : cur_max;
// do a mini-reduction over the pf3 relevant elements
// in the current row
if (%(ignore_border)s) for (int r2 = 0;
(r2 < pf2) && (%(ignore_border)s || (r2 + i2*pf2 < xD2));
++r2)
{ {
for (int k = 0; k < pf3; ++k) __syncthreads();
// load the current row of the image into shared memory
for (int j = threadIdx.x; j < xD3; j += blockDim.x)
{ {
cur_x = xbuf[threadIdx.x*pf3+k]; xbuf[j] = x[i0*xS0 + i1*xS1 + (i2*pf2+r2)*xS2 + j*xS3];
cur_max = (cur_x > cur_max) ? cur_x : cur_max;
} }
} __syncthreads();
else
{ // initialize our max if this is the
for (int k = 0; k < pf3; ++k) // first row we're loading
cur_max = (r2 == 0) ? xbuf[threadIdx.x*pf3] : cur_max;
// do a mini-reduction over the pf3 relevant elements
// in the current row
if (%(ignore_border)s)
{ {
if (threadIdx.x*pf3 + k < xD3) for (int k = 0; k < pf3; ++k)
{ {
cur_x = xbuf[threadIdx.x*pf3+k]; cur_x = xbuf[threadIdx.x*pf3+k];
cur_max = (cur_x > cur_max) ? cur_x : cur_max; cur_max = (cur_x > cur_max) ? cur_x : cur_max;
} }
} }
else
{
for (int k = 0; k < pf3; ++k)
{
if (threadIdx.x*pf3 + k < xD3)
{
cur_x = xbuf[threadIdx.x*pf3+k];
cur_max = (cur_x > cur_max) ? cur_x : cur_max;
}
}
}
} }
}
//store the result to global memory //store the result to global memory
z[i0*zS0 + i1*zS1 + i2*zS2 + threadIdx.x*zS3] = cur_max; z[i0*zS0 + i1*zS1 + i2*zS2 + threadIdx.x*zS3] = cur_max;
}
} }
""" % locals() """ % locals()
...@@ -1019,8 +1026,7 @@ class GpuDownsampleFactorMaxGrad(GpuOp): ...@@ -1019,8 +1026,7 @@ class GpuDownsampleFactorMaxGrad(GpuOp):
return Apply(self, [x, z, gz], [x.type()]) return Apply(self, [x, z, gz], [x.type()])
def c_code_cache_version(self): def c_code_cache_version(self):
#return () return (6,)
return (5,)
def c_code(self, node, nodename, inp, out, sub): def c_code(self, node, nodename, inp, out, sub):
x, z, gz = inp x, z, gz = inp
...@@ -1062,7 +1068,8 @@ class GpuDownsampleFactorMaxGrad(GpuOp): ...@@ -1062,7 +1068,8 @@ class GpuDownsampleFactorMaxGrad(GpuOp):
// make sure we cover every x row when ignore border isset and // make sure we cover every x row when ignore border isset and
// there's a border present to be ignored // there's a border present to be ignored
int needs_extra_z_col = %(ignore_border)s && (CudaNdarray_HOST_DIMS(%(x)s)[2] %% %(ds0)s); int needs_extra_z_col = %(ignore_border)s && (CudaNdarray_HOST_DIMS(%(x)s)[2] %% %(ds0)s);
dim3 grid(CudaNdarray_HOST_DIMS(%(z)s)[0],CudaNdarray_HOST_DIMS(%(z)s)[2] + (needs_extra_z_col ? 1 : 0)); dim3 grid(std::min(CudaNdarray_HOST_DIMS(%(z)s)[0], 65535),
CudaNdarray_HOST_DIMS(%(z)s)[2] + (needs_extra_z_col ? 1 : 0));
dim3 block(std::min(CudaNdarray_HOST_DIMS(%(x)s)[3], 512)); dim3 block(std::min(CudaNdarray_HOST_DIMS(%(x)s)[3], 512));
kDownsampleMaxGrad_%(nodename)s<%(ds0)s, %(ds1)s> <<<grid, block>>>( kDownsampleMaxGrad_%(nodename)s<%(ds0)s, %(ds1)s> <<<grid, block>>>(
...@@ -1136,72 +1143,76 @@ class GpuDownsampleFactorMaxGrad(GpuOp): ...@@ -1136,72 +1143,76 @@ class GpuDownsampleFactorMaxGrad(GpuOp):
// various .S. variables are strides // various .S. variables are strides
float cur_max, cur_x, my_z, my_gz; float cur_max, cur_x, my_z, my_gz;
int i0 = blockIdx.x; // image row for(int i0 = blockIdx.x;
int i1 = 0; // image col i0 < D0;
// row wrt z and/or gz, ranges from 0 to D2 - 1 OR D2 i0 += gridDim.x){
// (as needed to cover all x rows)
int i2 = blockIdx.y;
int x_col = threadIdx.x; // col wrt x, ranges from 0 to xD3 - 1
int z_col = x_col/ds1; // z_col corresponding to this x_col
int i1 = 0; // image col
// row wrt z and/or gz, ranges from 0 to D2 - 1 OR D2
// (as needed to cover all x rows)
int i2 = blockIdx.y;
int x_col = threadIdx.x; // col wrt x, ranges from 0 to xD3 - 1
int z_col = x_col/ds1; // z_col corresponding to this x_col
//TODO: raise occupancy. Use threadIdx.y to run several
// iterations of this i1 loop in parallel
for (i1 = 0; i1 < D1; ++i1) // loop over images (same for z and x) //TODO: raise occupancy. Use threadIdx.y to run several
{ // iterations of this i1 loop in parallel
for(int col_iter = 0;
col_iter * blockDim.x <= xD3 ; col_iter++){
//The if inside is to don't do the division if we for (i1 = 0; i1 < D1; ++i1) // loop over images (same for z and x)
// need only 1 col_iter {
for(int col_iter = 0;
col_iter * blockDim.x <= xD3 ; col_iter++){
if(blockDim.x != xD3) //The if inside is to don't do the division if we
{ // need only 1 col_iter
x_col = threadIdx.x + col_iter * blockDim.x;
z_col = x_col/ds1;
}
if (%(ignore_border)s && x_col >= ds1 * D3) if(blockDim.x != xD3)
{ {
// This happens only if x_col was ignored x_col = threadIdx.x + col_iter * blockDim.x;
// (via ignore_border) z_col = x_col/ds1;
// TODO: if ignore_border is False, this is impossible }
// and we don't even need to generate this code.
if (%(ignore_border)s && x_col >= ds1 * D3)
{
// This happens only if x_col was ignored
// (via ignore_border)
// TODO: if ignore_border is False, this is impossible
// and we don't even need to generate this code.
my_gz = 0.0f; my_gz = 0.0f;
//any fp number suffices for my_z, so we don't even //any fp number suffices for my_z, so we don't even
//need to set it to anything in particular. //need to set it to anything in particular.
} }
else else
{
// this is effectively:
// my_gz = gz[image_row][image_col][z_row][z_col]
// my_z = z[image_row][image_col][z_row][z_col]
my_gz = gz[i0 * gzS0 + i1 * gzS1 + i2 * gzS2 +
z_col*gzS3];
my_z = z[i0 * zS0 + i1 * zS1 + i2 * zS2 +
z_col* zS3];
}
if(x_col<xD3){
for (int x_row = i2*ds0;
(x_row < i2*ds0+ds0) && (x_row < xD2); ++x_row)
{ {
// this is effectively: // this is effectively:
// gx[image_row][image_col][x_row][x_col] // my_gz = gz[image_row][image_col][z_row][z_col]
// = (my_z == x[image_row][image_col][ // my_z = z[image_row][image_col][z_row][z_col]
// x_row][x_col]) ? my_gz : 0.0f; my_gz = gz[i0 * gzS0 + i1 * gzS1 + i2 * gzS2 +
gx[i0 * D1*xD2*xD3 + i1*xD2*xD3 + z_col*gzS3];
x_row*xD3 + x_col] my_z = z[i0 * zS0 + i1 * zS1 + i2 * zS2 +
= (my_z == x[i0*xS0 + i1*xS1 + x_row*xS2 + z_col* zS3];
x_col*xS3]) ? my_gz : 0.0f; }
if(x_col<xD3){
for (int x_row = i2*ds0;
(x_row < i2*ds0+ds0) && (x_row < xD2); ++x_row)
{
// this is effectively:
// gx[image_row][image_col][x_row][x_col]
// = (my_z == x[image_row][image_col][
// x_row][x_col]) ? my_gz : 0.0f;
gx[i0 * D1*xD2*xD3 + i1*xD2*xD3 +
x_row*xD3 + x_col]
= (my_z == x[i0*xS0 + i1*xS1 + x_row*xS2 +
x_col*xS3]) ? my_gz : 0.0f;
}
//gx[i0 * D1*xD2*xD3 + i1*xD2*xD3 +
// x_row*xD3 + x_col] = -999;
} }
//gx[i0 * D1*xD2*xD3 + i1*xD2*xD3 +
// x_row*xD3 + x_col] = -999;
}
}
} }
} }
} }
......
theano/sandbox/cuda/tests/test_blas.py
浏览文件 @ a7cdae3f
import copy
from unittest import TestCase from unittest import TestCase
from theano.compile.pfunc import pfunc from theano.compile.pfunc import pfunc
...@@ -32,6 +33,12 @@ else: ...@@ -32,6 +33,12 @@ else:
mode_with_gpu = theano.compile.mode.get_default_mode().including('gpu') mode_with_gpu = theano.compile.mode.get_default_mode().including('gpu')
mode_without_gpu = theano.compile.mode.get_default_mode().excluding('gpu') mode_without_gpu = theano.compile.mode.get_default_mode().excluding('gpu')
#The CPU tests already compare C/Py, so we only check C/GPU
mode_with_gpu = copy.copy(mode_with_gpu)
mode_without_gpu = copy.copy(mode_without_gpu)
mode_with_gpu.check_py_code = False
mode_without_gpu.check_py_code = False
def my_rand(*shape): def my_rand(*shape):
return theano._asarray(numpy.random.rand(*shape), dtype='float32') return theano._asarray(numpy.random.rand(*shape), dtype='float32')
...@@ -269,6 +276,8 @@ def test_downsample(): ...@@ -269,6 +276,8 @@ def test_downsample():
(1, 1, 10, 1023), (1, 1, 10, 1023),
(1, 1, 1025, 10), (1, 1, 1025, 10),
(1, 1, 1023, 10), (1, 1, 1023, 10),
(65536, 1, 10, 10),
(1, 65536, 10, 10),
] ]
numpy.random.RandomState(unittest_tools.fetch_seed()).shuffle(shps) numpy.random.RandomState(unittest_tools.fetch_seed()).shuffle(shps)
...@@ -299,6 +308,14 @@ def test_downsample(): ...@@ -299,6 +308,14 @@ def test_downsample():
for node in f2.maker.env.toposort()]) for node in f2.maker.env.toposort()])
assert numpy.allclose(f(), f2()) assert numpy.allclose(f(), f2())
# The grad is too slow on GT220 GPU
# This cause the computer to freeze...
# Remove this when it get optimized enought
# This only bypass the last 2 checks
# Those tests where passing in all Mode on a GTX470
if shp[0] > 30000 or shp[1] > 30000:
continue
g = pfunc( g = pfunc(
[], [],
tensor.grad(ds_op(tensor.as_tensor_variable(a)).sum(), tensor.grad(ds_op(tensor.as_tensor_variable(a)).sum(),
...@@ -314,7 +331,7 @@ def test_downsample(): ...@@ -314,7 +331,7 @@ def test_downsample():
for node in g.maker.env.toposort()]) for node in g.maker.env.toposort()])
assert any([isinstance(node.op, DownsampleFactorMaxGrad) assert any([isinstance(node.op, DownsampleFactorMaxGrad)
for node in g2.maker.env.toposort()]) for node in g2.maker.env.toposort()])
assert numpy.allclose(g(), g2()) assert numpy.allclose(g(), g2()), shp
# We already check that the gpu version return # We already check that the gpu version return
# the same value as the gpu version for # the same value as the gpu version for
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论