From 3c040e3ccd56219a1429c7274c360335679d0826 Mon Sep 17 00:00:00 2001 From: torzdf <36920800+torzdf@users.noreply.github.com> Date: Fri, 21 Jun 2019 14:30:23 +0100 Subject: [PATCH] Filetype Bugfix + Max TF Version - Fix bug for uppercase video filetypes - Set maximum supported Tensorflow version to 1.13 --- lib/cli.py | 5 +++++ scripts/fsmedia.py | 2 +- setup.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/cli.py b/lib/cli.py index 2c6c15bceb..f6132a1fca 100644 --- a/lib/cli.py +++ b/lib/cli.py @@ -46,6 +46,7 @@ def import_script(self): def test_for_tf_version(): """ Check that the minimum required Tensorflow version is installed """ min_ver = 1.12 + max_ver = 1.13 try: import tensorflow as tf except ImportError: @@ -56,6 +57,10 @@ def test_for_tf_version(): logger.error("The minimum supported Tensorflow is version %s but you have version " "%s installed. Please upgrade Tensorflow.", min_ver, tf_ver) exit(1) + if tf_ver > max_ver: + logger.error("The maximumum supported Tensorflow is version %s but you have version " + "%s installed. Please upgrade Tensorflow.", max_ver, tf_ver) + exit(1) logger.debug("Installed Tensorflow Version: %s", tf_ver) def test_for_gui(self): diff --git a/scripts/fsmedia.py b/scripts/fsmedia.py index 6922ec485b..c6454f9ce0 100644 --- a/scripts/fsmedia.py +++ b/scripts/fsmedia.py @@ -157,7 +157,7 @@ def check_input_folder(self): logger.error("Input location %s not found.", self.args.input_dir) exit(1) if (os.path.isfile(self.args.input_dir) and - os.path.splitext(self.args.input_dir)[1] in _video_extensions): + os.path.splitext(self.args.input_dir)[1].lower() in _video_extensions): logger.info("Input Video: %s", self.args.input_dir) retval = True else: diff --git a/setup.py b/setup.py index 7df42bdaf2..6a47e61158 100755 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ INSTALL_FAILED = False # Revisions of tensorflow-gpu and cuda/cudnn requirements TENSORFLOW_REQUIREMENTS = {"==1.12.0": ["9.0", "7.2"], - ">=1.13.1": ["10.0", "7.4"]} + ">=1.13.1,<1.14": ["10.0", "7.4"]} # TF 1.14+ Not currently supported class Environment():