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

Fix failure to run on system without GPU in CPU mode #6245

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix failure to run on system without GPU in CPU mode #6245

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d65918
Fix failure to run on system without GPU in CPU mode
artyom-beilis Feb 20, 2018
c006d16
Style fix
artyom-beilis Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 19 additions & 7 deletions src/caffe/layer_factory.cpp
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ shared_ptr<Layer<Dtype> > GetConvolutionLayer(
if (engine == ConvolutionParameter_Engine_DEFAULT) {
engine = ConvolutionParameter_Engine_CAFFE;
#ifdef USE_CUDNN
if (!use_dilation) {
if (!use_dilation && Caffe::mode() == Caffe::GPU) {
engine = ConvolutionParameter_Engine_CUDNN;
}
#endif
Expand Down Expand Up @@ -80,7 +80,9 @@ shared_ptr<Layer<Dtype> > GetPoolingLayer(const LayerParameter& param) {
if (engine == PoolingParameter_Engine_DEFAULT) {
engine = PoolingParameter_Engine_CAFFE;
#ifdef USE_CUDNN
engine = PoolingParameter_Engine_CUDNN;
if (Caffe::mode() == Caffe::GPU) {
engine = PoolingParameter_Engine_CUDNN;
}
#endif
}
if (engine == PoolingParameter_Engine_CAFFE) {
Expand Down Expand Up @@ -118,7 +120,9 @@ shared_ptr<Layer<Dtype> > GetLRNLayer(const LayerParameter& param) {

if (engine == LRNParameter_Engine_DEFAULT) {
#ifdef USE_CUDNN
engine = LRNParameter_Engine_CUDNN;
if (Caffe::mode() == Caffe::GPU) {
engine = LRNParameter_Engine_CUDNN;
}
#else
engine = LRNParameter_Engine_CAFFE;
#endif
Expand Down Expand Up @@ -156,7 +160,9 @@ shared_ptr<Layer<Dtype> > GetReLULayer(const LayerParameter& param) {
if (engine == ReLUParameter_Engine_DEFAULT) {
engine = ReLUParameter_Engine_CAFFE;
#ifdef USE_CUDNN
engine = ReLUParameter_Engine_CUDNN;
if (Caffe::mode() == Caffe::GPU) {
engine = ReLUParameter_Engine_CUDNN;
}
#endif
}
if (engine == ReLUParameter_Engine_CAFFE) {
Expand All @@ -180,7 +186,9 @@ shared_ptr<Layer<Dtype> > GetSigmoidLayer(const LayerParameter& param) {
if (engine == SigmoidParameter_Engine_DEFAULT) {
engine = SigmoidParameter_Engine_CAFFE;
#ifdef USE_CUDNN
engine = SigmoidParameter_Engine_CUDNN;
if (Caffe::mode() == Caffe::GPU) {
engine = SigmoidParameter_Engine_CUDNN;
}
#endif
}
if (engine == SigmoidParameter_Engine_CAFFE) {
Expand All @@ -204,7 +212,9 @@ shared_ptr<Layer<Dtype> > GetSoftmaxLayer(const LayerParameter& param) {
if (engine == SoftmaxParameter_Engine_DEFAULT) {
engine = SoftmaxParameter_Engine_CAFFE;
#ifdef USE_CUDNN
engine = SoftmaxParameter_Engine_CUDNN;
if (Caffe::mode() == Caffe::GPU) {
engine = SoftmaxParameter_Engine_CUDNN;
}
#endif
}
if (engine == SoftmaxParameter_Engine_CAFFE) {
Expand All @@ -228,7 +238,9 @@ shared_ptr<Layer<Dtype> > GetTanHLayer(const LayerParameter& param) {
if (engine == TanHParameter_Engine_DEFAULT) {
engine = TanHParameter_Engine_CAFFE;
#ifdef USE_CUDNN
engine = TanHParameter_Engine_CUDNN;
if (Caffe::mode() == Caffe::GPU) {
engine = TanHParameter_Engine_CUDNN;
}
#endif
}
if (engine == TanHParameter_Engine_CAFFE) {
Expand Down