diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index aee4395220da9820a2f3e15acc6011b26b6528ee..f2f176f4f7c583810e34408947bee725e07bbe09 100644 --- a/test/CMakeLists.txt +++ b/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}) + diff --git a/test/data/apTvClTensorflowModelServeFCNN64x64to32x32.tif b/test/data/apTvClTensorflowModelServeFCNN64x64to32x32.tif new file mode 100644 index 0000000000000000000000000000000000000000..1d22a3b97f6f2ded86651054be8259751ee0df11 Binary files /dev/null and b/test/data/apTvClTensorflowModelServeFCNN64x64to32x32.tif differ diff --git a/test/data/pxs_subset2.tif b/test/data/pxs_subset2.tif new file mode 100644 index 0000000000000000000000000000000000000000..64991c0567ca34217558a502a7071eb34e241c21 Binary files /dev/null and b/test/data/pxs_subset2.tif differ diff --git a/test/models/model4/saved_model.pb b/test/models/model4/saved_model.pb new file mode 100644 index 0000000000000000000000000000000000000000..77c215d9793884ece37c8a20c802d4b18e0edb47 Binary files /dev/null and b/test/models/model4/saved_model.pb differ diff --git a/test/models/model4/variables/variables.data-00000-of-00001 b/test/models/model4/variables/variables.data-00000-of-00001 new file mode 100644 index 0000000000000000000000000000000000000000..2837c8c97d562b7d107dd81636816db722d7ae9c Binary files /dev/null and b/test/models/model4/variables/variables.data-00000-of-00001 differ diff --git a/test/models/model4/variables/variables.index b/test/models/model4/variables/variables.index new file mode 100644 index 0000000000000000000000000000000000000000..25810ce3e68510179ea8ee45fd3f5c24c45d7bb9 Binary files /dev/null and b/test/models/model4/variables/variables.index differ