diff --git a/GTSRB/05-Full-convolutions.ipynb b/GTSRB/05-Full-convolutions.ipynb
index 364e330e8da9ed464cee4f0cf5890f71c1be40f4..4ae5fb20e5e031a01aad98423bd7cb1d3e483398 100644
--- a/GTSRB/05-Full-convolutions.ipynb
+++ b/GTSRB/05-Full-convolutions.ipynb
@@ -21,7 +21,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 2,
"metadata": {},
"outputs": [],
"source": [
@@ -47,9 +47,26 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 4,
"metadata": {},
- "outputs": [],
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "\n",
+ "Full Convolutions Notebook\n",
+ " Version : 1.6\n",
+ " Now is : Tuesday 21 January 2020 - 00h11m24s\n",
+ " OAR id : ???\n",
+ " Tag id : 077605\n",
+ " Working directory : /home/pjluc/dev/fidle/GTSRB\n",
+ " TensorFlow version : 2.0.0\n",
+ " Keras version : 2.2.4-tf\n",
+ " for tensorboard : --logdir /home/pjluc/dev/fidle/GTSRB/run/logs_077605\n"
+ ]
+ }
+ ],
"source": [
"# ---- Where I am ?\n",
"now = time.strftime(\"%A %d %B %Y - %Hh%Mm%Ss\")\n",
@@ -83,7 +100,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 5,
"metadata": {},
"outputs": [],
"source": [
@@ -112,7 +129,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 6,
"metadata": {},
"outputs": [],
"source": [
@@ -196,7 +213,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 7,
"metadata": {},
"outputs": [],
"source": [
@@ -296,7 +313,7 @@
"metadata": {},
"outputs": [],
"source": [
- "%%time\n",
+ "start_time = time.time()\n",
"\n",
"print('\\n---- Run','-'*50)\n",
"\n",
@@ -313,25 +330,25 @@
"# verbose = 0\n",
"#\n",
"# ---- All possibilities -> Run A\n",
- "datasets = ['set-24x24-L', 'set-24x24-RGB', 'set-48x48-L', 'set-48x48-RGB', 'set-24x24-L-LHE', 'set-24x24-RGB-HE', 'set-48x48-L-LHE', 'set-48x48-RGB-HE']\n",
- "models = {'v1':get_model_v1, 'v2':get_model_v2, 'v3':get_model_v3}\n",
- "batch_size = 64\n",
- "epochs = 16\n",
- "train_size = 1\n",
- "test_size = 1\n",
- "with_datagen = False\n",
- "verbose = 0\n",
- "#\n",
- "# ---- Data augmentation -> Run B\n",
- "# datasets = ['set-48x48-RGB']\n",
- "# models = {'v2':get_model_v2}\n",
+ "# datasets = ['set-24x24-L', 'set-24x24-RGB', 'set-48x48-L', 'set-48x48-RGB', 'set-24x24-L-LHE', 'set-24x24-RGB-HE', 'set-48x48-L-LHE', 'set-48x48-RGB-HE']\n",
+ "# models = {'v1':get_model_v1, 'v2':get_model_v2, 'v3':get_model_v3}\n",
"# batch_size = 64\n",
- "# epochs = 20\n",
+ "# epochs = 16\n",
"# train_size = 1\n",
"# test_size = 1\n",
- "# with_datagen = True\n",
+ "# with_datagen = False\n",
"# verbose = 0\n",
"#\n",
+ "# ---- Data augmentation -> Run B\n",
+ "datasets = ['set-48x48-RGB']\n",
+ "models = {'v2':get_model_v2}\n",
+ "batch_size = 64\n",
+ "epochs = 20\n",
+ "train_size = 1\n",
+ "test_size = 1\n",
+ "with_datagen = True\n",
+ "verbose = 0\n",
+ "#\n",
"# ---------------------------------------------------------------------------\n",
"\n",
"# ---- Data augmentation\n",
@@ -368,6 +385,9 @@
" json.dump(report, file)\n",
"\n",
"print('\\nReport saved as ',report_name)\n",
+ "end_time = time.time()\n",
+ "duration = end_time-start_time\n",
+ "print('Duration : {} s'.format(duration))\n",
"print('-'*59)\n"
]
},
diff --git a/GTSRB/05.1-Full-convolutions-batch.ipynb b/GTSRB/05.1-Full-convolutions-batch.ipynb
index da292798f7a547ae45bb140449557ca0ca99358c..19d5b3e2d5b3eed902ff3cc9234f82109d822853 100644
--- a/GTSRB/05.1-Full-convolutions-batch.ipynb
+++ b/GTSRB/05.1-Full-convolutions-batch.ipynb
@@ -54,7 +54,7 @@
"output_type": "stream",
"text": [
"[NbConvertApp] Converting notebook 05-Full-convolutions.ipynb to script\n",
- "[NbConvertApp] Writing 11301 bytes to ./run/full_convolutions_A.py\n"
+ "[NbConvertApp] Writing 11305 bytes to ./run/full_convolutions_B.py\n"
]
}
],
@@ -63,7 +63,7 @@
"\n",
"# ---- This will convert a notebook to a notebook.py script\n",
"#\n",
- "jupyter nbconvert --to script --output='./run/full_convolutions_A' '05-Full-convolutions.ipynb'"
+ "jupyter nbconvert --to script --output='./run/full_convolutions_B' '05-Full-convolutions.ipynb'"
]
},
{
@@ -75,7 +75,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "-rwxr-xr-x 1 paroutyj l-simap 11301 Jan 20 22:11 ./run/full_convolutions_A.py\n"
+ "-rw-r--r-- 1 pjluc pjluc 11305 Jan 21 00:13 ./run/full_convolutions_B.py\n"
]
}
],
@@ -100,12 +100,12 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Overwriting ./run/batch_full_convolutions_A.sh\n"
+ "Writing ./run/batch_full_convolutions_B.sh\n"
]
}
],
"source": [
- "%%writefile \"./run/batch_full_convolutions_A.sh\"\n",
+ "%%writefile \"./run/batch_full_convolutions_B.sh\"\n",
"#!/bin/bash\n",
"#OAR -n Full convolutions\n",
"#OAR -t gpu\n",
@@ -131,7 +131,7 @@
"\n",
"CONDA_ENV=deeplearning2\n",
"RUN_DIR=~/fidle/GTSRB\n",
- "RUN_SCRIPT=./run/full_convolutions_A.py\n",
+ "RUN_SCRIPT=./run/full_convolutions_B.py\n",
"\n",
"# ---- Cuda Conda initialization\n",
"#\n",
@@ -159,8 +159,9 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "-rwxr-xr-x 1 paroutyj l-simap 1045 Jan 20 22:12 ./run/batch_full_convolutions_A.sh\n",
- "-rwxr-xr-x 1 paroutyj l-simap 11301 Jan 20 22:11 ./run/full_convolutions_A.py\n"
+ "-rwxr-xr-x 1 pjluc pjluc 1045 Jan 21 00:15 ./run/batch_full_convolutions_B.sh\n",
+ "-rwxr-xr-x 1 pjluc pjluc 611 Jan 19 15:53 ./run/batch_full_convolutions.sh\n",
+ "-rwxr-xr-x 1 pjluc pjluc 11305 Jan 21 00:13 ./run/full_convolutions_B.py\n"
]
}
],