Skip to content

Commit

Permalink
Filetype Bugfix + Max TF Version
Browse files Browse the repository at this point in the history
- Fix bug for uppercase video filetypes
- Set maximum supported Tensorflow version to 1.13
  • Loading branch information
torzdf committed Jun 21, 2019
1 parent 4725f8a commit 3c040e3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions lib/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion scripts/fsmedia.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down

0 comments on commit 3c040e3

Please sign in to comment.