summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYao Honggui <honggui@openailab.com>2017-07-01 23:48:54 +0800
committerYao Honggui <honggui@openailab.com>2017-07-01 23:48:54 +0800
commit3c0a5e212c5b8b98f5d49c8797305be65aeef9f4 (patch)
tree4a6964b20a263a968003929ccabe42f87c1256cb
parent89a4228aa2c74314bd6d111f9ae849fe5d2970a1 (diff)
downloadcaffeonacl-3c0a5e212c5b8b98f5d49c8797305be65aeef9f4.tar.gz
caffeonacl-3c0a5e212c5b8b98f5d49c8797305be65aeef9f4.tar.bz2
caffeonacl-3c0a5e212c5b8b98f5d49c8797305be65aeef9f4.zip
To match the new ARM Compute Library version 17.06
-rw-r--r--docs/caffeOnACL_release_notes_0_2_0.docxbin180265 -> 181640 bytes
-rw-r--r--src/caffe/layers/acl_lrn_layer.cpp3
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/caffeOnACL_release_notes_0_2_0.docx b/docs/caffeOnACL_release_notes_0_2_0.docx
index 0c1c0141..56a7f804 100644
--- a/docs/caffeOnACL_release_notes_0_2_0.docx
+++ b/docs/caffeOnACL_release_notes_0_2_0.docx
Binary files differ
diff --git a/src/caffe/layers/acl_lrn_layer.cpp b/src/caffe/layers/acl_lrn_layer.cpp
index 9c03cad1..6e5c7bcb 100644
--- a/src/caffe/layers/acl_lrn_layer.cpp
+++ b/src/caffe/layers/acl_lrn_layer.cpp
@@ -5,6 +5,7 @@
namespace caffe {
+const NormType IN_MAP=(arm_compute::NormType)0;
template <typename Dtype>
void ACLLRNLayer<Dtype>::LayerSetUp(const vector<Blob<Dtype>*>& bottom,
const vector<Blob<Dtype>*>& top) {
@@ -28,7 +29,7 @@ void ACLLRNLayer<Dtype>::SetupACLLayer(const vector<Blob<Dtype>*>& bottom,
//this->force_bypass_acl_path_=false;
NormalizationLayerInfo *norm_info;
if(this->layer_param_.lrn_param().norm_region() == LRNParameter_NormRegion_WITHIN_CHANNEL)
- norm_info=new NormalizationLayerInfo(NormType::IN_MAP, this->size_, this->alpha_, this->beta_, this->k_);
+ norm_info=new NormalizationLayerInfo(IN_MAP, this->size_, this->alpha_, this->beta_, this->k_);
else
norm_info=new NormalizationLayerInfo(NormType::CROSS_MAP, this->size_, this->alpha_, this->beta_, this->k_);