From: Sergio Guadarrama <sguada@gmail.com>
Date: Fri, 16 May 2014 00:42:38 +0000 (-0700)
Subject: Fix types of ArgMax Layers params
X-Git-Tag: submit/tizen/20180823.020014~653^2~143^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdcd75e48746be0aab0d4c8b606eeb2aac6c9ae8;p=platform%2Fupstream%2Fcaffeonacl.git

Fix types of ArgMax Layers params

Conflicts:

	include/caffe/vision_layers.hpp
	src/caffe/proto/caffe.proto
---

diff --git a/src/caffe/proto/caffe.proto b/src/caffe/proto/caffe.proto
index b5bc26b..d73357c 100644
--- a/src/caffe/proto/caffe.proto
+++ b/src/caffe/proto/caffe.proto
@@ -189,7 +189,6 @@ message LayerParameter {
   optional WindowDataParameter window_data_param = 20;
   optional ArgMaxParameter argmax_param = 23;
 
-
   // DEPRECATED: The layer parameters specified as a V0LayerParameter.
   // This should never be used by any code except to upgrade to the new
   // LayerParameter specification.
@@ -197,6 +196,7 @@ message LayerParameter {
 }
 
 // Message that stores parameters used by ArgMaxLayer
+
 message ArgMaxParameter {
   // If true produce pairs (argmax, maxval) 
   optional bool out_max_val = 1 [default = false];