From 7762e2b9624c66ab990a8398818faaaac1d0a50e Mon Sep 17 00:00:00 2001 From: Remi Cresson <remi.cresson@inrae.fr> Date: Fri, 30 Sep 2022 12:41:24 +0200 Subject: [PATCH] FIX: inference wrt OTBTF 3.3.0 --- decloud/production/inference.py | 2 +- decloud/production/monthly_synthesis_processor_s2.py | 2 +- decloud/production/monthly_synthesis_processor_s2s1.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/decloud/production/inference.py b/decloud/production/inference.py index d2d4e5b..4570577 100644 --- a/decloud/production/inference.py +++ b/decloud/production/inference.py @@ -86,7 +86,7 @@ def inference(sources, sources_scales, pad, ts, savedmodel_dir, out_tensor, out_ get_key("placeholder"): placeholder}) # Model - parameters.update({"model.dir": savedmodel_dir, "model.fullyconv": 1, + parameters.update({"model.dir": savedmodel_dir, "model.fullyconv": True, "output.names": [padded_tensor_name(out_tensor, pad)], "output.efieldx": efield, "output.efieldy": efield, "optim.tilesizex": efield, "optim.tilesizey": efield, diff --git a/decloud/production/monthly_synthesis_processor_s2.py b/decloud/production/monthly_synthesis_processor_s2.py index fe2423d..b062414 100644 --- a/decloud/production/monthly_synthesis_processor_s2.py +++ b/decloud/production/monthly_synthesis_processor_s2.py @@ -109,7 +109,7 @@ def monthly_synthesis_inference(sources, sources_scales, pad, ts, savedmodel_dir get_key("placeholder"): placeholder}) # Model - infer_params.update({"model.dir": savedmodel_dir, "model.fullyconv": 1, + infer_params.update({"model.dir": savedmodel_dir, "model.fullyconv": True, "output.names": [padded_tensor_name(out_tensor, pad)], "output.efieldx": efield, "output.efieldy": efield, "optim.tilesizex": efield, "optim.tilesizey": efield, diff --git a/decloud/production/monthly_synthesis_processor_s2s1.py b/decloud/production/monthly_synthesis_processor_s2s1.py index f69dbc1..46e10e7 100644 --- a/decloud/production/monthly_synthesis_processor_s2s1.py +++ b/decloud/production/monthly_synthesis_processor_s2s1.py @@ -109,7 +109,7 @@ def monthly_synthesis_inference(sources, sources_scales, pad, ts, savedmodel_dir get_key("placeholder"): placeholder}) # Model - infer_params.update({"model.dir": savedmodel_dir, "model.fullyconv": 1, + infer_params.update({"model.dir": savedmodel_dir, "model.fullyconv": True, "output.names": [padded_tensor_name(out_tensor, pad)], "output.efieldx": efield, "output.efieldy": efield, "optim.tilesizex": efield, "optim.tilesizey": efield, -- GitLab