Merge remote-tracking branch 'origin/main'

README.md

@@ -72,6 +72,8 @@ multi-GPU training. We recommend using a GPU with more than 24G of memory when t
 size of 16. For a GPU with less memory, please consider using a smaller batch size and change the batch size
 in `train_midi_ddsp.sh`.
 
+***The MIDI-DDSP cannot be installed on M1 Macbook. There is a problem with pip install package involves TensorFlow.**
+
 ## Try to play with MIDI-DDSP yourself!
 
 Please try out MIDI-DDSP

midi_ddsp/colab/MIDI_DDSP_Demo.ipynb

@@ -95,7 +95,7 @@
         "#@markdown Running this cell could take a while.\n",
         "!pip install -q git+https://github.com/lukewys/qgrid.git\n",
         "\n",
-        "!pip install -q midi-ddsp\n",
+        "!pip install -q git+https://github.com/magenta/midi-ddsp\n",
         "!midi_ddsp_download_model_weights\n",
         "\n",
         "!git clone -q https://github.com/magenta/midi-ddsp.git\n",
@@ -149,28 +149,12 @@
         "        plt.savefig(save_path)\n",
         "        plt.close()\n",
         "\n",
-        "CODE_EXPRESSION_KEY_TO_PAPER_NAME_DICT = {\n",
-        "    'amplitude_mean':'volume',\n",
-        "    'amplitude_std':'vol_fluc',\n",
-        "    'amplitudes_max_pos':'vol_peak_pos',\n",
-        "    'vibrato_extend':'vibrato',\n",
-        "    'brightness':'brightness',\n",
-        "    'attack_level':'attack',\n",
-        "    'pitch':'pitch',\n",
-        "    'note_length':'note_length',\n",
-        "    'onset':'onset',\n",
-        "    'offset':'offset',\n",
-        "}\n",
-        "\n",
-        "PAPER_NAME_TO_CODE_EXPRESSION_DICT = {v:k for k,v in CODE_EXPRESSION_KEY_TO_PAPER_NAME_DICT.items()}\n",
-        "\n",
         "EDIT_DF_NAME_ORDER = ['volume', 'vol_fluc', 'vol_peak_pos', 'vibrato', 'brightness', 'attack', 'pitch', 'note_length']\n",
         "\n",
-        "COND_DF_NAME_ORDER = ['amplitude_mean', 'amplitude_std', 'vibrato_extend', 'brightness', 'attack_level', 'amplitudes_max_pos', 'pitch', 'onset', 'offset', 'note_length']\n",
+        "COND_DF_NAME_ORDER = ['volume', 'vol_fluc', 'vibrato', 'brightness', 'attack', 'vol_peak_pos', 'pitch', 'onset', 'offset', 'note_length']\n",
         "\n",
         "def conditioning_df_to_edit_df(conditioning_df):\n",
         "  edit_df = conditioning_df.copy()\n",
-        "  edit_df = edit_df.rename(columns=CODE_EXPRESSION_KEY_TO_PAPER_NAME_DICT)\n",
         "  return edit_df[EDIT_DF_NAME_ORDER]\n",
         "\n",
         "def edit_df_to_conditioning_df(edit_df):\n",
@@ -180,7 +164,6 @@
         "  onset = np.concatenate([[0],offset[:-1]])\n",
         "  conditioning_df['onset']=onset\n",
         "  conditioning_df['offset']=offset\n",
-        "  conditioning_df = conditioning_df.rename(columns=PAPER_NAME_TO_CODE_EXPRESSION_DICT)\n",
         "  return conditioning_df[COND_DF_NAME_ORDER]\n",
         "\n",
         "GAIN_ADJUST_DB_DICT = {    \n",