From 8da47c04a3bbad14220fbc5167496e7c760f90d7 Mon Sep 17 00:00:00 2001 From: Andrea Giovannucci Date: Thu, 26 Mar 2020 08:10:13 -0400 Subject: [PATCH 1/8] trying to fix issues with installation --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 236dee7ff..b5b252845 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,12 +17,12 @@ opencv-python peakutils pims psutil -pynwb==1.1 +pynwb pyqtgraph scikit-image scikit-learn scipy -tensorflow==1.15.2 +tensorflow tifffile tk tqdm From c99d680c61966a49c91fd555afccbf3d4325bb89 Mon Sep 17 00:00:00 2001 From: Andrea Giovannucci Date: Thu, 26 Mar 2020 08:16:08 -0400 Subject: [PATCH 2/8] Other attempts at fixing --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b5b252845..2ee447538 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -bokeh +bokeh==2.0 coverage cython future From 3c79902a1201debd4daa5ae49c865fd203c3de88 Mon Sep 17 00:00:00 2001 From: Andrea Giovannucci Date: Thu, 26 Mar 2020 08:17:45 -0400 Subject: [PATCH 3/8] attempts to fix requirements file --- requirements_gpu.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_gpu.txt b/requirements_gpu.txt index e722b2cc1..15ba5daca 100644 --- a/requirements_gpu.txt +++ b/requirements_gpu.txt @@ -17,7 +17,7 @@ opencv-python peakutils pims psutil -pynwb==1.1 +pynwb pyqtgraph scikit-image scikit-learn From 85ce16ab6feaf5fb829ba006a70d813fb34e9f17 Mon Sep 17 00:00:00 2001 From: Andrea Giovannucci Date: Thu, 26 Mar 2020 08:27:29 -0400 Subject: [PATCH 4/8] Still trying to salvage demo --- requirements_gpu.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements_gpu.txt b/requirements_gpu.txt index 15ba5daca..492720fda 100644 --- a/requirements_gpu.txt +++ b/requirements_gpu.txt @@ -18,7 +18,6 @@ peakutils pims psutil pynwb -pyqtgraph scikit-image scikit-learn scipy From a6eac4d183343596a429b4b2ce0150f6a75f3595 Mon Sep 17 00:00:00 2001 From: Andrea Giovannucci Date: Thu, 26 Mar 2020 08:30:27 -0400 Subject: [PATCH 5/8] trying to salvage --- requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2ee447538..d9f9ca7c4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -bokeh==2.0 +bokeh coverage cython future @@ -17,8 +17,6 @@ opencv-python peakutils pims psutil -pynwb -pyqtgraph scikit-image scikit-learn scipy From 854878c5f815e31477c1b2906889996fc99db47c Mon Sep 17 00:00:00 2001 From: Andrea Giovannucci Date: Thu, 26 Mar 2020 08:31:34 -0400 Subject: [PATCH 6/8] Update requirements_gpu.txt --- requirements_gpu.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements_gpu.txt b/requirements_gpu.txt index 492720fda..12bfb73cd 100644 --- a/requirements_gpu.txt +++ b/requirements_gpu.txt @@ -21,7 +21,6 @@ pynwb scikit-image scikit-learn scipy -tensorflow-gpu==1.15.2 tifffile tk tqdm From 3a6989194a1c1ced3ac5653b2bff25a4161f221a Mon Sep 17 00:00:00 2001 From: Andrea Giovannucci Date: Thu, 26 Mar 2020 08:33:57 -0400 Subject: [PATCH 7/8] restoring old version --- requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d9f9ca7c4..236dee7ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,10 +17,12 @@ opencv-python peakutils pims psutil +pynwb==1.1 +pyqtgraph scikit-image scikit-learn scipy -tensorflow +tensorflow==1.15.2 tifffile tk tqdm From b3a7752cb4d826e2670a72204319d518ab83e6ae Mon Sep 17 00:00:00 2001 From: Andrea Giovannucci Date: Thu, 26 Mar 2020 08:34:38 -0400 Subject: [PATCH 8/8] restoring old version -- GPU --- requirements_gpu.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements_gpu.txt b/requirements_gpu.txt index 12bfb73cd..e722b2cc1 100644 --- a/requirements_gpu.txt +++ b/requirements_gpu.txt @@ -17,10 +17,12 @@ opencv-python peakutils pims psutil -pynwb +pynwb==1.1 +pyqtgraph scikit-image scikit-learn scipy +tensorflow-gpu==1.15.2 tifffile tk tqdm