From 9bf25b8d9fb1466cef2b9f3fbfe503c2d775c364 Mon Sep 17 00:00:00 2001
From: jeongjoonsup <penny4860@gmail.com>
Date: Sat, 17 Aug 2019 14:19:55 +0900
Subject: [PATCH] eager_excuetion off

---
 eval.py                   | 2 --
 pred.py                   | 1 -
 train_eager.py            | 2 --
 yolo/dataset/generator.py | 1 -
 yolo/loss/calc_tensor.py  | 2 --
 yolo/net/bodynet.py       | 1 -
 yolo/net/headnet.py       | 1 -
 yolo/net/weights.py       | 4 ----
 yolo/net/yolonet.py       | 1 -
 yolo/train.py             | 1 -
 10 files changed, 16 deletions(-)

diff --git a/eval.py b/eval.py
index 54a9570..f1871a3 100644
--- a/eval.py
+++ b/eval.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 import tensorflow as tf
-tf.compat.v1.enable_eager_execution()
-
 import argparse
 
 argparser = argparse.ArgumentParser(
diff --git a/pred.py b/pred.py
index 87b60cc..f5b76f5 100644
--- a/pred.py
+++ b/pred.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import tensorflow as tf
-tf.compat.v1.enable_eager_execution()
 import argparse
 import cv2
 import matplotlib.pyplot as plt
diff --git a/train_eager.py b/train_eager.py
index d16a7e7..b15e4ed 100644
--- a/train_eager.py
+++ b/train_eager.py
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import tensorflow as tf
-tf.compat.v1.enable_eager_execution()
-
 import argparse
 from yolo.train import train_fn
 from yolo.config import ConfigParser
diff --git a/yolo/dataset/generator.py b/yolo/dataset/generator.py
index 48187b0..4bfa3d4 100644
--- a/yolo/dataset/generator.py
+++ b/yolo/dataset/generator.py
@@ -177,7 +177,6 @@ def normalize(image):
 
 
 if __name__ == '__main__':
-    tf.enable_eager_execution()
     import os
     import glob
     from yolo import PROJECT_ROOT
diff --git a/yolo/loss/calc_tensor.py b/yolo/loss/calc_tensor.py
index ee4fe3d..bec0631 100644
--- a/yolo/loss/calc_tensor.py
+++ b/yolo/loss/calc_tensor.py
@@ -2,7 +2,6 @@
 
 import tensorflow as tf
 import numpy as np
-# tf.enable_eager_execution()
 from yolo.loss.utils import adjust_pred_tensor, adjust_true_tensor
 from yolo.loss.utils import conf_delta_tensor
 from yolo.loss.utils import loss_class_tensor, loss_conf_tensor, loss_coord_tensor, wh_scale_tensor
@@ -77,7 +76,6 @@ def run(self, y_true, y_pred, anchors=[90, 95, 92, 154, 139, 281]):
 if __name__ == '__main__':
     import os
     from yolo import PROJECT_ROOT
-    tf.enable_eager_execution()
     def test():
         yolo_1 = np.load(os.path.join(PROJECT_ROOT, "yolo_1.npy")).astype(np.float32)
         pred_yolo_1 = np.load(os.path.join(PROJECT_ROOT, "pred_yolo_1.npy")).astype(np.float32)
diff --git a/yolo/net/bodynet.py b/yolo/net/bodynet.py
index 0421a0c..d704dd3 100644
--- a/yolo/net/bodynet.py
+++ b/yolo/net/bodynet.py
@@ -180,7 +180,6 @@ def call(self, input_tensor, training=False):
 
 if __name__ == '__main__':
     import numpy as np
-    tf.enable_eager_execution()
     imgs = np.random.randn(1, 256, 256, 3).astype(np.float32)
     input_tensor = tf.constant(imgs)
     
diff --git a/yolo/net/headnet.py b/yolo/net/headnet.py
index 075d04a..7052039 100644
--- a/yolo/net/headnet.py
+++ b/yolo/net/headnet.py
@@ -147,7 +147,6 @@ def call(self, input_tensor, training=False):
 
 if __name__ == '__main__':
     import numpy as np
-    tf.enable_eager_execution()
     s3 = tf.constant(np.random.randn(1, 32, 32, 256).astype(np.float32))
     s4 = tf.constant(np.random.randn(1, 16, 16, 512).astype(np.float32))
     s5 = tf.constant(np.random.randn(1, 8, 8, 1024).astype(np.float32))
diff --git a/yolo/net/weights.py b/yolo/net/weights.py
index 4aefae2..a460759 100644
--- a/yolo/net/weights.py
+++ b/yolo/net/weights.py
@@ -69,10 +69,6 @@ def _load_4d_var(self, variable):
 
 
 if __name__ == '__main__':
-    # Todo : tensorflow를 import 했을 때 / 안했을 때 offset 결과가 다르다.
-#     import tensorflow as tf
-#     tf.enable_eager_execution()
-
     from yolo.net.yolonet import Yolonet
     from yolo import YOLOV3_WEIGHTS
     yolonet = Yolonet(18)
diff --git a/yolo/net/yolonet.py b/yolo/net/yolonet.py
index 45d7202..cd636b5 100644
--- a/yolo/net/yolonet.py
+++ b/yolo/net/yolonet.py
@@ -66,7 +66,6 @@ def preprocess_input(image, net_size):
 
 
 if __name__ == '__main__':
-    tf.enable_eager_execution()
     inputs = tf.constant(np.random.randn(1, 256, 256, 3).astype(np.float32))
     
     # (1, 256, 256, 3) => (1, 8, 8, 1024)
diff --git a/yolo/train.py b/yolo/train.py
index fb6be72..75c7e08 100644
--- a/yolo/train.py
+++ b/yolo/train.py
@@ -82,5 +82,4 @@ def _grad_fn(model, images_tensor, list_y_trues):
 
 
 if __name__ == '__main__':
-    tf.compat.v1.enable_eager_execution()
     pass