Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ authors = [

readme = "README.md"
license = { file="LICENSE" }
requires-python = ">=3.10"
requires-python = ">=3.11"
dependencies = [
"dacvae@git+https://github.com/facebookresearch/dacvae.git",
"audiobox_aesthetics",
Expand All @@ -23,15 +23,16 @@ dependencies = [
"numpy",
"perception-models@git+https://github.com/facebookresearch/perception_models@unpin-deps",
"pydub",
"torch",
"torch==2.6.0",
"torchaudio",
"torchcodec",
"torchcodec==0.2",
"torchdiffeq",
"torchvision",
"transformers>=4.54.0",
]

[tool.setuptools.packages.find]
where = ["."]
include = ["sam_audio*"]

[tool.ruff]
Expand Down
31 changes: 17 additions & 14 deletions sam_audio/model/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ class SAMAudio(BaseModel):
def __init__(self, cfg: SAMAudioConfig):
super().__init__()
self.audio_codec = DACVAE(cfg.audio_codec)
self.text_encoder = T5TextEncoder(cfg.text_encoder)
self.vision_encoder = PerceptionEncoder(cfg.vision_encoder)
self.text_encoder = T5TextEncoder(cfg.text_encoder) # base
# self.vision_encoder = PerceptionEncoder(cfg.vision_encoder)
self.vision_encoder_dim = cfg.vision_encoder.dim # 1024
self.transformer = DiT(cfg.transformer)
self.proj = torch.nn.Linear(cfg.in_channels, cfg.transformer.dim)
self.align_masked_video = AlignModalities(
Expand All @@ -91,15 +92,17 @@ def __init__(self, cfg: SAMAudioConfig):
)
self.memory_proj = torch.nn.Linear(cfg.text_encoder.dim, cfg.transformer.dim)
self.timestep_emb = SinusoidalEmbedding(cfg.transformer.dim)
self.visual_ranker = create_ranker(cfg.visual_ranker)
self.text_ranker = create_ranker(cfg.text_ranker)
if cfg.span_predictor is not None:
self.span_predictor = PEAudioFrame.from_config(
cfg.span_predictor, pretrained=True
)
self.span_predictor_transform = PEAudioFrameTransform.from_config(
cfg.span_predictor
)
self.visual_ranker = None # create_ranker(cfg.visual_ranker)
self.text_ranker = None # create_ranker(cfg.text_ranker)
self.span_predictor = None
self.span_predictor_transform = None
# if cfg.span_predictor is not None:
# self.span_predictor = PEAudioFrame.from_config(
# cfg.span_predictor, pretrained=True
# )
# self.span_predictor_transform = PEAudioFrameTransform.from_config(
# cfg.span_predictor
# )

@property
def sample_rate(self):
Expand Down Expand Up @@ -186,9 +189,9 @@ def _get_audio_features(self, audios: torch.Tensor):
def _get_video_features(self, video, audio_features):
B, T, _ = audio_features.shape
if video is None:
return audio_features.new_zeros(B, self.vision_encoder.dim, T)
return audio_features.new_zeros(B, self.vision_encoder_dim, T)
else:
return self.vision_encoder(video).transpose(1, 2)
raise Exception("Video not supported")

def _repeat_for_reranking(self, tensor, candidates):
if candidates > 1:
Expand Down Expand Up @@ -354,7 +357,7 @@ def load_state_dict(self, state_dict, strict=True):
)
missing_keys = [x for x in missing_keys if not re.search(skip_regex, x)]
if len(missing_keys) > 0 or len(unexpected_keys) > 0:
raise RuntimeError(
print(
f"Missing keys: {missing_keys}, unexpected_keys: {unexpected_keys}"
)

Expand Down