Merge branch 'dev' into main

2noise · Jul 29, 2024 · 8bd6b17 · 8bd6b17
2 parents fd55a09 + 680e046
commit 8bd6b17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ChatTTS/core.py b/ChatTTS/core.py
@@ -297,6 +297,7 @@ def _load(
             use_flash_attn=use_flash_attn,
             use_vllm=use_vllm,
             device=device,
+            device_gpt=self.device_gpt,
             logger=self.logger,
         ).eval()
         assert gpt_ckpt_path, "gpt_ckpt_path should not be None"

diff --git a/ChatTTS/model/tokenizer.py b/ChatTTS/model/tokenizer.py
@@ -180,12 +180,12 @@ def _decode_prompt(prompt: str) -> torch.Tensor:
             dtype="<u2",
         ).copy()
         del dec
-        return torch.from_numpy(p).view(*shp)
+        return torch.from_numpy(p.astype(np.int32)).view(*shp)
 
     @staticmethod
     @torch.no_grad()
     def _encode_prompt(prompt: torch.Tensor) -> str:
-        arr: np.ndarray = prompt.to(dtype=torch.uint16, device="cpu").numpy()
+        arr: np.ndarray = prompt.cpu().numpy().astype(np.uint16)
         shp = arr.shape
         assert len(shp) == 2, "prompt must be a 2D tensor"
         s = b14.encode_to_string(