From facc97e236d578919c33a910e17b7e9a2dc90a8a Mon Sep 17 00:00:00 2001
From: Cloud Xu <cloud@yuansuan.cn>
Date: Thu, 15 Jun 2023 17:00:05 +0800
Subject: [PATCH] removing ongoing work

---
 README-CN.md | 26 ++++++--------------------
 README.md    | 24 ++++++++----------------
 2 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/README-CN.md b/README-CN.md
index 316edec..a871580 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -18,19 +18,6 @@
 
 🌍 **Webserver Ready** 可伺服你的训练结果，供远程调用
 
-### 进行中的工作
-*  GUI/客户端大升级与合并
-
-- [x] 初始化框架 `./mkgui` （基于streamlit + fastapi）和 [技术设计](https://vaj2fgg8yn.feishu.cn/docs/doccnvotLWylBub8VJIjKzoEaee)
-
-- [x] 增加 Voice Cloning and Conversion的演示页面
-
-- [x] 增加Voice Conversion的预处理preprocessing 和训练 training 页面 
-
-- [ ] 增加其他的的预处理preprocessing 和训练 training 页面 
-
-* 模型后端基于ESPnet2升级
-
 
 ## 开始
 ### 1. 安装要求
@@ -56,7 +43,7 @@
 
 #### 1.2 M1芯片Mac环境配置（Inference Time)
 > 以下环境按x86-64搭建，使用原生的`demo_toolbox.py`，可作为在不改代码情况下快速使用的workaround。
-> 
+>
   >  如需使用M1芯片训练，因`demo_toolbox.py`依赖的`PyQt5`不支持M1，则应按需修改代码，或者尝试使用`web.py`。
 
 * 安装`PyQt5`，参考[这个链接](https://stackoverflow.com/a/68038451/20455983)
@@ -81,11 +68,11 @@
   * 安装`ctc-segmentation`
     > 因上述方法没有成功，选择从[github](https://github.com/lumaku/ctc-segmentation) clone源码手动编译
     * `git clone https://github.com/lumaku/ctc-segmentation.git` 克隆到任意位置
-    * `cd ctc-segmentation` 
+    * `cd ctc-segmentation`
     * `source /PathToMockingBird/venv/bin/activate` 假设一开始未开启，打开MockingBird项目的虚拟环境
-    * `cythonize -3 ctc_segmentation/ctc_segmentation_dyn.pyx` 
+    * `cythonize -3 ctc_segmentation/ctc_segmentation_dyn.pyx`
     * `/usr/bin/arch -x86_64 python setup.py build` 要注意明确用x86-64架构编译
-    * `/usr/bin/arch -x86_64 python setup.py install --optimize=1 --skip-build`用x86-64架构安装 
+    * `/usr/bin/arch -x86_64 python setup.py install --optimize=1 --skip-build`用x86-64架构安装
 
 * 安装其他依赖
     * `/usr/bin/arch -x86_64 pip install torch torchvision torchaudio` 这里用pip安装`PyTorch`，明确架构是x86
@@ -93,7 +80,7 @@
     * `pip install -r requirements.txt`
 
 * 运行
-  > 参考[这个链接](https://youtrack.jetbrains.com/issue/PY-46290/Allow-running-Python-under-Rosetta-2-in-PyCharm-for-Apple-Silicon) 
+  > 参考[这个链接](https://youtrack.jetbrains.com/issue/PY-46290/Allow-running-Python-under-Rosetta-2-in-PyCharm-for-Apple-Silicon)
   ，让项目跑在x86架构环境上
   * `vim /PathToMockingBird/venv/bin/pythonM1`
   * 写入以下代码
@@ -176,7 +163,7 @@
 想像柯南拿着变声器然后发出毛利小五郎的声音吗？本项目现基于PPG-VC，引入额外两个模块（PPG extractor + PPG2Mel）, 可以实现变声功能。（文档不全，尤其是训练部分，正在努力补充中）
 #### 4.0 准备环境
 * 确保项目以上环境已经安装ok，运行`pip install espnet` 来安装剩余的必要包。
-* 下载以下模型 链接：https://pan.baidu.com/s/1bl_x_DHJSAUyN2fma-Q_Wg 
+* 下载以下模型 链接：https://pan.baidu.com/s/1bl_x_DHJSAUyN2fma-Q_Wg
 提取码：gh41
   * 24K采样率专用的vocoder（hifigan）到 *vocoder\saved_models\xxx*
   * 预训练的ppg特征encoder(ppg_extractor)到 *ppg_extractor\saved_models\xxx*
@@ -294,4 +281,3 @@ voc_pad =2
 ![attention_step_20500_sample_1](https://user-images.githubusercontent.com/7423248/128587252-f669f05a-f411-4811-8784-222156ea5e9d.png)
 
 ![step-135500-mel-spectrogram_sample_1](https://user-images.githubusercontent.com/7423248/128587255-4945faa0-5517-46ea-b173-928eff999330.png)
-
diff --git a/README.md b/README.md
index 76d22c8..eadf030 100644
--- a/README.md
+++ b/README.md
@@ -18,14 +18,6 @@
 
 ### [DEMO VIDEO](https://www.bilibili.com/video/BV17Q4y1B7mY/)
 
-### Ongoing Works(Helps Needed)
-* Major upgrade on GUI/Client and unifying web and toolbox
-[X] Init framework `./mkgui` and [tech design](https://vaj2fgg8yn.feishu.cn/docs/doccnvotLWylBub8VJIjKzoEaee)
-[X] Add demo part of Voice Cloning and Conversion
-[X] Add preprocessing and training for Voice Conversion
-[ ] Add preprocessing and training for Encoder/Synthesizer/Vocoder
-* Major upgrade on model backend based on ESPnet2(not yet started)
-
 ## Quick Start
 
 ### 1. Install Requirements
@@ -51,7 +43,7 @@ or
 
 #### 1.2 Setup with a M1 Mac
 > The following steps are a workaround to directly use the original `demo_toolbox.py`without the changing of codes.
-> 
+>
   >  Since the major issue comes with the PyQt5 packages used in `demo_toolbox.py` not compatible with M1 chips, were one to attempt on training models with the M1 chip, either that person can forgo `demo_toolbox.py`, or one can try the `web.py` in the project.
 
 ##### 1.2.1 Install `PyQt5`, with [ref](https://stackoverflow.com/a/68038451/20455983) here.
@@ -67,21 +59,21 @@ or
     pip install pyqt5
     ```
 ##### 1.2.2 Install `pyworld` and `ctc-segmentation`
-  
+
 > Both packages seem to be unique to this project and are not seen in the original [Real-Time Voice Cloning](https://github.com/CorentinJ/Real-Time-Voice-Cloning) project. When installing with `pip install`, both packages lack wheels so the program tries to directly compile from c code and could not find `Python.h`.
 
   * Install `pyworld`
       * `brew install python` `Python.h` can come with Python installed by brew
       * `export CPLUS_INCLUDE_PATH=/opt/homebrew/Frameworks/Python.framework/Headers` The filepath of brew-installed `Python.h` is unique to M1 MacOS and listed above. One needs to manually add the path to the environment variables.
       * `pip install pyworld` that should do.
-    
+
 
   * Install`ctc-segmentation`
-    > Same method does not apply to `ctc-segmentation`, and one needs to compile it from the source code on [github](https://github.com/lumaku/ctc-segmentation). 
-    * `git clone https://github.com/lumaku/ctc-segmentation.git` 
-    * `cd ctc-segmentation` 
+    > Same method does not apply to `ctc-segmentation`, and one needs to compile it from the source code on [github](https://github.com/lumaku/ctc-segmentation).
+    * `git clone https://github.com/lumaku/ctc-segmentation.git`
+    * `cd ctc-segmentation`
     * `source /PathToMockingBird/venv/bin/activate` If the virtual environment hasn't been deployed, activate it.
-    * `cythonize -3 ctc_segmentation/ctc_segmentation_dyn.pyx` 
+    * `cythonize -3 ctc_segmentation/ctc_segmentation_dyn.pyx`
     * `/usr/bin/arch -x86_64 python setup.py build` Build with x86 architecture.
     * `/usr/bin/arch -x86_64 python setup.py install --optimize=1 --skip-build`Install with x86 architecture.
 
@@ -89,7 +81,7 @@ or
   * `/usr/bin/arch -x86_64 pip install torch torchvision torchaudio` Pip installing `PyTorch` as an example, articulate that it's installed with x86 architecture
   * `pip install ffmpeg`  Install ffmpeg
   * `pip install -r requirements.txt` Install other requirements.
-  
+
 ##### 1.2.4 Run the Inference Time (with Toolbox)
   > To run the project on x86 architecture. [ref](https://youtrack.jetbrains.com/issue/PY-46290/Allow-running-Python-under-Rosetta-2-in-PyCharm-for-Apple-Silicon).
   * `vim /PathToMockingBird/venv/bin/pythonM1` Create an executable file `pythonM1` to condition python interpreter at `/PathToMockingBird/venv/bin`.