From bdcd75e48746be0aab0d4c8b606eeb2aac6c9ae8 Mon Sep 17 00:00:00 2001 From: Sergio Guadarrama Date: Thu, 15 May 2014 17:42:38 -0700 Subject: [PATCH] Fix types of ArgMax Layers params Conflicts: include/caffe/vision_layers.hpp src/caffe/proto/caffe.proto --- src/caffe/proto/caffe.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]; -- 2.7.4