Merge branch 'dev' of github.com:idealo/image-quality-assessment into…

… dev
idealo · Oct 17, 2019 · 003f8e2 · 003f8e2
2 parents 3cf94db + f0eacc8
commit 003f8e2
Show file tree

Hide file tree

Showing 48 changed files with 1,302 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -22,12 +22,12 @@ Image quality assessment is compatible with Python 3.6 and is distributed under
 ## Trained models
 | <sub>Predictions from aesthetic model</sub>
 | :--:
-| ![](/_readme/images_aesthetic/aesthetic1.jpg_aesthetic.svg)
+| ![](readme_figures/images_aesthetic/aesthetic1.jpg_aesthetic.svg)
 
 
 | <sub>Predictions from technical model</sub>
 | :--:
-| ![](/_readme/images_technical/techncial3.jpgtechnical.svg)
+| ![](readme_figures/images_technical/techncial3.jpgtechnical.svg)
 
 
 
@@ -164,6 +164,7 @@ See the [Contribution](CONTRIBUTING.md) guide for more details.
 
 ## Datasets
 This project uses two datasets to train the NIMA model:
+
 1. [**AVA**](https://github.com/ylogx/aesthetics/tree/master/data/ava) used for aesthetic ratings ([data](http://academictorrents.com/details/71631f83b11d3d79d8f84efe0a7e12f0ac001460))
 2. [**TID2013**](http://www.ponomarenko.info/tid2013.htm) used for technical ratings
 

diff --git a/contrib/tf_serving/save_tfs_model.py b/contrib/tf_serving/save_tfs_model.py
@@ -1,7 +1,7 @@
-import keras.backend as K
+import tensorflow.keras.backend as K
 import argparse
-from keras.applications.mobilenet import DepthwiseConv2D, relu6
-from keras.utils.generic_utils import CustomObjectScope
+from tensorflow.keras.applications.mobilenet import DepthwiseConv2D, relu6
+from tensorflow.keras.utils.generic_utils import CustomObjectScope
 from tensorflow.python.saved_model import builder as saved_model_builder
 from tensorflow.python.saved_model import tag_constants
 from tensorflow.python.saved_model.signature_def_utils_impl import \

diff --git a/contrib/tf_serving/tfs_sample_client.py b/contrib/tf_serving/tfs_sample_client.py
@@ -1,6 +1,6 @@
 import json
 import argparse
-import keras
+import tensorflow.keras as keras
 import numpy as np
 import tensorflow as tf
 from src.utils import utils

diff --git a/mkdocs/build_docs.sh b/mkdocs/build_docs.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 cp ../README.md docs/index.md
-cp -r ../_readme docs/_readme
+cp -r ../_readme_figures docs/
 cp ../CONTRIBUTING.md docs/CONTRIBUTING.md
 cp ../LICENSE docs/LICENSE.md
 python autogen.py

diff --git a/_readme/images_aesthetic/aesthetic1.jpg → ...e_figures/images_aesthetic/aesthetic1.jpg b/_readme/images_aesthetic/aesthetic1.jpg → ...e_figures/images_aesthetic/aesthetic1.jpg
diff --git a/...es_aesthetic/aesthetic1.jpg_aesthetic.png → ...es_aesthetic/aesthetic1.jpg_aesthetic.png b/...es_aesthetic/aesthetic1.jpg_aesthetic.png → ...es_aesthetic/aesthetic1.jpg_aesthetic.png
diff --git a/...es_aesthetic/aesthetic1.jpg_aesthetic.svg → ...es_aesthetic/aesthetic1.jpg_aesthetic.svg b/...es_aesthetic/aesthetic1.jpg_aesthetic.svg → ...es_aesthetic/aesthetic1.jpg_aesthetic.svg
diff --git a/_readme/images_aesthetic/aesthetic2.jpg → ...e_figures/images_aesthetic/aesthetic2.jpg b/_readme/images_aesthetic/aesthetic2.jpg → ...e_figures/images_aesthetic/aesthetic2.jpg
diff --git a/_readme/images_aesthetic/aesthetic3.jpg → ...e_figures/images_aesthetic/aesthetic3.jpg b/_readme/images_aesthetic/aesthetic3.jpg → ...e_figures/images_aesthetic/aesthetic3.jpg
diff --git a/_readme/images_aesthetic/aesthetic4.jpg → ...e_figures/images_aesthetic/aesthetic4.jpg b/_readme/images_aesthetic/aesthetic4.jpg → ...e_figures/images_aesthetic/aesthetic4.jpg
diff --git a/_readme/images_aesthetic/aesthetic5.jpg → ...e_figures/images_aesthetic/aesthetic5.jpg b/_readme/images_aesthetic/aesthetic5.jpg → ...e_figures/images_aesthetic/aesthetic5.jpg
diff --git a/_readme/images_aesthetic/aesthetic6.jpg → ...e_figures/images_aesthetic/aesthetic6.jpg b/_readme/images_aesthetic/aesthetic6.jpg → ...e_figures/images_aesthetic/aesthetic6.jpg
diff --git a/_readme/images_technical/techncial2.jpg → ...e_figures/images_technical/techncial2.jpg b/_readme/images_technical/techncial2.jpg → ...e_figures/images_technical/techncial2.jpg
diff --git a/_readme/images_technical/techncial3.jpg → ...e_figures/images_technical/techncial3.jpg b/_readme/images_technical/techncial3.jpg → ...e_figures/images_technical/techncial3.jpg
diff --git a/...ges_technical/techncial3.jpgtechnical.png → ...ges_technical/techncial3.jpgtechnical.png b/...ges_technical/techncial3.jpgtechnical.png → ...ges_technical/techncial3.jpgtechnical.png
diff --git a/...ges_technical/techncial3.jpgtechnical.svg → ...ges_technical/techncial3.jpgtechnical.svg b/...ges_technical/techncial3.jpgtechnical.svg → ...ges_technical/techncial3.jpgtechnical.svg
diff --git a/_readme/images_technical/technical1.jpg → ...e_figures/images_technical/technical1.jpg b/_readme/images_technical/technical1.jpg → ...e_figures/images_technical/technical1.jpg
diff --git a/_readme/images_technical/technical4.bmp → ...e_figures/images_technical/technical4.bmp b/_readme/images_technical/technical4.bmp → ...e_figures/images_technical/technical4.bmp
diff --git a/_readme/images_technical/technical5.bmp → ...e_figures/images_technical/technical5.bmp b/_readme/images_technical/technical5.bmp → ...e_figures/images_technical/technical5.bmp
diff --git a/_readme/images_technical/technical6.bmp → ...e_figures/images_technical/technical6.bmp b/_readme/images_technical/technical6.bmp → ...e_figures/images_technical/technical6.bmp
diff --git a/...es_technical/technical6.bmp_aesthetic.png → ...es_technical/technical6.bmp_aesthetic.png b/...es_technical/technical6.bmp_aesthetic.png → ...es_technical/technical6.bmp_aesthetic.png
diff --git a/...es_technical/technical6.bmp_aesthetic.svg → ...es_technical/technical6.bmp_aesthetic.svg b/...es_technical/technical6.bmp_aesthetic.svg → ...es_technical/technical6.bmp_aesthetic.svg
diff --git a/mkdocs/mkdocs.yml b/mkdocs/mkdocs.yml
@@ -29,5 +29,9 @@ theme:
 repo_name: 'idealo/image-quality-assessment'
 repo_url: 'https://github.com/idealo/image-quality-assessment'
 
+google_analytics:
+  - 'UA-137434942-3'
+  - 'auto'
+
 markdown_extensions:
   - codehilite
diff --git a/mkdocs/run_docs.sh b/mkdocs/run_docs.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 cp ../README.md docs/index.md
-cp -r ../_readme docs/_readme
+cp -r ../readme_figures docs/
 cp ../CONTRIBUTING.md docs/CONTRIBUTING.md
 cp ../LICENSE docs/LICENSE.md
 python autogen.py

diff --git a/readme_figures/images_aesthetic/aesthetic1.jpg b/readme_figures/images_aesthetic/aesthetic1.jpg
diff --git a/readme_figures/images_aesthetic/aesthetic1.jpg_aesthetic.png b/readme_figures/images_aesthetic/aesthetic1.jpg_aesthetic.png
diff --git a/readme_figures/images_aesthetic/aesthetic1.jpg_aesthetic.svg b/readme_figures/images_aesthetic/aesthetic1.jpg_aesthetic.svg
diff --git a/readme_figures/images_aesthetic/aesthetic2.jpg b/readme_figures/images_aesthetic/aesthetic2.jpg
diff --git a/readme_figures/images_aesthetic/aesthetic3.jpg b/readme_figures/images_aesthetic/aesthetic3.jpg
diff --git a/readme_figures/images_aesthetic/aesthetic4.jpg b/readme_figures/images_aesthetic/aesthetic4.jpg
diff --git a/readme_figures/images_aesthetic/aesthetic5.jpg b/readme_figures/images_aesthetic/aesthetic5.jpg
diff --git a/readme_figures/images_aesthetic/aesthetic6.jpg b/readme_figures/images_aesthetic/aesthetic6.jpg
diff --git a/readme_figures/images_technical/techncial2.jpg b/readme_figures/images_technical/techncial2.jpg
diff --git a/readme_figures/images_technical/techncial3.jpg b/readme_figures/images_technical/techncial3.jpg
diff --git a/readme_figures/images_technical/techncial3.jpgtechnical.png b/readme_figures/images_technical/techncial3.jpgtechnical.png
diff --git a/readme_figures/images_technical/techncial3.jpgtechnical.svg b/readme_figures/images_technical/techncial3.jpgtechnical.svg
diff --git a/readme_figures/images_technical/technical1.jpg b/readme_figures/images_technical/technical1.jpg
diff --git a/readme_figures/images_technical/technical4.bmp b/readme_figures/images_technical/technical4.bmp
diff --git a/readme_figures/images_technical/technical5.bmp b/readme_figures/images_technical/technical5.bmp
diff --git a/readme_figures/images_technical/technical6.bmp b/readme_figures/images_technical/technical6.bmp
diff --git a/readme_figures/images_technical/technical6.bmp_aesthetic.png b/readme_figures/images_technical/technical6.bmp_aesthetic.png
diff --git a/readme_figures/images_technical/technical6.bmp_aesthetic.svg b/readme_figures/images_technical/technical6.bmp_aesthetic.svg
diff --git a/src/handlers/data_generator.py b/src/handlers/data_generator.py
@@ -1,7 +1,7 @@
 
 import os
 import numpy as np
-import keras
+import tensorflow.keras as keras
 from utils import utils
 
 

diff --git a/src/handlers/model_builder.py b/src/handlers/model_builder.py
@@ -1,8 +1,8 @@
 
 import importlib
-from keras.models import Model
-from keras.layers import Dropout, Dense
-from keras.optimizers import Adam
+from tensorflow.keras.models import Model
+from tensorflow.keras.layers import Dropout, Dense
+from tensorflow.keras.optimizers import Adam
 from utils.losses import earth_movers_distance
 
 
@@ -21,11 +21,11 @@ def __init__(self, base_model_name, n_classes=10, learning_rate=0.001, dropout_r
     def _get_base_module(self):
         # import Keras base model module
         if self.base_model_name == 'InceptionV3':
-            self.base_module = importlib.import_module('keras.applications.inception_v3')
+            self.base_module = importlib.import_module('tensorflow.keras.applications.inception_v3')
         elif self.base_model_name == 'InceptionResNetV2':
-            self.base_module = importlib.import_module('keras.applications.inception_resnet_v2')
+            self.base_module = importlib.import_module('tensorflow.keras.applications.inception_resnet_v2')
         else:
-            self.base_module = importlib.import_module('keras.applications.'+self.base_model_name.lower())
+            self.base_module = importlib.import_module('tensorflow.keras.applications.'+self.base_model_name.lower())
 
     def build(self):
         # get base model class

diff --git a/src/trainer/train.py b/src/trainer/train.py
@@ -1,8 +1,8 @@
 
 import os
 import argparse
-from keras import backend as K
-from keras.callbacks import ModelCheckpoint
+from tensorflow.keras import backend as K
+from tensorflow.keras.callbacks import ModelCheckpoint
 from sklearn.model_selection import train_test_split
 from handlers.data_generator import TrainDataGenerator, TestDataGenerator
 from handlers.model_builder import Nima

diff --git a/src/utils/keras_utils.py b/src/utils/keras_utils.py
@@ -1,6 +1,6 @@
 
-import keras.backend as K
-from keras.callbacks import TensorBoard
+import tensorflow.keras.backend as K
+from tensorflow.keras.callbacks import TensorBoard
 
 
 class TensorBoardBatch(TensorBoard):

diff --git a/src/utils/losses.py b/src/utils/losses.py
@@ -1,5 +1,5 @@
 
-from keras import backend as K
+from tensorflow.keras import backend as K
 
 
 def earth_movers_distance(y_true, y_pred):

diff --git a/src/utils/utils.py b/src/utils/utils.py
@@ -1,7 +1,7 @@
 
 import os
 import json
-import keras
+import tensorflow.keras as keras
 import numpy as np