Skip to content

build for CPU_ONLY=1 and USE_ACL=0 #44

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

Open
lvyes1988 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build for CPU_ONLY=1 and USE_ACL=0 #44

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions examples/cpp_classification/classification_profiling_schedule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ Classifier::Classifier(const string& model_file,
Caffe::set_mode(Caffe::GPU);
#endif

#ifdef USE_ACL
AclEnableSchedule();
#endif
/* Load the network. */
net_.reset(new Net<float>(model_file, TEST));
net_->CopyTrainedLayersFrom(trained_file);
Expand Down
2 changes: 2 additions & 0 deletions include/caffe/layer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ extern unsigned int acl_log_flags;
namespace boost { class mutex; }

namespace caffe {
#ifdef USE_ACL
bool AclEnableSchedule(int enable=1);
#endif
#ifdef USE_PROFILING
class logtime_util
{
Expand Down
5 changes: 4 additions & 1 deletion src/caffe/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ void GlobalInit(int* pargc, char*** pargv) {
#ifdef CPU_ONLY // CPU-only Caffe.

Caffe::Caffe()
: random_generator_(), mode_(Caffe::CPU),use_mali_gpu_(false),
: random_generator_(), mode_(Caffe::CPU),
#ifdef USE_ACL
use_mali_gpu_(false),
#endif
solver_count_(1), solver_rank_(0), multiprocess_(false)
{
}
Expand Down