Skip to content

Commit 1673a99

Browse files
committed
fix: CI on Jetson nano with lighter classification model
1 parent d72a138 commit 1673a99

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

tests/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ if (USE_TENSORRT)
323323
"faces_512"
324324
)
325325
DOWNLOAD_DATASET(
326-
"Age test set"
327-
"https://deepdetect.com/models/init/desktop/images/classification/age_real.tar.gz"
328-
"examples/trt/age_real"
329-
"age_real.tar.gz"
326+
"Embedded ImageNet classification"
327+
"https://deepdetect.com/models/init/embedded/images/classification/squeezenet_v1.tar.gz"
328+
"examples/trt/squeezenet_v1"
329+
"squeezenet_v1.tar.gz"
330330
"deploy.prototxt"
331331
)
332332
DOWNLOAD_DATASET(

tests/ut-tensorrtapi.cc

+12-14
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static std::string not_found_str
3838

3939
static std::string squeez_repo = "../examples/trt/squeezenet_ssd_trt/";
4040
static std::string refinedet_repo = "../examples/trt/faces_512/";
41-
static std::string age_repo = "../examples/trt/age_real/";
41+
static std::string squeezv1_repo = "../examples/trt/squeezenet_v1/";
4242
static std::string resnet_onnx_repo = "../examples/trt/resnet_onnx_trt/";
4343
static std::string cyclegan_onnx_repo
4444
= "../examples/trt/cyclegan_resnet_attn_onnx_trt/";
@@ -97,22 +97,22 @@ TEST(tensorrtapi, service_predict_best)
9797
{
9898
// create service
9999
JsonAPI japi;
100-
std::string sname = "age";
100+
std::string sname = "imagenet";
101101
std::string jstr
102102
= "{\"mllib\":\"tensorrt\",\"description\":\"age_classif\",\"type\":"
103103
"\"supervised\",\"model\":{\"repository\":\""
104-
+ age_repo
104+
+ squeezv1_repo
105105
+ "\"},\"parameters\":{\"input\":{\"connector\":\"image\",\"height\":"
106-
"224,\"width\":224},\"mllib\":{\"datatype\":\"fp32\","
106+
"227,\"width\":227},\"mllib\":{\"datatype\":\"fp32\","
107107
"\"maxBatchSize\":1,\"maxWorkspaceSize\":256,"
108108
"\"tensorRTEngineFile\":\"TRTengine\",\"gpuid\":0}}}";
109109
std::string joutstr = japi.jrender(japi.service_create(sname, jstr));
110110
ASSERT_EQ(created_str, joutstr);
111111

112112
// predict
113113
std::string jpredictstr
114-
= "{\"service\":\"age\",\"parameters\":{\"input\":{\"height\":224,"
115-
"\"width\":224},\"output\":{\"best\":2}},\"data\":[\""
114+
= "{\"service\":\"imagenet\",\"parameters\":{\"input\":{\"height\":227,"
115+
"\"width\":227},\"output\":{\"best\":2}},\"data\":[\""
116116
+ squeez_repo + "face.jpg\"]}";
117117
joutstr = japi.jrender(japi.service_predict(jpredictstr));
118118
JDoc jd;
@@ -122,20 +122,18 @@ TEST(tensorrtapi, service_predict_best)
122122
ASSERT_EQ(200, jd["status"]["code"]);
123123
ASSERT_TRUE(jd["body"]["predictions"].IsArray());
124124
ASSERT_EQ(2, jd["body"]["predictions"][0]["classes"].Size());
125-
std::string age
125+
std::string cls
126126
= jd["body"]["predictions"][0]["classes"][0]["cat"].GetString();
127-
ASSERT_TRUE(age == "29");
128-
std::cout << "looking for " << age_repo << "TRTengine_arch"
127+
ASSERT_TRUE(cls == "n04357314 sunscreen, sunblock, sun blocker");
128+
std::cout << "looking for " << squeezv1_repo << "TRTengine_arch"
129129
<< get_trt_archi() << "_bs1" << std::endl;
130-
ASSERT_TRUE(fileops::file_exists(age_repo + "TRTengine_arch"
130+
ASSERT_TRUE(fileops::file_exists(squeezv1_repo + "TRTengine_arch"
131131
+ get_trt_archi() + "_bs1"));
132-
/*ASSERT_TRUE(!fileops::remove_file(age_repo, "net_tensorRT.proto"));
133-
ASSERT_TRUE(!fileops::remove_file(age_repo, "TRTengine_bs_bs1"));*/
134132
jstr = "{\"clear\":\"lib\"}";
135133
joutstr = japi.jrender(japi.service_delete(sname, jstr));
136134
ASSERT_EQ(ok_str, joutstr);
137-
ASSERT_TRUE(!fileops::file_exists(age_repo + "net_tensorRT.proto"));
138-
ASSERT_TRUE(!fileops::file_exists(age_repo + "TRTengine_arch"
135+
ASSERT_TRUE(!fileops::file_exists(squeezv1_repo + "net_tensorRT.proto"));
136+
ASSERT_TRUE(!fileops::file_exists(squeezv1_repo + "TRTengine_arch"
139137
+ get_trt_archi() + "_bs1"));
140138
}
141139

0 commit comments

Comments
 (0)