Merge branch 'master' of github.com:flatironinstitute/CaImAn into dev

Conflicts: requirements_gpu.txt
flatironinstitute · Mar 11, 2020 · 6c5c3b6 · 6c5c3b6
2 parents de4ba06 + 21a237b
commit 6c5c3b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -22,7 +22,7 @@ pyqtgraph
 scikit-image
 scikit-learn
 scipy
-tensorflow==1.13.1
+tensorflow==1.15.2
 tifffile
 tk
 tqdm

diff --git a/requirements_gpu.txt b/requirements_gpu.txt
@@ -22,7 +22,7 @@ pyqtgraph
 scikit-image
 scikit-learn
 scipy
-tensorflow-gpu==1.13.1
+tensorflow-gpu==1.15.2
 tifffile
 tk
 tqdm