fix installation issue

facebookresearch · Feb 4, 2024 · 822d026 · 822d026
1 parent 5adce35
commit 822d026
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 11 deletions.
diff --git a/examples/Getting_started.ipynb b/examples/Getting_started.ipynb
@@ -150,8 +150,11 @@
     "# We add the batch dimension to the single audio to mimic the batch watermarking\n",
     "audios = audio.unsqueeze(0)\n",
     "\n",
-    "watermark = model(audios)\n",
-    "watermarked_audio = audios + watermark"
+    "watermark = model.get_watermark(audios)\n",
+    "watermarked_audio = audios + watermark\n",
+    "\n",
+    "# Alternatively, you can also call forward() function directly with different tune-down / tune-up rate\n",
+    "watermarked_audio = model(audios, alpha=1)"
    ]
   },
   {
@@ -260,9 +263,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "\n",
-    "watermark = model(audios, message=secret_mesage)\n",
-    "watermarked_audio = audios + watermark"
+    "watermarked_audio = model(audios, message=secret_mesage, alpha=1)"
    ]
   },
   {

diff --git a/src/audioseal/builder.py b/src/audioseal/builder.py
@@ -10,7 +10,7 @@
 from torch import device, dtype
 from typing_extensions import TypeAlias
 
-import audiocraft
+from audioseal.libs import audiocraft
 from audioseal.models import AudioSealDetector, AudioSealWM, MsgProcessor
 
 Device: TypeAlias = device

diff --git a/src/cards/audioseal_detector_16bits.yaml → ...seal/cards/audioseal_detector_16bits.yaml b/src/cards/audioseal_detector_16bits.yaml → ...seal/cards/audioseal_detector_16bits.yaml
diff --git a/src/cards/audioseal_wm_16bits.yaml → src/audioseal/cards/audioseal_wm_16bits.yaml b/src/cards/audioseal_wm_16bits.yaml → src/audioseal/cards/audioseal_wm_16bits.yaml
diff --git a/src/audiocraft/__init__.py → src/audioseal/libs/__init__.py b/src/audiocraft/__init__.py → src/audioseal/libs/__init__.py
diff --git a/src/audioseal/libs/audiocraft/__init__.py b/src/audioseal/libs/audiocraft/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the license found in the
+# LICENSE file in the root directory of this source tree.
diff --git a/src/audiocraft/modules/__init__.py → ...oseal/libs/audiocraft/modules/__init__.py b/src/audiocraft/modules/__init__.py → ...oseal/libs/audiocraft/modules/__init__.py
diff --git a/src/audiocraft/modules/conv.py → ...audioseal/libs/audiocraft/modules/conv.py b/src/audiocraft/modules/conv.py → ...audioseal/libs/audiocraft/modules/conv.py
@@ -13,7 +13,14 @@
 import torch
 from torch import nn
 from torch.nn import functional as F
-from torch.nn.utils import spectral_norm, weight_norm
+from torch.nn.utils import spectral_norm
+
+try:
+    from torch.nn.utils.parametrizations import weight_norm
+except ImportError:
+    # Old Pytorch
+    from torch.nn.utils import weight_norm
+
 
 CONV_NORMALIZATIONS = frozenset(
     ["none", "weight_norm", "spectral_norm", "time_group_norm"]

diff --git a/src/audiocraft/modules/lstm.py → ...audioseal/libs/audiocraft/modules/lstm.py b/src/audiocraft/modules/lstm.py → ...audioseal/libs/audiocraft/modules/lstm.py
diff --git a/src/audiocraft/modules/seanet.py → ...dioseal/libs/audiocraft/modules/seanet.py b/src/audiocraft/modules/seanet.py → ...dioseal/libs/audiocraft/modules/seanet.py
@@ -12,8 +12,11 @@
 import numpy as np
 import torch.nn as nn
 
-from audiocraft.modules.conv import StreamableConv1d, StreamableConvTranspose1d
-from audiocraft.modules.lstm import StreamableLSTM
+from audioseal.libs.audiocraft.modules.conv import (
+    StreamableConv1d,
+    StreamableConvTranspose1d,
+)
+from audioseal.libs.audiocraft.modules.lstm import StreamableLSTM
 
 
 class SEANetResnetBlock(nn.Module):

diff --git a/src/audioseal/loader.py b/src/audioseal/loader.py
@@ -90,7 +90,7 @@ def load_model_checkpoint(
 
 
 def load_local_model_config(model_card: str) -> Optional[DictConfig]:
-    config_file = Path(__file__).parent.parent / "cards" / (model_card + ".yaml")
+    config_file = Path(__file__).parent / "cards" / (model_card + ".yaml")
     if Path(config_file).is_file():
         return cast(DictConfig, OmegaConf.load(config_file.resolve()))
     else:

diff --git a/src/audioseal/models.py b/src/audioseal/models.py
@@ -9,7 +9,7 @@
 
 import torch
 
-from audiocraft.modules.seanet import SEANetEncoder
+from audioseal.libs.audiocraft.modules.seanet import SEANetEncoder
 
 
 class MsgProcessor(torch.nn.Module):