Merge pull request #50 from remicres/48-testing

ADD: test with Semantic segmentation model (Model4, 64x64->32x32 FCN)

test/CMakeLists.txt

@@ -8,11 +8,13 @@ set(MODELSDIR ${CMAKE_CURRENT_SOURCE_DIR}/models)
 set(IMAGEXS ${DATADIR}/xs_subset.tif)
 set(IMAGEPAN ${DATADIR}/pan_subset.tif)
 set(IMAGEPXS ${DATADIR}/pxs_subset.tif)
+set(IMAGEPXS2 ${DATADIR}/pxs_subset2.tif)
 
 # Input models
 set(MODEL1 ${MODELSDIR}/model1)
 set(MODEL2 ${MODELSDIR}/model2)
 set(MODEL3 ${MODELSDIR}/model3)
+set(MODEL4 ${MODELSDIR}/model4)
 
 # Output images and baselines
 set(MODEL1_PB_OUT apTvClTensorflowModelServeCNN16x16PB.tif)
@@ -20,6 +22,7 @@ set(MODEL2_PB_OUT apTvClTensorflowModelServeCNN8x8_32x32PB.tif)
 set(MODEL2_FC_OUT apTvClTensorflowModelServeCNN8x8_32x32FC.tif)
 set(MODEL3_PB_OUT apTvClTensorflowModelServeFCNN16x16PB.tif)
 set(MODEL3_FC_OUT apTvClTensorflowModelServeFCNN16x16FC.tif)
+set(MODEL4_FC_OUT apTvClTensorflowModelServeFCNN64x64to32x32.tif)
 
 #----------- Model serving : 1-branch CNN (16x16) Patch-Based ----------------
 otb_test_application(NAME TensorflowModelServeCNN16x16PB
@@ -85,4 +88,17 @@ otb_test_application(NAME apTvClTensorflowModelServeFCNN16x16FC
   ${DATADIR}/${MODEL3_FC_OUT}
   ${TEMP}/${MODEL3_FC_OUT})
 
+#----------- Model serving : 1-branch FCNN (64x64)-->(32x32), Fully-conv ----------------
+set(ENV{OTB_TF_NSOURCES} 1)
+otb_test_application(NAME apTvClTensorflowModelServeFCNN64x64to32x32.tif
+  APP  TensorflowModelServe
+  OPTIONS -source1.il ${IMAGEPXS2}
+  -source1.rfieldx 64 -source1.rfieldy 64 -source1.placeholder x
+  -output.efieldx 32 -output.efieldy 32 -output.names prediction_fcn
+  -model.dir ${MODEL4} -model.fullyconv on
+  -out ${TEMP}/${MODEL4_FC_OUT}
+  VALID --compare-image ${EPSILON_6}
+  ${DATADIR}/${MODEL4_FC_OUT}
+  ${TEMP}/${MODEL4_FC_OUT})
+