Browse Source

vggish path moved

Amir Ziai 5 years ago
parent
commit
ac9c8b8ff7
2 changed files with 102 additions and 154 deletions
  1. 98 152
      dev4.ipynb
  2. 4 2
      vggish.py

+ 98 - 152
dev4.ipynb

@@ -12,7 +12,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 51,
+   "execution_count": 56,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -25,152 +25,36 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 54,
+   "execution_count": 57,
    "metadata": {},
    "outputs": [],
    "source": [
-    "ex = ExperimentRunner(params.experiment_vggish_only, n_jobs=1)"
+    "ex = ExperimentRunner(params.experiments, n_jobs=1)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 55,
+   "execution_count": 58,
    "metadata": {},
    "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Running param set: {'data_path_base': '/Users/aziai/Downloads/vtest_new2', 'conv_model_name': None, 'num_epochs': 10, 'feature_extract': False, 'batch_size': 64, 'lr': 0.001, 'use_vggish': True, 'momentum': 0.9}\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Updating ALL params\n",
-      "Epoch 0/9\n",
-      "----------\n",
-      "train Loss: 0.8801 F1: 0.6833 Acc: 0.5190\n",
-      "val Loss: 0.5289 F1: 0.8742 Acc: 0.7765\n",
-      "\n",
-      "Epoch 1/9\n",
-      "----------\n",
-      "train Loss: 0.8135 F1: 0.6833 Acc: 0.5190\n",
-      "val Loss: 0.5584 F1: 0.8742 Acc: 0.7765\n",
-      "\n",
-      "Epoch 2/9\n",
-      "----------\n",
-      "train Loss: 0.7179 F1: 0.6833 Acc: 0.5190\n",
-      "val Loss: 0.6482 F1: 0.8667 Acc: 0.7647\n",
-      "\n",
-      "Epoch 3/9\n",
-      "----------\n",
-      "train Loss: 0.6749 F1: 0.6833 Acc: 0.5190\n",
-      "val Loss: 0.6608 F1: 0.8725 Acc: 0.7765\n",
-      "\n",
-      "Epoch 4/9\n",
-      "----------\n",
-      "train Loss: 0.6832 F1: 0.6842 Acc: 0.5443\n",
-      "val Loss: 0.6556 F1: 0.8467 Acc: 0.7529\n",
-      "\n",
-      "Epoch 5/9\n",
-      "----------\n",
-      "train Loss: 0.6969 F1: 0.6667 Acc: 0.5823\n",
-      "val Loss: 0.6542 F1: 0.8413 Acc: 0.7647\n",
-      "\n",
-      "Epoch 6/9\n",
-      "----------\n",
-      "train Loss: 0.6960 F1: 0.5060 Acc: 0.4810\n",
-      "val Loss: 0.6501 F1: 0.8788 Acc: 0.8118\n",
-      "\n",
-      "Epoch 7/9\n",
-      "----------\n",
-      "train Loss: 0.6896 F1: 0.5882 Acc: 0.5570\n",
-      "val Loss: 0.6488 F1: 0.8837 Acc: 0.8235\n",
-      "\n",
-      "Epoch 8/9\n",
-      "----------\n",
-      "train Loss: 0.6764 F1: 0.6667 Acc: 0.6203\n",
-      "val Loss: 0.6576 F1: 0.8976 Acc: 0.8471\n",
-      "\n",
-      "Epoch 9/9\n",
-      "----------\n",
-      "train Loss: 0.6710 F1: 0.7253 Acc: 0.6835\n",
-      "val Loss: 0.6590 F1: 0.8710 Acc: 0.8118\n",
-      "\n",
-      "Training complete in 0m 56s\n",
-      "Best val F1  : 0.897638\n",
-      "Best val Acc : 0.847059\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "Running param set: {'data_path_base': '/Users/aziai/Downloads/vtest_new2', 'conv_model_name': None, 'num_epochs': 10, 'feature_extract': True, 'batch_size': 64, 'lr': 0.001, 'use_vggish': True, 'momentum': 0.9}\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Params to update\n",
-      "* combined.weight\n",
-      "* combined.bias\n",
-      "Epoch 0/9\n",
-      "----------\n",
-      "train Loss: 0.7826 F1: 0.6833 Acc: 0.5190\n",
-      "val Loss: 0.5453 F1: 0.8742 Acc: 0.7765\n",
-      "\n",
-      "Epoch 1/9\n",
-      "----------\n",
-      "train Loss: 0.7525 F1: 0.6833 Acc: 0.5190\n",
-      "val Loss: 0.5790 F1: 0.8742 Acc: 0.7765\n",
-      "\n",
-      "Epoch 2/9\n",
-      "----------\n",
-      "train Loss: 0.7158 F1: 0.6833 Acc: 0.5190\n",
-      "val Loss: 0.6449 F1: 0.8742 Acc: 0.7765\n",
-      "\n",
-      "Epoch 3/9\n",
-      "----------\n",
-      "train Loss: 0.6936 F1: 0.6838 Acc: 0.5316\n",
-      "val Loss: 0.7350 F1: 0.0870 Acc: 0.2588\n",
-      "\n",
-      "Epoch 4/9\n",
-      "----------\n",
-      "train Loss: 0.7142 F1: nan Acc: 0.4430\n",
-      "val Loss: 0.8224 F1: nan Acc: 0.2235\n",
-      "\n",
-      "Epoch 5/9\n",
-      "----------\n",
-      "train Loss: 0.7382 F1: nan Acc: 0.4810\n",
-      "val Loss: 0.8526 F1: nan Acc: 0.2235\n",
-      "\n",
-      "Epoch 6/9\n",
-      "----------\n",
-      "train Loss: 0.7477 F1: nan Acc: 0.4810\n",
-      "val Loss: 0.8238 F1: nan Acc: 0.2235\n",
-      "\n",
-      "Epoch 7/9\n",
-      "----------\n",
-      "train Loss: 0.7361 F1: nan Acc: 0.4810\n",
-      "val Loss: 0.7583 F1: 0.0299 Acc: 0.2353\n",
-      "\n",
-      "Epoch 8/9\n",
-      "----------\n",
-      "train Loss: 0.7142 F1: nan Acc: 0.4304\n",
-      "val Loss: 0.6900 F1: 0.6491 Acc: 0.5294\n",
-      "\n",
-      "Epoch 9/9\n",
-      "----------\n",
-      "train Loss: 0.6995 F1: 0.5161 Acc: 0.4304\n",
-      "val Loss: 0.6337 F1: 0.8742 Acc: 0.7765\n",
-      "\n",
-      "Training complete in 0m 26s\n",
-      "Best val F1  : 0.874172\n",
-      "Best val Acc : 0.776471\n"
+      "Running param set: {'data_path_base': '/Users/aziai/Downloads/vtest_new2', 'conv_model_name': None, 'num_epochs': 10, 'feature_extract': False, 'batch_size': 64, 'lr': 0.001, 'use_vggish': False, 'momentum': 0.9}\n",
+      "Running param set: {'data_path_base': '/Users/aziai/Downloads/vtest_new2', 'conv_model_name': None, 'num_epochs': 10, 'feature_extract': False, 'batch_size': 64, 'lr': 0.001, 'use_vggish': True, 'momentum': 0.9}\n",
+      "Loading experiment results from cache\n",
+      "Running param set: {'data_path_base': '/Users/aziai/Downloads/vtest_new2', 'conv_model_name': None, 'num_epochs': 10, 'feature_extract': True, 'batch_size': 64, 'lr': 0.001, 'use_vggish': False, 'momentum': 0.9}\n",
+      "Running param set: {'data_path_base': '/Users/aziai/Downloads/vtest_new2', 'conv_model_name': None, 'num_epochs': 10, 'feature_extract': True, 'batch_size': 64, 'lr': 0.001, 'use_vggish': True, 'momentum': 0.9}\n",
+      "Loading experiment results from cache\n",
+      "Running param set: {'data_path_base': '/Users/aziai/Downloads/vtest_new2', 'conv_model_name': 'resnet', 'num_epochs': 10, 'feature_extract': False, 'batch_size': 64, 'lr': 0.001, 'use_vggish': False, 'momentum': 0.9}\n",
+      "Loading experiment results from cache\n",
+      "Running param set: {'data_path_base': '/Users/aziai/Downloads/vtest_new2', 'conv_model_name': 'resnet', 'num_epochs': 10, 'feature_extract': False, 'batch_size': 64, 'lr': 0.001, 'use_vggish': True, 'momentum': 0.9}\n",
+      "Loading experiment results from cache\n",
+      "Running param set: {'data_path_base': '/Users/aziai/Downloads/vtest_new2', 'conv_model_name': 'resnet', 'num_epochs': 10, 'feature_extract': True, 'batch_size': 64, 'lr': 0.001, 'use_vggish': False, 'momentum': 0.9}\n",
+      "Loading experiment results from cache\n",
+      "Running param set: {'data_path_base': '/Users/aziai/Downloads/vtest_new2', 'conv_model_name': 'resnet', 'num_epochs': 10, 'feature_extract': True, 'batch_size': 64, 'lr': 0.001, 'use_vggish': True, 'momentum': 0.9}\n",
+      "Loading experiment results from cache\n"
      ]
     }
    ],
@@ -180,7 +64,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": 59,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -189,7 +73,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 45,
+   "execution_count": 60,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -200,7 +84,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 46,
+   "execution_count": 61,
    "metadata": {},
    "outputs": [
     {
@@ -240,11 +124,11 @@
        "  </thead>\n",
        "  <tbody>\n",
        "    <tr>\n",
-       "      <th>1</th>\n",
+       "      <th>5</th>\n",
        "      <td>64</td>\n",
        "      <td>resnet</td>\n",
        "      <td>/Users/aziai/Downloads/vtest_new2</td>\n",
-       "      <td>20191402191416</td>\n",
+       "      <td>20190602194822</td>\n",
        "      <td>False</td>\n",
        "      <td>0.001</td>\n",
        "      <td>0.9</td>\n",
@@ -255,11 +139,26 @@
        "      <td>0.935252</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>0</th>\n",
+       "      <th>1</th>\n",
+       "      <td>64</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>/Users/aziai/Downloads/vtest_new2</td>\n",
+       "      <td>20190602194822</td>\n",
+       "      <td>False</td>\n",
+       "      <td>0.001</td>\n",
+       "      <td>0.9</td>\n",
+       "      <td>10</td>\n",
+       "      <td>4687cd536acf6c9b058a8d20719fa6910f50a6abee3ae2...</td>\n",
+       "      <td>True</td>\n",
+       "      <td>0.847059</td>\n",
+       "      <td>0.897638</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
        "      <td>64</td>\n",
        "      <td>resnet</td>\n",
        "      <td>/Users/aziai/Downloads/vtest_new2</td>\n",
-       "      <td>20191402191416</td>\n",
+       "      <td>20190602194822</td>\n",
        "      <td>False</td>\n",
        "      <td>0.001</td>\n",
        "      <td>0.9</td>\n",
@@ -272,9 +171,24 @@
        "    <tr>\n",
        "      <th>3</th>\n",
        "      <td>64</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>/Users/aziai/Downloads/vtest_new2</td>\n",
+       "      <td>20190602194822</td>\n",
+       "      <td>True</td>\n",
+       "      <td>0.001</td>\n",
+       "      <td>0.9</td>\n",
+       "      <td>10</td>\n",
+       "      <td>de7011637531360e5c76520f054d90327cc478dbabeab9...</td>\n",
+       "      <td>True</td>\n",
+       "      <td>0.776471</td>\n",
+       "      <td>0.874172</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>7</th>\n",
+       "      <td>64</td>\n",
        "      <td>resnet</td>\n",
        "      <td>/Users/aziai/Downloads/vtest_new2</td>\n",
-       "      <td>20191402191416</td>\n",
+       "      <td>20190602194822</td>\n",
        "      <td>True</td>\n",
        "      <td>0.001</td>\n",
        "      <td>0.9</td>\n",
@@ -285,11 +199,11 @@
        "      <td>0.824427</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>2</th>\n",
+       "      <th>6</th>\n",
        "      <td>64</td>\n",
        "      <td>resnet</td>\n",
        "      <td>/Users/aziai/Downloads/vtest_new2</td>\n",
-       "      <td>20191402191416</td>\n",
+       "      <td>20190602194822</td>\n",
        "      <td>True</td>\n",
        "      <td>0.001</td>\n",
        "      <td>0.9</td>\n",
@@ -299,21 +213,53 @@
        "      <td>0.564706</td>\n",
        "      <td>0.626263</td>\n",
        "    </tr>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>64</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>/Users/aziai/Downloads/vtest_new2</td>\n",
+       "      <td>20190602194822</td>\n",
+       "      <td>False</td>\n",
+       "      <td>0.001</td>\n",
+       "      <td>0.9</td>\n",
+       "      <td>10</td>\n",
+       "      <td>7324021853e0ca109ff0effaf0c9d06e68d72744305f34...</td>\n",
+       "      <td>False</td>\n",
+       "      <td>-1.000000</td>\n",
+       "      <td>-1.000000</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>64</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>/Users/aziai/Downloads/vtest_new2</td>\n",
+       "      <td>20190602194822</td>\n",
+       "      <td>True</td>\n",
+       "      <td>0.001</td>\n",
+       "      <td>0.9</td>\n",
+       "      <td>10</td>\n",
+       "      <td>9ca13084e79d88cec23574c0c37fa9109fe87a7026f9bd...</td>\n",
+       "      <td>False</td>\n",
+       "      <td>-1.000000</td>\n",
+       "      <td>-1.000000</td>\n",
+       "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
       ],
       "text/plain": [
-       "   batch_size conv_model_name                     data_path_base  ...  use_vggish   val_acc    val_f1\n",
-       "1          64          resnet  /Users/aziai/Downloads/vtest_new2  ...        True  0.894118  0.935252\n",
-       "0          64          resnet  /Users/aziai/Downloads/vtest_new2  ...       False  0.823529  0.878049\n",
-       "3          64          resnet  /Users/aziai/Downloads/vtest_new2  ...        True  0.729412  0.824427\n",
-       "2          64          resnet  /Users/aziai/Downloads/vtest_new2  ...       False  0.564706  0.626263\n",
-       "\n",
-       "[4 rows x 12 columns]"
+       "   batch_size conv_model_name                     data_path_base  experiment_uuid  feature_extract     lr  momentum  num_epochs                                        runner_uuid  use_vggish   val_acc    val_f1\n",
+       "5          64          resnet  /Users/aziai/Downloads/vtest_new2   20190602194822            False  0.001       0.9          10  b3290017112d2116e4bdbb9c8dbf15a8e75adacb942afb...        True  0.894118  0.935252\n",
+       "1          64             NaN  /Users/aziai/Downloads/vtest_new2   20190602194822            False  0.001       0.9          10  4687cd536acf6c9b058a8d20719fa6910f50a6abee3ae2...        True  0.847059  0.897638\n",
+       "4          64          resnet  /Users/aziai/Downloads/vtest_new2   20190602194822            False  0.001       0.9          10  0e57debc92afdd0dc7a209584b4d97860c9dba98f3aed4...       False  0.823529  0.878049\n",
+       "3          64             NaN  /Users/aziai/Downloads/vtest_new2   20190602194822             True  0.001       0.9          10  de7011637531360e5c76520f054d90327cc478dbabeab9...        True  0.776471  0.874172\n",
+       "7          64          resnet  /Users/aziai/Downloads/vtest_new2   20190602194822             True  0.001       0.9          10  8e644bc291a463725bf0bcb11825a196383a4860eeecd7...        True  0.729412  0.824427\n",
+       "6          64          resnet  /Users/aziai/Downloads/vtest_new2   20190602194822             True  0.001       0.9          10  e07e5119b07164f06098d1adba9e4c43ad0344716a0746...       False  0.564706  0.626263\n",
+       "0          64             NaN  /Users/aziai/Downloads/vtest_new2   20190602194822            False  0.001       0.9          10  7324021853e0ca109ff0effaf0c9d06e68d72744305f34...       False -1.000000 -1.000000\n",
+       "2          64             NaN  /Users/aziai/Downloads/vtest_new2   20190602194822             True  0.001       0.9          10  9ca13084e79d88cec23574c0c37fa9109fe87a7026f9bd...       False -1.000000 -1.000000"
       ]
      },
-     "execution_count": 46,
+     "execution_count": 61,
      "metadata": {},
      "output_type": "execute_result"
     }

+ 4 - 2
vggish.py

@@ -1,11 +1,13 @@
 from typing import Tuple
 
-import conv
 import torch.nn as nn
 from torch import hub
 
+import conv
+
 VGGISH_WEIGHTS = (
-    "https://users.cs.cf.ac.uk/taylorh23/pytorch/models/vggish-cbfe8f1c.pth"
+    # "https://users.cs.cf.ac.uk/taylorh23/pytorch/models/vggish-cbfe8f1c.pth"
+    'https://users.cs.cf.ac.uk/taylorh23/pytorch/models/vggish-918c2d05.pth'
 )
 PCA_PARAMS = (
     "https://users.cs.cf.ac.uk/taylorh23/pytorch/models/vggish_pca_params-4d878af3.npz"