"git@developer.sourcefind.cn:OpenDAS/d2go.git" did not exist on "b1e24e81d0aef59a175547b102bf05d81f5cc160"
Commit 64ab566d authored by Liangzhe Yuan's avatar Liangzhe Yuan Committed by A. Unique TensorFlower
Browse files

#movinet Allow norm_activation_config.activation is None for movinet backbone....

#movinet Allow norm_activation_config.activation is None for movinet backbone. (change from ValueError to logging.warn)

PiperOrigin-RevId: 467716407
parent 3fb4415e
...@@ -20,6 +20,7 @@ import dataclasses ...@@ -20,6 +20,7 @@ import dataclasses
import math import math
from typing import Dict, Mapping, Optional, Sequence, Tuple, Union from typing import Dict, Mapping, Optional, Sequence, Tuple, Union
from absl import logging
import tensorflow as tf import tensorflow as tf
from official.modeling import hyperparams from official.modeling import hyperparams
...@@ -49,7 +50,6 @@ TensorMap = Mapping[str, tf.Tensor] ...@@ -49,7 +50,6 @@ TensorMap = Mapping[str, tf.Tensor]
@dataclasses.dataclass @dataclasses.dataclass
class BlockSpec: class BlockSpec:
"""Configuration of a block.""" """Configuration of a block."""
pass
@dataclasses.dataclass @dataclasses.dataclass
...@@ -717,9 +717,9 @@ def build_movinet( ...@@ -717,9 +717,9 @@ def build_movinet(
if backbone_type != 'movinet': if backbone_type != 'movinet':
raise ValueError(f'Inconsistent backbone type {backbone_type}') raise ValueError(f'Inconsistent backbone type {backbone_type}')
if norm_activation_config.activation is not None: if norm_activation_config.activation is not None:
raise ValueError( logging.warn('norm_activation is not used in MoViNets, but specified: '
'norm_activation is not used in MoViNets, but specified: %s' % '%s', norm_activation_config.activation)
norm_activation_config.activation) logging.warn('norm_activation is ignored.')
return Movinet( return Movinet(
model_id=backbone_cfg.model_id, model_id=backbone_cfg.model_id,
...@@ -730,6 +730,7 @@ def build_movinet( ...@@ -730,6 +730,7 @@ def build_movinet(
input_specs=input_specs, input_specs=input_specs,
activation=backbone_cfg.activation, activation=backbone_cfg.activation,
gating_activation=backbone_cfg.gating_activation, gating_activation=backbone_cfg.gating_activation,
output_states=backbone_cfg.output_states,
use_sync_bn=norm_activation_config.use_sync_bn, use_sync_bn=norm_activation_config.use_sync_bn,
norm_momentum=norm_activation_config.norm_momentum, norm_momentum=norm_activation_config.norm_momentum,
norm_epsilon=norm_activation_config.norm_epsilon, norm_epsilon=norm_activation_config.norm_epsilon,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment