Remove barez out of this source code

phamquiluan · Mar 23, 2022 · 4130763 · 4130763
1 parent 2042130
commit 4130763
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Facial Expression Recognition using Residual Masking Network, in PyTorch
 
-[![pypi package](https://img.shields.io/badge/version-v3.0.3-blue)](https://pypi.org/project/rmn)
+[![pypi package](https://img.shields.io/badge/version-v3.0.4-blue)](https://pypi.org/project/rmn)
 [![circleci](https://circleci.com/gh/phamquiluan/ResidualMaskingNetwork.svg?style=shield&circle-token=3ca7f15b6bd362b625bec536d57c45fe5ef6f2c9)](https://app.circleci.com/pipelines/github/phamquiluan/ResidualMaskingNetwork)
 [![style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/phamquiluan/residualmaskingnetwork)
 [![PWC](https://img.shields.io/endpoint.svg?url=https://paperswithcode.com/badge/challenges-in-representation-learning-a/facial-expression-recognition-on-fer2013)](https://paperswithcode.com/sota/facial-expression-recognition-on-fer2013?p=challenges-in-representation-learning-a)

diff --git a/_ar/demo_one_image.py b/_ar/demo_one_image.py
@@ -6,7 +6,9 @@
 import torch
 from torchvision.transforms import transforms
 from models import densenet121, resmasking_dropout1
-from barez import show, ensure_gray, ensure_color
+
+from ..ssd_infer import ensure_color
+from ..utils.utils import ensure_gray
 
 # haar = '/home/z/anaconda3/lib/python3.6/site-packages/cv2/data/haarcascade_frontalface_default.xml'
 haar = "/home/z/anaconda3/lib/python3.6/site-packages/cv2/data/haarcascade_frontalface_alt.xml"
@@ -82,18 +84,6 @@ def main(image_path):
             2,
         )
 
-    from barez import show
-
-    show(image)
-    """
-    cv2.imshow('disp', image)
-    key = cv2.waitKey(0)
-    if key == ord('w'):
-        cv2.imwrite('./real_life_demo/{}'.format(os.path.basename(image_path)), image)
-
-    cv2.destroyAllWindows()
-    """
-
 
 if __name__ == "__main__":
     import sys

diff --git a/_ar/demo_one_video.py b/_ar/demo_one_video.py
@@ -6,7 +6,9 @@
 import torch
 from torchvision.transforms import transforms
 from models import densenet121, resmasking_dropout1
-from barez import show, ensure_gray, ensure_color
+
+from ..ssd_infer import ensure_color
+from ..utils.utils import ensure_gray
 
 # haar = '/home/z/anaconda3/lib/python3.6/site-packages/cv2/data/haarcascade_frontalface_default.xml'
 haar = "/home/z/anaconda3/lib/python3.6/site-packages/cv2/data/haarcascade_frontalface_alt.xml"

diff --git a/_ar/masking_provement.py b/_ar/masking_provement.py
@@ -7,7 +7,6 @@
 from natsort import natsorted
 from models import resmasking_dropout1
 from utils.datasets.fer2013dataset import EMOTION_DICT
-from barez import show
 
 transform = transforms.Compose(
     [
@@ -81,7 +80,6 @@ def activations_mask(tensor):
 
     # print(np.sum(heat_1 - heat_2))
 
-    # show(np.concatenate((image, heat_1, heat_2), axis=1))
     cv2.imwrite(
         "./masking_provements/{}".format(image_name),
         np.concatenate((image, heat_1), axis=1),

diff --git a/_ar/masking_sigmoid.py b/_ar/masking_sigmoid.py
@@ -7,7 +7,6 @@
 from natsort import natsorted
 from models import resmasking_dropout1
 from utils.datasets.fer2013dataset import EMOTION_DICT
-from barez import show
 
 transform = transforms.Compose(
     [
@@ -87,10 +86,8 @@ def activations_mask(tensor):
 
     # output = model.fc(x)
 
-    # show(np.concatenate((image, heat_1, heat_2), axis=1))
     debug_image = np.concatenate((image, heat_1, heat_2), axis=1)
     cv2.imwrite("./debug/{}".format(image_name), debug_image)
-    # cv2.imshow('disp', debug_image)
     # if cv2.waitKey(0) == ord('w'):
 
     # cv2.imwrite(

diff --git a/_ar/vj_infer.py b/_ar/vj_infer.py
@@ -6,7 +6,8 @@
 import torch
 from torchvision.transforms import transforms
 from models import densenet121, resmasking_dropout1
-from barez import show, ensure_gray, ensure_color
+from ..ssd_infer import ensure_color
+from ..utils.utils import ensure_gray
 
 haar = "/home/z/anaconda3/lib/python3.6/site-packages/cv2/data/haarcascade_frontalface_default.xml"
 face_cascade = cv2.CascadeClassifier(haar)

diff --git a/utils/datasets/affectnet_dataset.py b/utils/datasets/affectnet_dataset.py
@@ -88,7 +88,6 @@ def affectnet(stage, configs=None, tta=False, tta_size=48):
         },
     )
     import cv2
-    from barez import pp
 
     targets = []
 

diff --git a/utils/datasets/ck_dataset.py b/utils/datasets/ck_dataset.py
@@ -62,7 +62,6 @@ def ckdataset(stage, fold_idx, configs):
         stage="train", fold_idx=1, configs={"image_size": 224, "in_channels": 3}
     )
     import cv2
-    from barez import pp
 
     targets = []
 

diff --git a/utils/datasets/fer2013dataset.py b/utils/datasets/fer2013dataset.py
@@ -84,7 +84,6 @@ def fer2013(stage, configs=None, tta=False, tta_size=48):
         },
     )
     import cv2
-    from barez import pp
 
     targets = []
 

diff --git a/utils/datasets/mixed_emotion.py b/utils/datasets/mixed_emotion.py
@@ -128,12 +128,11 @@ def __getitem__(self, idx):
 
 
 if __name__ == "__main__":
-    from barez import show
 
     dataset = mixed_emotion("/data/emotion_data/MixedEmotion/CK+/", "test", {})
 
     cnt = 0
     while True:
         cnt += 1
         image, emo = dataset[cnt]
-        show(image)
+        # show(image)
diff --git a/utils/datasets/z_dataset.py b/utils/datasets/z_dataset.py
@@ -97,7 +97,6 @@ def z(stage, configs=None, tta=False, tta_size=48):
         },
     )
     import cv2
-    from barez import pp
 
     targets = []