refactor: move terratorch_iterate under src/claimed/iterate

.github/workflows/docs-check.yml

@@ -12,7 +12,6 @@ on:
       - 'docs/**'
       - 'mkdocs.yml'
       - 'src/**'
-      - 'terratorch_iterate/**'
       - '.github/workflows/docs-check.yml'
   workflow_dispatch:
 

.github/workflows/pylint.yml

@@ -26,8 +26,8 @@ jobs:
       run: |
         # Advisory: pyproject.toml requires-python is >=3.11 and the repo has a
         # large pre-existing pylint backlog (notably R0801 duplicate-code
-        # across c3/{notebook,pythonscript,rscript} and the terratorch_iterate
+        # across c3/{notebook,pythonscript,rscript} and the claimed.iterate
         # modules). Mirrors the flake8 "exit-zero" pattern in
         # python-package-conda.yml so findings surface in logs without
         # blocking every PR.
-        pylint --exit-zero $(git ls-files 'src/**/*.py' 'terratorch_iterate/**/*.py')
+        pylint --exit-zero $(git ls-files 'src/**/*.py')

.github/workflows/python-package-conda.yml

@@ -30,9 +30,9 @@ jobs:
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
-        flake8 src terratorch_iterate --count --select=E9,F63,F7,F82 --show-source --statistics
+        flake8 src --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 src terratorch_iterate --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        flake8 src --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
         # Advisory: many tests require optional heavy deps (torch, terratorch).

docs/index.md

@@ -158,23 +158,23 @@ To run a benchmark over a ray cluster (which must be created before running), us
 To check the experiment results, use `mlflow ui --host $(hostname -f) --port <port> --backend-store-uri <storage_uri>` and click the link.
 ![mlflow demo](images/mlflow.png)
 
-## :::terratorch_iterate.backbone_benchmark.benchmark_backbone
+## :::claimed.iterate.backbone_benchmark.benchmark_backbone
 
 ## Default and Task specification
 
 Under each of these, as well as for the `optimization_space`, the structure of parameters and their hierarchy for `terratorch_task` follows the same as used in terratorch. The terratorch task contains the actual parameters that will be passed to terratorch.
 
 An exception is made for `batch_size` in `optimization_space`, which should be passed in the root level and is not passed to the `terratorch_task`.
 
-### :::terratorch_iterate.benchmark_types.Defaults
+### :::claimed.iterate.benchmark_types.Defaults
 
-### :::terratorch_iterate.benchmark_types.Task
+### :::claimed.iterate.benchmark_types.Task
 
-## :::terratorch_iterate.benchmark_types.ParameterBounds
+## :::claimed.iterate.benchmark_types.ParameterBounds
 
-## :::terratorch_iterate.benchmark_types.TaskTypeEnum
+## :::claimed.iterate.benchmark_types.TaskTypeEnum
 
-## :::terratorch_iterate.benchmark_types.ParameterTypeEnum
+## :::claimed.iterate.benchmark_types.ParameterTypeEnum
 
 ## Credits
 

docs/ray.md

@@ -63,4 +63,4 @@ You can then use ray job to interact with your job. See [the ray quickstart guid
 
 More easily, you can use the ray dashboard and MLFlow to check your job.
 
-## :::terratorch_iterate.benchmark_ray.benchmark_backbone
+## :::claimed.iterate.benchmark_ray.benchmark_backbone

docs/repeating_experiments.md

@@ -8,4 +8,4 @@ You can do this with:
 repeat_best_experiment <parent_run_id> <absolute_path_to_store_results> --config <path_to_config>
 ```
 
-## :::terratorch_iterate.repeat_best_experiment.rerun_best_from_backbone
+## :::claimed.iterate.repeat_best_experiment.rerun_best_from_backbone

pyproject.toml

@@ -107,16 +107,14 @@ c3_create_operator               = "c3.create_operator:main"
 c3_create_containerless_operator = "c3.create_containerless_operator:main"
 c3_create_gridwrapper            = "c3.create_gridwrapper:main"
 claimed                          = "claimed.claimed:main"
-# terratorch-iterate
-iterate-classic = "terratorch_iterate.main:main"
-iterate         = "terratorch_iterate.iterate2:main"
+# terratorch-iterate (now bundled under claimed.iterate)
+iterate-classic = "claimed.iterate.main:main"
+iterate         = "claimed.iterate.iterate2:main"
 
-# Pick up packages from both layouts:
-#   src/c3*, src/claimed*       — claimed sources
-#   terratorch_iterate*         — iterate sources (top-level)
+# All sources live under src/: c3*, claimed* (claimed.iterate is included by claimed*).
 [tool.setuptools.packages.find]
-where   = ["src", "."]
-include = ["c3*", "claimed*", "terratorch_iterate*"]
+where   = ["src"]
+include = ["c3*", "claimed*"]
 
 [tool.setuptools.package-data]
 "c3.templates" = ["*"]

terratorch_iterate/backbone_benchmark.py → src/claimed/iterate/backbone_benchmark.py

@@ -17,16 +17,16 @@
 from optuna.samplers import BaseSampler, RandomSampler
 from tabulate import tabulate
 import pickle
-from terratorch_iterate.iterate_types import (
+from claimed.iterate.iterate_types import (
     Defaults,
     ParameterBounds,
     Task,
     combine_with_defaults,
     optimization_space_type,
 )
-from terratorch_iterate.model_fitting import fit_model, fit_model_with_hparams
-from terratorch_iterate.repeat_best_experiment import rerun_best_from_backbone
-from terratorch_iterate.utils import (
+from claimed.iterate.model_fitting import fit_model, fit_model_with_hparams
+from claimed.iterate.repeat_best_experiment import rerun_best_from_backbone
+from claimed.iterate.utils import (
     check_existing_task_parent_runs,
     check_existing_experiments,
     unflatten,

terratorch_iterate/benchmark_ray.py → src/claimed/iterate/benchmark_ray.py

@@ -14,15 +14,15 @@
 from ray.tune.search.optuna import OptunaSearch
 from tabulate import tabulate
 
-from terratorch_iterate.backbone_benchmark import parse_optimization_space
-from terratorch_iterate.iterate_types import (
+from claimed.iterate.backbone_benchmark import parse_optimization_space
+from claimed.iterate.iterate_types import (
     Defaults,
     Task,
     TrainingSpec,
     combine_with_defaults,
     optimization_space_type,
 )
-from terratorch_iterate.model_fitting import fit_model, ray_tune_model, valid_task_types
+from claimed.iterate.model_fitting import fit_model, ray_tune_model, valid_task_types
 
 
 def benchmark_backbone_on_task(

terratorch_iterate/config_util/build_iterate_config.py → src/claimed/iterate/config_util/build_iterate_config.py

@@ -2,7 +2,7 @@
 import yaml
 import pandas as pd
 import click
-from terratorch_iterate.iterate_types import (
+from claimed.iterate.iterate_types import (
     TaskTypeEnum,
 )
 from copy import deepcopy

src/claimed/iterate/iterate2/__init__.py

@@ -0,0 +1,4 @@
+# claimed.iterate.iterate2 package
+# Re-export main so that `from claimed.iterate.iterate2 import main` keeps
+# working after iterate2.py was turned into a package directory.
+from claimed.iterate.iterate2._iterate2 import main  # noqa: F401

terratorch_iterate/iterate2/_iterate2.py → src/claimed/iterate/iterate2/_iterate2.py

@@ -61,7 +61,7 @@
 
 import optuna
 import yaml
-from terratorch_iterate.iterate2.plugin.coordinator import load_builtin_plugins, resolve_storage
+from claimed.iterate.iterate2.plugin.coordinator import load_builtin_plugins, resolve_storage
 
 load_builtin_plugins()
 

src/claimed/iterate/iterate2/plugin/__init__.py

@@ -0,0 +1 @@
+# claimed.iterate.iterate2.plugin package

terratorch_iterate/iterate2/plugin/coordinator/__init__.py → src/claimed/iterate/iterate2/plugin/coordinator/__init__.py

@@ -12,7 +12,7 @@
 
 Usage
 -----
->>> from terratorch_iterate.iterate2.plugin.coordinator import resolve_storage
+>>> from claimed.iterate.iterate2.plugin.coordinator import resolve_storage
 >>> storage = resolve_storage("sqlite:///my_study.db")
 """
 
@@ -82,9 +82,9 @@ def load_builtin_plugins() -> None:
     """Import all built-in coordinator plugins so they self-register."""
     import importlib
     _builtins = [
-        "terratorch_iterate.iterate2.plugin.coordinator.sqlite",
-        "terratorch_iterate.iterate2.plugin.coordinator.journalfs",
-        "terratorch_iterate.iterate2.plugin.coordinator.postgresql",
+        "claimed.iterate.iterate2.plugin.coordinator.sqlite",
+        "claimed.iterate.iterate2.plugin.coordinator.journalfs",
+        "claimed.iterate.iterate2.plugin.coordinator.postgresql",
     ]
     for mod in _builtins:
         try:

terratorch_iterate/iterate2/plugin/coordinator/journalfs.py → src/claimed/iterate/iterate2/plugin/coordinator/journalfs.py

@@ -26,7 +26,7 @@
     from optuna.storages import JournalFileStorage as _JournalFileBackend  # type: ignore
     _USE_BACKEND = False
 
-from terratorch_iterate.iterate2.plugin.coordinator import CoordinatorPlugin, register
+from claimed.iterate.iterate2.plugin.coordinator import CoordinatorPlugin, register
 
 logger = logging.getLogger("iterate2.coordinator.journalfs")
 

terratorch_iterate/iterate2/plugin/coordinator/postgresql.py → src/claimed/iterate/iterate2/plugin/coordinator/postgresql.py

@@ -22,7 +22,7 @@
 import logging
 import re
 
-from terratorch_iterate.iterate2.plugin.coordinator import CoordinatorPlugin, register
+from claimed.iterate.iterate2.plugin.coordinator import CoordinatorPlugin, register
 
 logger = logging.getLogger("iterate2.coordinator.postgresql")
 

terratorch_iterate/iterate2/plugin/coordinator/sqlite.py → src/claimed/iterate/iterate2/plugin/coordinator/sqlite.py

@@ -16,7 +16,7 @@
 
 import logging
 
-from terratorch_iterate.iterate2.plugin.coordinator import CoordinatorPlugin, register
+from claimed.iterate.iterate2.plugin.coordinator import CoordinatorPlugin, register
 
 logger = logging.getLogger("iterate2.coordinator.sqlite")
 

terratorch_iterate/main.py → src/claimed/iterate/main.py

@@ -4,15 +4,15 @@
 from pathlib import Path
 from jsonargparse import ArgumentParser
 import pandas as pd
-from terratorch_iterate.backbone_benchmark import benchmark_backbone
-from terratorch_iterate.iterate_types import Defaults, Task
-from terratorch_iterate.repeat_best_experiment import rerun_best_from_backbone
-from terratorch_iterate.utils import (
+from claimed.iterate.backbone_benchmark import benchmark_backbone
+from claimed.iterate.iterate_types import Defaults, Task
+from claimed.iterate.repeat_best_experiment import rerun_best_from_backbone
+from claimed.iterate.utils import (
     get_logger,
     import_custom_modules,
     get_results_and_parameters,
 )
-from terratorch_iterate.config_util import build_iterate_config
+from claimed.iterate.config_util import build_iterate_config
 
 
 def _summarize(

terratorch_iterate/model_fitting.py → src/claimed/iterate/model_fitting.py

@@ -44,7 +44,7 @@
 from torchgeo.datamodules import BaseDataModule
 from torchgeo.trainers import BaseTask
 
-from terratorch_iterate.iterate_types import (
+from claimed.iterate.iterate_types import (
     ParameterBounds,
     ParameterTypeEnum,
     TrainingSpec,
@@ -54,7 +54,7 @@
 )
 
 
-from terratorch_iterate.utils import get_logger
+from claimed.iterate.utils import get_logger
 
 LOGGER = get_logger()
 

terratorch_iterate/repeat_best_experiment.py → src/claimed/iterate/repeat_best_experiment.py

@@ -24,13 +24,13 @@
 
 from lightning.pytorch.loggers.mlflow import MLFlowLogger
 import time
-from terratorch_iterate.iterate_types import (
+from claimed.iterate.iterate_types import (
     Defaults,
     Task,
     TrainingSpec,
     combine_with_defaults,
 )
-from terratorch_iterate.model_fitting import (
+from claimed.iterate.model_fitting import (
     get_default_callbacks,
     inject_hparams,
     valid_task_types,

terratorch_iterate/utils.py → src/claimed/iterate/utils.py

@@ -10,8 +10,8 @@
 from matplotlib import pyplot as plt
 from ast import literal_eval
 import optuna
-from terratorch_iterate.iterate_types import Task
-from terratorch_iterate import plot_tools
+from claimed.iterate.iterate_types import Task
+from claimed.iterate import plot_tools
 import sys
 from mlflow.entities.experiment import Experiment
 import importlib

src/claimed/jobcoordinator/db.py

@@ -16,7 +16,7 @@
   ``UPDATE ... WHERE status='pending'`` and a small retry loop.
 
 The URL-normalisation helpers mirror the iterate2 coordinator plugins
-(``terratorch_iterate/iterate2/plugin/coordinator/{sqlite,postgresql}.py``) so the
+(``src/claimed/iterate/iterate2/plugin/coordinator/{sqlite,postgresql}.py``) so the
 accepted ``--db`` syntax is consistent across CLAIMED.
 """