From: Jeff Donahue Date: Thu, 15 Jan 2015 03:00:58 +0000 (-0800) Subject: add test that all V1 layer type enum values upgrade to valid V2 string X-Git-Tag: submit/tizen/20180823.020014~572^2~36^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e64bf225b492d61f357cc52a7269ba5e7db0f00b;p=platform%2Fupstream%2Fcaffeonacl.git add test that all V1 layer type enum values upgrade to valid V2 string types --- diff --git a/src/caffe/test/test_upgrade_proto.cpp b/src/caffe/test/test_upgrade_proto.cpp index 3a135a6..8cff961 100644 --- a/src/caffe/test/test_upgrade_proto.cpp +++ b/src/caffe/test/test_upgrade_proto.cpp @@ -7,6 +7,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/layer.hpp" #include "caffe/util/upgrade_proto.hpp" #include "caffe/test/test_caffe_main.hpp" @@ -2848,4 +2849,21 @@ TEST_F(NetUpgradeTest, TestImageNet) { this->RunV1UpgradeTest(expected_v1_proto, expected_v2_proto); } // NOLINT(readability/fn_size) +TEST_F(NetUpgradeTest, TestUpgradeV1LayerType) { + LayerParameter layer_param; + shared_ptr > layer; + for (int i = 0; i < V1LayerParameter_LayerType_LayerType_ARRAYSIZE; ++i) { + ASSERT_TRUE(V1LayerParameter_LayerType_IsValid(i)); + V1LayerParameter_LayerType v1_type = V1LayerParameter_LayerType(i); + string v2_layer_type(UpgradeV1LayerType(v1_type)); + if (v2_layer_type == "") { + EXPECT_EQ(V1LayerParameter_LayerType_NONE, v1_type); + continue; // Empty string isn't actually a valid layer type. + } + layer_param.set_type(v2_layer_type); + layer.reset(LayerRegistry::CreateLayer(layer_param)); + EXPECT_EQ(v2_layer_type, layer->type()); + } +} + } // NOLINT(readability/fn_size) // namespace caffe