Skip to content

Commit

Permalink
remove max_number_det from tile adaptor
Browse files Browse the repository at this point in the history
  • Loading branch information
eugene123tw committed Jul 17, 2024
1 parent 153a645 commit 3628e0a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
8 changes: 1 addition & 7 deletions src/otx/algorithms/detection/utils/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ def adaptive_tile_params(
"""Config tile parameters.
Adapt based on annotation statistics.
i.e. tile size, tile overlap, ratio and max objects per sample
i.e. tile size, tile overlap, and ratio.
Args:
tiling_parameters (BaseTilingParameters): tiling parameters of the model
Expand All @@ -447,7 +447,6 @@ def adaptive_tile_params(
assert rule in ["min", "avg"], f"Unknown rule: {rule}"

stat = compute_robust_dataset_statistics(dataset, ann_stat=True)
max_num_objects = round(stat["annotation"]["num_per_image"]["max"])
avg_size = stat["annotation"]["size_of_shape"]["avg"]
min_size = stat["annotation"]["size_of_shape"]["robust_min"]
max_size = stat["annotation"]["size_of_shape"]["robust_max"]
Expand Down Expand Up @@ -484,11 +483,6 @@ def adaptive_tile_params(
tiling_parameters.get_metadata("tile_overlap")["min_value"],
min(tiling_parameters.get_metadata("tile_overlap")["max_value"], tile_overlap),
)
max_num_objects = max(
tiling_parameters.get_metadata("tile_max_number")["min_value"],
min(tiling_parameters.get_metadata("tile_max_number")["max_value"], max_num_objects),
)

tiling_parameters.tile_size = tile_size
tiling_parameters.tile_max_number = max_num_objects
tiling_parameters.tile_overlap = tile_overlap
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,8 @@ def test_adaptive_tile_parameters(self):

default_tile_size = hp.tiling_parameters.tile_size
default_tile_overlap = hp.tiling_parameters.tile_overlap
# manually set tile max number
hp.tiling_parameters.tile_max_number = np.random.randint(low=1, high=5000)
default_tile_max_number = hp.tiling_parameters.tile_max_number

adaptive_tile_params(hp.tiling_parameters, self.otx_dataset)
Expand All @@ -448,5 +450,5 @@ def test_adaptive_tile_parameters(self):
# check tile overlap is changed
assert hp.tiling_parameters.tile_overlap != default_tile_overlap

# check max output prediction size is changed
assert hp.tiling_parameters.tile_max_number != default_tile_max_number
# check tile max number is being manually set and not changed by adaptive_tile_params
assert hp.tiling_parameters.tile_max_number == default_tile_max_number

0 comments on commit 3628e0a

Please sign in to comment.