From 1d1533d160c5b5c8a84c97024bdd206193ac996c Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Fri, 2 Sep 2022 18:51:46 +0100 Subject: [PATCH] ai: how did things get this confusing --- aimodel/src/lib/ai/model_rainfallwater_contrastive.py | 2 +- aimodel/src/lib/dataset/dataset.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/aimodel/src/lib/ai/model_rainfallwater_contrastive.py b/aimodel/src/lib/ai/model_rainfallwater_contrastive.py index 7e986a5..33a88ff 100644 --- a/aimodel/src/lib/ai/model_rainfallwater_contrastive.py +++ b/aimodel/src/lib/ai/model_rainfallwater_contrastive.py @@ -14,7 +14,7 @@ def model_rainfallwater_contrastive(metadata, shape_water, batch_size=64, featur water_width, water_height = shape_water # shape = [width, height] water_channels = 1 # added in dataset → make_dataset → parse_item - rainfall_width, rainfall_height = math.floor(rainfall_width / 2), math.floor(rainfall_height / 2) + # rainfall_width, rainfall_height = math.floor(rainfall_width / 2), math.floor(rainfall_height / 2) logger.info("SOURCE shape_rainfall " + str(metadata["rainfallradar"])) logger.info("SOURCE shape_water " + str(metadata["waterdepth"])) diff --git a/aimodel/src/lib/dataset/dataset.py b/aimodel/src/lib/dataset/dataset.py index 7782137..4c50bd6 100644 --- a/aimodel/src/lib/dataset/dataset.py +++ b/aimodel/src/lib/dataset/dataset.py @@ -31,13 +31,12 @@ def parse_item(metadata, shape_water_desired): rainfall = tf.reshape(rainfall, tf.constant(metadata["rainfallradar"], dtype=tf.int32)) water = tf.reshape(water, tf.constant(metadata["waterdepth"], dtype=tf.int32)) - rainfall = tf.transpose(rainfall, [1, 2, 0]) - rainfall = tf.image.resize(rainfall, tf.cast(tf.constant(metadata["waterdepth"]) / 2, dtype=tf.int32)) + rainfall = tf.transpose(rainfall, [1, 2, 0]) # channels_first → channels_last + # rainfall = tf.image.resize(rainfall, tf.cast(tf.constant(metadata["rainfallradar"]) / 2, dtype=tf.int32)) water = tf.expand_dims(water, axis=-1) # [width, height] → [width, height, channels] water = tf.image.crop_to_bounding_box(water, water_offset_x, water_offset_y, water_width_target, water_height_target) - # TODO: The shape of the resulting tensor can't be statically determined, so we need to reshape here print("DEBUG:dataset ITEM rainfall:shape", rainfall.shape, "water:shape", water.shape) # TODO: Any other additional parsing here, since multiple .map() calls are not optimal return ((rainfall, water), tf.ones(1))