Skip to content

Commit b4fda1c

Browse files
authored
Merge pull request #24 from SpikeInterface/rm_old_ks
Move license-based KS and update YASS
2 parents 1fe8166 + 3382e98 commit b4fda1c

10 files changed

Lines changed: 13 additions & 3 deletions

File tree

kilosort2/Dockerfile renamed to kilosort_with_license/kilosort2/Dockerfile

File renamed without changes.

kilosort3/Dockerfile renamed to kilosort_with_license/kilosort3/Dockerfile

File renamed without changes.

matlab_for_kilosort/docker1/Dockerfile renamed to kilosort_with_license/matlab_for_kilosort/docker1/Dockerfile

File renamed without changes.

matlab_for_kilosort/docker1/build.sh renamed to kilosort_with_license/matlab_for_kilosort/docker1/build.sh

File renamed without changes.

matlab_for_kilosort/matlab_docker.md renamed to kilosort_with_license/matlab_for_kilosort/matlab_docker.md

File renamed without changes.

yass/Dockerfile

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@ FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04
33
# link the cuda libraries
44
ENV LD_LIBRARY_PATH /usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH
55

6+
# fix nvidia gpg
7+
RUN rm /etc/apt/sources.list.d/cuda.list
8+
RUN rm /etc/apt/sources.list.d/nvidia-ml.list
9+
RUN apt-key del 7fa2af80
10+
RUN apt-get update && apt-get install -y --no-install-recommends wget
11+
RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-keyring_1.0-1_all.deb
12+
RUN dpkg -i cuda-keyring_1.0-1_all.deb
13+
614
# install ubuntu packages
715
RUN apt-get update
8-
RUN apt-get install -y software-properties-common wget git
9-
16+
RUN apt-get install -y git software-properties-common
17+
1018
# set shell to /bin/bash for compatibility with conda
1119
# (hints from: https://towardsdatascience.com/conda-pip-and-docker-ftw-d64fe638dc45)
1220
SHELL [ "/bin/bash", "--login", "-c" ]
@@ -41,4 +49,6 @@ RUN git clone https://github.com/paninski-lab/yass \
4149
&& cd ../.. \
4250
&& pip install .
4351

44-
RUN pip install scipy==1.2.0
52+
# fix versions of scipy and pyyaml (to avoid Loader problem)
53+
RUN pip install scipy==1.2.0 && pip install pyyaml==5.3
54+

0 commit comments

Comments
 (0)