fixed tensorflow version to match 1.14

OMMR4all · Oct 2, 2019 · 7f8ccb1 · 7f8ccb1
1 parent f4c18d1
commit 7f8ccb1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/modules/ommr4all-server b/modules/ommr4all-server
diff --git a/ommr4all-deploy/deploy/run_deploy.py b/ommr4all-deploy/deploy/run_deploy.py
@@ -36,7 +36,7 @@ def main():
 
     logger.info("Setting up virtual environment and dependencies")
     os.chdir(root_dir)
-    check_call([pip, 'install', 'tensorflow_gpu' if args.gpu else 'tensorflow'])
+    check_call([pip, 'install', 'tensorflow_gpu==1.14' if args.gpu else 'tensorflow==1.14'])
     check_call([pip, 'install', '-r', 'modules/ommr4all-server/requirements.txt'])
     for submodule in ['ommr4all-page-segmentation', 'ommr4all-line-detection', 'ommr4all-layout-analysis']:
         os.chdir('modules/' + submodule)

diff --git a/ommr4all-deploy/test/run_test.py b/ommr4all-deploy/test/run_test.py
@@ -15,7 +15,7 @@ def main():
     os.chdir(root_dir)
 
     # setup python3 venv for server testing
-    check_call([pip, 'install', 'tensorflow'])
+    check_call([pip, 'install', 'tensorflow==1.14'])
     check_call([pip, 'install', '-r', 'modules/ommr4all-server/requirements.txt'])
     for submodule in ['ommr4all-page-segmentation', 'ommr4all-line-detection', 'ommr4all-layout-analysis', 'calamari']:
         os.chdir('modules/' + submodule)
+9 −0		database/file_formats/pcgts/page/coords.py
+2 −0		omr/adapters/pagesegmentation/params.py
+7 −23		omr/experimenter/experimenter.py
+19 −1		omr/experimenter/odsrunner.py
+30 −10		omr/experimenter/runner.py
+16 −0		omr/imageoperations/music_line_operations.py
+1 −0		omr/steps/algorithmtrainerparams.py
+46 −39		omr/steps/syllables/predictor.py
+7 −4		omr/steps/syllables/syllablesfromtext/predictor.py
+1 −0		omr/steps/syllables/syllablesinorder/predictor.py
+4 −4		omr/steps/symboldetection/dataset.py
+24 −8		omr/steps/symboldetection/pixelclassifier/predictor.py
+5 −2		omr/steps/symboldetection/pixelclassifier/trainer.py
+4 −1		omr/steps/text/calamari/predictor.py
+1 −0		requirements.txt
+33 −8		restapi/views/bookaccess.py
+56 −28		shared/pcgtscanvas.py
+5 −10		tests/manage_gitlab-ci.py