Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Deconvolution to SpatialFullConvolution #75

Closed
wants to merge 1 commit into from
Closed

Add Deconvolution to SpatialFullConvolution #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 63 additions & 4 deletions loadcaffe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
int fd = open(filename, O_RDONLY);
if(fd < 0)
return false;

FileInputStream* input = new FileInputStream(fd);
bool success = google::protobuf::TextFormat::Parse(input, proto);
delete input;
Expand All @@ -56,13 +56,13 @@ bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
int fd = open(filename, O_RDONLY);
if(fd < 0)
return false;

ZeroCopyInputStream* raw_input = new FileInputStream(fd);
CodedInputStream* coded_input = new CodedInputStream(raw_input);
coded_input->SetTotalBytesLimit(1073741824, 536870912);

bool success = proto->ParseFromCodedStream(coded_input);

delete coded_input;
delete raw_input;
close(fd);
Expand Down Expand Up @@ -428,6 +428,65 @@ void convertProtoToLuaV2(const caffe::NetParameter &netparam, const char* lua_na
lines.emplace_back(layer.name(), buf);
}
}
if(layer.type() == "Deconvolution")
{
auto &param = layer.convolution_param();
int groups = param.group() == 0 ? 1 : param.group();
auto &wB = layer.blobs(0);
int nInputPlane = (wB.has_shape() ? wB.shape().dim(1) : wB.channels())*groups;
int nOutputPlane = wB.has_shape() ? wB.shape().dim(0) : wB.num();
//int nOutputPlane = param.num_output();
num_output = nOutputPlane;
int kW = param.kernel_w();
int kH = param.kernel_h();
int dW = param.stride_w();
int dH = param.stride_h();
if(kW==0 || kH==0)
{
kW = param.kernel_size();
kH = kW;
}
if(dW==0 || dH==0)
{
dW = param.stride();
dH = dW;
}
int pad_w = param.pad_w();
int pad_h = param.pad_h();
if(pad_w==0 || pad_h==0)
{
pad_w = param.pad();
pad_h = pad_w;
}
if(cuda_package_type == CCN2)
{
std::cout << "ccn2 does not support SpatialFullConvolution !\n";
break;
}
else if(cuda_package_type == NN)
{
if(groups != 1)
{
std::cout << "nn supports no groups!\n";
break;
}
char buf[1024];
sprintf(buf, "nn.SpatialFullConvolution(%d, %d, %d, %d, %d, %d, %d, %d)",
nInputPlane, nOutputPlane, kW, kH, dW, dH, pad_w, pad_h);
lines.emplace_back(layer.name(), buf);
}
else
{
if(groups != 1)
{
std::cout << "warning: cudnn supports no groups for SpatialFullConvolution !\n";
}
char buf[1024];
sprintf(buf, "cudnn.SpatialFullConvolution(%d, %d, %d, %d, %d, %d, %d, %d)",
nInputPlane, nOutputPlane, kW, kH, dW, dH, pad_w, pad_h);
lines.emplace_back(layer.name(), buf);
}
}
if(layer.type() == "Pooling")
{
auto &param = layer.pooling_param();
Expand Down