Skip to content

Commit

Permalink
Use registry.MODEL_FAMILY_FROM_NAME when determining net kwargs in va…
Browse files Browse the repository at this point in the history
…k.models.get
  • Loading branch information
NickleDave committed Jul 5, 2023
1 parent 38bc895 commit 1f922e8
Showing 1 changed file with 22 additions and 17 deletions.
39 changes: 22 additions & 17 deletions src/vak/models/get.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,29 @@ def get(name: str,
f"Valid model names are: {registry.MODEL_NAMES}"
) from e

# still need to special case model logic here
net_init_params = list(
inspect.signature(
model_class.definition.network.__init__
).parameters.keys()
)
if ('num_input_channels' in net_init_params) and ('num_freqbins' in net_init_params):
num_input_channels = input_shape[-3]
num_freqbins = input_shape[-2]
config["network"].update(
num_classes=num_classes,
num_input_channels=num_input_channels,
num_freqbins=num_freqbins
)
else:
raise ValueError(
f"Unable to determine network init arguments for model: {name}"
model_family = registry.MODEL_FAMILY_FROM_NAME[name]

if model_family == 'FrameClassificationModel':
# still need to special case model logic here
net_init_params = list(
inspect.signature(
model_class.definition.network.__init__
).parameters.keys()
)
if ('num_input_channels' in net_init_params) and ('num_freqbins' in net_init_params):
num_input_channels = input_shape[-3]
num_freqbins = input_shape[-2]
config["network"].update(
num_classes=num_classes,
num_input_channels=num_input_channels,
num_freqbins=num_freqbins
)
else:
raise ValueError(
f"Detected that model with name '{name}' was family '{model_family}', but "
f"unable to determine network init arguments for model. Currently all models "
f"in this family must have networks with parameters ``num_input_channels`` and ``num_freqbins``"
)

model = model_class.from_config(config=config, labelmap=labelmap, post_tfm=post_tfm)

Expand Down

0 comments on commit 1f922e8

Please sign in to comment.