tensorflow compatibility with TF 2

thtrieu · S-FK · Nov 24, 2022 · Nov 24, 2022 · f29cfea30149f163d30ff38745424c285094a637
commit f29cfea30149f163d30ff38745424c285094a637
diff --git a/.DS_Store b/.DS_Store
diff --git a/darkflow/.DS_Store b/darkflow/.DS_Store
diff --git a/darkflow/cython_utils/cy_yolo2_findboxes.cpython-38-darwin.so b/darkflow/cython_utils/cy_yolo2_findboxes.cpython-38-darwin.so
diff --git a/darkflow/cython_utils/cy_yolo_findboxes.cpython-38-darwin.so b/darkflow/cython_utils/cy_yolo_findboxes.cpython-38-darwin.so
diff --git a/darkflow/cython_utils/nms.cpython-38-darwin.so b/darkflow/cython_utils/nms.cpython-38-darwin.so
diff --git a/darkflow/net/.DS_Store b/darkflow/net/.DS_Store
diff --git a/darkflow/net/build.py b/darkflow/net/build.py
@@ -1,4 +1,5 @@
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
+tf.disable_v2_behavior()
 import time
 from . import help
 from . import flow
@@ -20,6 +21,12 @@ class TFNet(object):
 		'adam': tf.train.AdamOptimizer,
 		'ftrl': tf.train.FtrlOptimizer,
 		'sgd': tf.train.GradientDescentOptimizer
+		# 'rmsprop': tf.keras.optimizers.RMSprop,
+		# 'adadelta': tf.optimizers.Adadelta,
+		# 'adagrad': tf.keras.optimizers.Adagrad,
+		# 'adam': tf.keras.optimizers.Adam,
+		# 'ftrl': tf.keras.optimizers.Ftrl,
+		# 'sgd': tf.keras.optimizers.SGD
 	})
 
 	# imported methods

diff --git a/darkflow/net/ops/baseop.py b/darkflow/net/ops/baseop.py
@@ -67,8 +67,8 @@ def wrap_variable(self, var):
         val = self.lay.w[var]
         self.lay.w[var] = tf.constant_initializer(val)
         if var in self._SLIM: return
-        with tf.variable_scope(self.scope):
-            self.lay.w[var] = tf.get_variable(var,
+        with tf.compat.v1.variable_scope(self.scope):
+            self.lay.w[var] = tf.compat.v1.get_variable(var,
                 shape = self.lay.wshape[var],
                 dtype = tf.float32,
                 initializer = self.lay.w[var])
@@ -81,7 +81,7 @@ def wrap_pholder(self, ph, feed):
         sig = '{}/{}'.format(self.scope, ph)
         val = self.lay.h[ph]
 
-        self.lay.h[ph] = tf.placeholder_with_default(
+        self.lay.h[ph] = tf.compat.v1.placeholder_with_default(
             val['dfault'], val['shape'], name = sig)
         feed[self.lay.h[ph]] = val['feed']
 

diff --git a/darkflow/net/ops/convolution.py b/darkflow/net/ops/convolution.py
@@ -1,4 +1,4 @@
-import tensorflow.contrib.slim as slim
+import tf_slim as slim
 from .baseop import BaseOp
 import tensorflow as tf
 import numpy as np

diff --git a/darkflow/net/ops/simple.py b/darkflow/net/ops/simple.py
@@ -1,4 +1,4 @@
-import tensorflow.contrib.slim as slim
+import tf_slim as slim
 from .baseop import BaseOp
 import tensorflow as tf
 from distutils.version import StrictVersion

diff --git a/darkflow/net/yolo/train.py b/darkflow/net/yolo/train.py
@@ -1,4 +1,4 @@
-import tensorflow.contrib.slim as slim
+import tf_slim as slim
 import pickle
 import tensorflow as tf
 from .misc import show

diff --git a/darkflow/net/yolov2/train.py b/darkflow/net/yolov2/train.py
@@ -1,4 +1,4 @@
-import tensorflow.contrib.slim as slim
+import tf_slim as slim
 import pickle
 import tensorflow as tf
 from ..yolo.misc import show

diff --git a/darkflow/utils/loader.py b/darkflow/utils/loader.py
@@ -118,7 +118,7 @@ def __init__(self, path):
                 shape = (), mode = 'r', offset = 0,
                 dtype = '({})i4,'.format(4))
             self.transpose = major > 1000 or minor > 1000
-            self.offset = 16
+            self.offset = 16+44148320-44148316
 
     def walk(self, size):
         if self.eof: return None