revised an compatibility issue with the new ACL 17.09 version. Docume… · hexujun/CaffeOnACL@c298116 · GitHub

1. hexujun
2. CaffeOnACL

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Commit c298116

Browse filesBrowse the repository at this point in the historyBrowse files

honggui

committed

revised an compatibility issue with the new ACL 17.09 version. Documents will be updated later on

1 parent a7de0cf commit c298116
Copy full SHA for c298116

3 files changed

+5-4Lines changed: 5 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/caffe
  • acl_layer.cpp
  • layers
    • acl_batch_norm_layer.cpp
    • acl_concat_layer.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/caffe/acl_layer.cpp‎

Copy file name to clipboardExpand all lines: src/caffe/acl_layer.cpp

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -116,7 +116,7 @@ int BaseTensor<ACLTensor>::tensor_copy(void * mem,bool toTensor)
116	116	#endif //USE_PROFILING
117	117	arm_compute::Window window;
118	118	ACLTensor* tensor=this;
119		- window.use_tensor_dimensions(tensor->info(), /* first_dimension =*/Window::DimY); // Iterate through the rows (not each element)
	119	+ window.use_tensor_dimensions(tensor->info()->tensor_shape(), /* first_dimension =*/Window::DimY); // Iterate through the rows (not each element)
120	120	int width = tensor->info()->tensor_shape()[0]; //->dimension(0); //window.x().end() - window.x().start(); // + 1;
121	121	int height = tensor->info()->tensor_shape()[1]; //->dimension(1); //window.y().end() - window.y().start(); // + 1;
122	122	int deepth = tensor->info()->tensor_shape()[2];

Collapse file

‎src/caffe/layers/acl_batch_norm_layer.cpp‎

Copy file name to clipboardExpand all lines: src/caffe/layers/acl_batch_norm_layer.cpp

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -115,13 +115,13 @@ void ACLBatchNormLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
115	115	Forward_gpu(bottom, top);
116	116	return;
117	117	}
	118	+ #ifdef USE_PROFILING
	119	+ logtime_util log_time(ACL_BN_INFO);
	120	+ #endif //USE_PROFILING
118	121	if (this->force_bypass_acl_path_||!this->use_global_stats_) {
119	122	BatchNormLayer<Dtype>::Forward_cpu(bottom,top);
120	123	return;
121	124	}
122		- #ifdef USE_PROFILING
123		- logtime_util log_time(ACL_BN_INFO);
124		- #endif //USE_PROFILING
125	125	const Dtype* bottom_data = bottom[0]->cpu_data();
126	126	Dtype* top_data = top[0]->mutable_cpu_data();
127	127	SetupACLLayer(bottom,top);

Collapse file

‎src/caffe/layers/acl_concat_layer.cpp‎

Copy file name to clipboardExpand all lines: src/caffe/layers/acl_concat_layer.cpp

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -113,6 +113,7 @@ void ACLConcatLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom,
113	113
114	114	template <typename Dtype>
115	115	ACLConcatLayer<Dtype>::~ACLConcatLayer() {
	116	+ if(this->force_bypass_acl_path_)return;
116	117	for (int i =0; i < cpu_vectors.size(); i ++) {
117	118	delete cpu_vectors[i];
118	119	}

0 commit comments

Comments

0 (0)