From 8f0db133b1335ff147ce4b06df3a7e1bbe090337 Mon Sep 17 00:00:00 2001 From: Josh Hansen <51674360+joshhvulcan@users.noreply.github.com> Date: Thu, 2 Oct 2025 19:03:27 -0700 Subject: [PATCH 1/3] Latest esrun configs --- esrun_data/satlas/solar_farm_oe/esrun.yaml | 6 +- esrun_data/satlas/solar_farm_oe/model.yaml | 71 +++++++++++----------- 2 files changed, 37 insertions(+), 40 deletions(-) diff --git a/esrun_data/satlas/solar_farm_oe/esrun.yaml b/esrun_data/satlas/solar_farm_oe/esrun.yaml index 30931c42..e5d9284c 100644 --- a/esrun_data/satlas/solar_farm_oe/esrun.yaml +++ b/esrun_data/satlas/solar_farm_oe/esrun.yaml @@ -1,3 +1,6 @@ +inference_results_config: + data_type: raster + partition_strategies: partition_request_geometry: class_path: esrun.runner.tools.partitioners.grid_partitioner.GridPartitioner @@ -32,6 +35,3 @@ postprocessing_strategies: process_window: class_path: esrun.runner.tools.postprocessors.noop_raster.NoopRaster - -inference_results_config: - data_type: RASTER diff --git a/esrun_data/satlas/solar_farm_oe/model.yaml b/esrun_data/satlas/solar_farm_oe/model.yaml index badd73f4..7512f268 100644 --- a/esrun_data/satlas/solar_farm_oe/model.yaml +++ b/esrun_data/satlas/solar_farm_oe/model.yaml @@ -1,35 +1,7 @@ -trainer: - callbacks: - - class_path: lightning.pytorch.callbacks.LearningRateMonitor - init_args: - logging_interval: epoch - - class_path: lightning.pytorch.callbacks.ModelCheckpoint - init_args: - monitor: val_class/accuracy - save_last: true - save_top_k: 1 - mode: max - - class_path: rslearn.train.callbacks.freeze_unfreeze.FreezeUnfreeze - init_args: - module_selector: - - model - - encoder - - 0 - unfreeze_at_epoch: 20 - unfreeze_lr_factor: 10.0 - - class_path: rslearn.train.prediction_writer.RslearnWriter - init_args: - path: placeholder - output_layer: ${PREDICTION_OUTPUT_LAYER} - selector: ["class"] - max_epochs: 500 - default_root_dir: ${TRAINER_DATA_PATH} - logger: - class_path: lightning.pytorch.loggers.WandbLogger - init_args: - project: ${WANDB_PROJECT} - name: ${WANDB_NAME} - entity: ${WANDB_ENTITY} +# FIXME ${TRAINER_DATA_PATH} +# FIXME ${WANDB_PROJECT}: wandb project for the trainer to log metrics to +# FIXME ${WANDB_NAME}: wandb name for the trainer to log metrics to +# FIXME ${WANDB_ENTITY}: wandb entity for the trainer to log metrics to model: class_path: rslearn.train.lightning_module.RslearnLightningModule init_args: @@ -39,7 +11,9 @@ model: encoder: - class_path: rslp.helios.model.Helios init_args: - checkpoint_path: ${EXTRA_FILES_PATH}/yawenzzzz/latent_mim_cross_random_per_modality_patchdisc_add_contrastive_0.1_1/step400000 + checkpoint_path: gs://earth-system-run-dev/models/02ce432e-98e7-46d7-8a67-a1d9b346e746/stage_0/helios/step300000 +# checkpoint_path: ${EXTRA_FILES_PATH}/helios/step300000 + random_initialization: true selector: - encoder forward_kwargs: @@ -227,9 +201,9 @@ data: input_mapping: class: targets: targets - path: ${DATASET_PATH} + path: /weka/dfive-default/rslearn-eai/datasets/solar_farm/dataset_v1/20250605/ batch_size: 8 - num_workers: ${NUM_WORKERS} + num_workers: 16 default_config: transforms: - class_path: rslearn.train.transforms.concatenate.Concatenate @@ -343,5 +317,28 @@ data: - B12 - B01 - B09 -# rslp_project: 2025_06_06_helios_finetuning -# rslp_experiment: v2_satlas_solar_farm_128_ts_helios_per_mod_patchdisc_contrastive_fix +trainer: + callbacks: + - class_path: lightning.pytorch.callbacks.LearningRateMonitor + init_args: + logging_interval: epoch + - class_path: lightning.pytorch.callbacks.ModelCheckpoint + init_args: + monitor: val_class/accuracy + save_last: true + save_top_k: 1 + mode: max + - class_path: rslearn.train.callbacks.freeze_unfreeze.FreezeUnfreeze + init_args: + module_selector: + - model + - encoder + - 0 + unfreeze_at_epoch: 20 + unfreeze_lr_factor: 10.0 + - class_path: rslearn.train.prediction_writer.RslearnWriter + init_args: + path: ${DATASET_PATH} + output_layer: ${PREDICTION_OUTPUT_LAYER} + selector: ["class"] + max_epochs: 500 From 8743ce5b00b3d71817904c97aed31f2b32666875 Mon Sep 17 00:00:00 2001 From: Josh Hansen <51674360+joshhvulcan@users.noreply.github.com> Date: Thu, 2 Oct 2025 19:08:22 -0700 Subject: [PATCH 2/3] Update to 0.5 grid --- esrun_data/satlas/solar_farm_oe/esrun.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/esrun_data/satlas/solar_farm_oe/esrun.yaml b/esrun_data/satlas/solar_farm_oe/esrun.yaml index e5d9284c..6d9910e7 100644 --- a/esrun_data/satlas/solar_farm_oe/esrun.yaml +++ b/esrun_data/satlas/solar_farm_oe/esrun.yaml @@ -5,14 +5,7 @@ partition_strategies: partition_request_geometry: class_path: esrun.runner.tools.partitioners.grid_partitioner.GridPartitioner init_args: - grid_size: 0.15 - output_projection: - class_path: rslearn.utils.geometry.Projection - init_args: - crs: EPSG:3857 - x_resolution: 10 - y_resolution: -10 - use_utm: true + grid_size: 0.5 prepare_window_geometries: class_path: esrun.runner.tools.partitioners.grid_partitioner.GridPartitioner From e739a43cd90c8f30eb80507c0b0843830e482b5d Mon Sep 17 00:00:00 2001 From: Josh Hansen <51674360+joshhvulcan@users.noreply.github.com> Date: Sun, 5 Oct 2025 07:32:42 -0700 Subject: [PATCH 3/3] Add missing env vars --- esrun_data/satlas/solar_farm_oe/model.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esrun_data/satlas/solar_farm_oe/model.yaml b/esrun_data/satlas/solar_farm_oe/model.yaml index 7512f268..3da89dad 100644 --- a/esrun_data/satlas/solar_farm_oe/model.yaml +++ b/esrun_data/satlas/solar_farm_oe/model.yaml @@ -201,9 +201,9 @@ data: input_mapping: class: targets: targets - path: /weka/dfive-default/rslearn-eai/datasets/solar_farm/dataset_v1/20250605/ + path: ${DATASET_PATH} batch_size: 8 - num_workers: 16 + num_workers: ${NUM_WORKERS} default_config: transforms: - class_path: rslearn.train.transforms.concatenate.Concatenate