From b2a5acaf4ee4e4dd6dc03cd574083e8b3bcf06a3 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Fri, 13 Jan 2023 17:26:38 +0000 Subject: [PATCH] dlr dsm: clash --- aimodel/src/deeplabv3_plus_test_rainfall.py | 2 +- aimodel/src/lib/dataset/dataset_mono.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aimodel/src/deeplabv3_plus_test_rainfall.py b/aimodel/src/deeplabv3_plus_test_rainfall.py index b4e0804..ca1a410 100755 --- a/aimodel/src/deeplabv3_plus_test_rainfall.py +++ b/aimodel/src/deeplabv3_plus_test_rainfall.py @@ -58,7 +58,7 @@ dataset_train, dataset_validate = dataset_mono( output_size=IMAGE_SIZE, input_size="same", filepath_heightmap=PATH_HEIGHTMAP, - remove_isolated_pixels=REMOVE_ISOLATED_PIXELS + do_remove_isolated_pixels=REMOVE_ISOLATED_PIXELS ) logger.info("Train Dataset:", dataset_train) diff --git a/aimodel/src/lib/dataset/dataset_mono.py b/aimodel/src/lib/dataset/dataset_mono.py index 2486964..6596e06 100644 --- a/aimodel/src/lib/dataset/dataset_mono.py +++ b/aimodel/src/lib/dataset/dataset_mono.py @@ -15,7 +15,7 @@ from .primitives.remove_isolated_pixels import remove_isolated_pixels # TO PARSE: -def parse_item(metadata, output_size=100, input_size="same", water_threshold=0.1, water_bins=2, heightmap=None, rainfall_scale_up=1, remove_isolated_pixels=True): +def parse_item(metadata, output_size=100, input_size="same", water_threshold=0.1, water_bins=2, heightmap=None, rainfall_scale_up=1, do_remove_isolated_pixels=True): if input_size == "same": input_size = output_size # This is almost always the case with e.g. the DeepLabV3+ model @@ -96,7 +96,7 @@ def parse_item(metadata, output_size=100, input_size="same", water_threshold=0.1 # water = tf.one_hot(water, water_bins, axis=-1, dtype=tf.int32) # SPARSE [LOSS dice] water = tf.cast(tf.math.greater_equal(water, water_threshold), dtype=tf.float32) - if remove_isolated_pixels: + if do_remove_isolated_pixels: water = remove_isolated_pixels(water) print("DEBUG DATASET_OUT:rainfall shape", rainfall.shape)