diff --git a/docker/cpu/conda-2stems.dockerfile b/docker/cpu/conda-2stems.dockerfile index 04afaa7..0c4bbf0 100644 --- a/docker/cpu/conda-2stems.dockerfile +++ b/docker/cpu/conda-2stems.dockerfile @@ -2,4 +2,5 @@ FROM researchdeezer/spleeter:conda RUN mkdir -p /model/2stems \ && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \ - && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ + && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ \ + && touch /model/5stems/.probe diff --git a/docker/cpu/conda-4stems.dockerfile b/docker/cpu/conda-4stems.dockerfile index c8acf4f..b32c84c 100644 --- a/docker/cpu/conda-4stems.dockerfile +++ b/docker/cpu/conda-4stems.dockerfile @@ -2,4 +2,5 @@ FROM researchdeezer/spleeter:conda RUN mkdir -p /model/4stems \ && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \ - && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ + && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ \ + && touch /model/5stems/.probe diff --git a/docker/cpu/conda-5stems.dockerfile b/docker/cpu/conda-5stems.dockerfile index 934a97a..6b6f2ca 100644 --- a/docker/cpu/conda-5stems.dockerfile +++ b/docker/cpu/conda-5stems.dockerfile @@ -2,4 +2,5 @@ FROM researchdeezer/spleeter:conda RUN mkdir -p /model/5stems \ && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \ - && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ + && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ \ + && touch /model/5stems/.probe diff --git a/docker/cpu/conda.dockerfile b/docker/cpu/conda.dockerfile index 133273a..32184e3 100644 --- a/docker/cpu/conda.dockerfile +++ b/docker/cpu/conda.dockerfile @@ -1,5 +1,7 @@ FROM continuumio/miniconda3:4.7.10 +RUN conda install -y -c conda-forge musdb +# RUN conda install -y -c conda-forge museval RUN conda install -y -c conda-forge spleeter RUN mkdir -p /model ENV MODEL_PATH /model diff --git a/docker/cpu/cpu.dockerfile b/docker/cpu/cpu.dockerfile deleted file mode 100644 index e3f47e7..0000000 --- a/docker/cpu/cpu.dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM continuumio/miniconda3:4.7.10 - -# install tensorflow -RUN conda install -y tensorflow==1.14.0 - -# install ffmpeg for audio loading/writing -RUN conda install -y -c conda-forge ffmpeg - -# install extra python libraries -RUN conda install -y -c anaconda pandas==0.25.1 -RUN conda install -y -c conda-forge libsndfile - -# install ipython -RUN conda install -y ipython - -WORKDIR /workspace/ -COPY ./ spleeter/ - -RUN mkdir /cache/ - -WORKDIR /workspace/spleeter -RUN pip install . - -ENTRYPOINT ["python", "-m", "spleeter"] \ No newline at end of file diff --git a/docker/cpu/python-3.6-2stems.dockerfile b/docker/cpu/python-3.6-2stems.dockerfile index 2a2012d..3fca665 100644 --- a/docker/cpu/python-3.6-2stems.dockerfile +++ b/docker/cpu/python-3.6-2stems.dockerfile @@ -1,5 +1,6 @@ -FROM spleeter:3.6 +FROM researchdeezer/spleeter:3.6 RUN mkdir -p /model/2stems \ && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \ - && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ + && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ \ + && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.6-4stems.dockerfile b/docker/cpu/python-3.6-4stems.dockerfile index 4524de0..d19171e 100644 --- a/docker/cpu/python-3.6-4stems.dockerfile +++ b/docker/cpu/python-3.6-4stems.dockerfile @@ -1,5 +1,6 @@ -FROM spleeter:3.6 +FROM researchdeezer/spleeter:3.6 RUN mkdir -p /model/4stems \ && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \ - && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ + && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ \ + && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.6-5stems.dockerfile b/docker/cpu/python-3.6-5stems.dockerfile index 1eaf104..a2a14ce 100644 --- a/docker/cpu/python-3.6-5stems.dockerfile +++ b/docker/cpu/python-3.6-5stems.dockerfile @@ -1,5 +1,6 @@ -FROM spleeter:3.6 +FROM researchdeezer/spleeter:3.6 RUN mkdir -p /model/5stems \ && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \ - && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ + && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ \ + && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.6.dockerfile b/docker/cpu/python-3.6.dockerfile index e0ec580..a10868d 100644 --- a/docker/cpu/python-3.6.dockerfile +++ b/docker/cpu/python-3.6.dockerfile @@ -1,6 +1,7 @@ FROM python:3.6 RUN apt-get update && apt-get install -y ffmpeg libsndfile +RUN pip install musdb museval RUN pip install spleeter RUN mkdir -p /model ENV MODEL_PATH /model diff --git a/docker/cpu/python-3.7-2stems.dockerfile b/docker/cpu/python-3.7-2stems.dockerfile index 748cd44..c3232a3 100644 --- a/docker/cpu/python-3.7-2stems.dockerfile +++ b/docker/cpu/python-3.7-2stems.dockerfile @@ -1,5 +1,6 @@ -FROM spleeter:3.7 +FROM researchdeezer/spleeter:3.7 RUN mkdir -p /model/2stems \ && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \ - && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ + && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ \ + && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.7-4stems.dockerfile b/docker/cpu/python-3.7-4stems.dockerfile index 4f8ce06..dfa2366 100644 --- a/docker/cpu/python-3.7-4stems.dockerfile +++ b/docker/cpu/python-3.7-4stems.dockerfile @@ -1,5 +1,6 @@ -FROM spleeter:3.7 +FROM researchdeezer/spleeter:3.7 RUN mkdir -p /model/4stems \ && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \ - && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ + && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ \ + && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.7-5stems.dockerfile b/docker/cpu/python-3.7-5stems.dockerfile index b5dd68b..0c05955 100644 --- a/docker/cpu/python-3.7-5stems.dockerfile +++ b/docker/cpu/python-3.7-5stems.dockerfile @@ -1,5 +1,6 @@ -FROM spleeter:3.7 +FROM researchdeezer/spleeter:3.7 RUN mkdir -p /model/5stems \ && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \ - && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ + && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ \ + && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.7.dockerfile b/docker/cpu/python-3.7.dockerfile index c4f370e..f900683 100644 --- a/docker/cpu/python-3.7.dockerfile +++ b/docker/cpu/python-3.7.dockerfile @@ -1,6 +1,7 @@ FROM python:3.7 RUN apt-get update && apt-get install -y ffmpeg libsndfile +RUN pip install musdb museval RUN pip install spleeter RUN mkdir -p /model ENV MODEL_PATH /model diff --git a/docker/gpu/conda-gpu-2-stems.dockerfile b/docker/gpu/conda-gpu-2-stems.dockerfile index f55b0e1..888b524 100644 --- a/docker/gpu/conda-gpu-2-stems.dockerfile +++ b/docker/gpu/conda-gpu-2-stems.dockerfile @@ -1,4 +1,4 @@ -FROM deezer/spleeter:conda-gpu +FROM researchdeezer/spleeter:conda-gpu RUN mkdir -p /model/2stems \ && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \ diff --git a/docker/gpu/conda-gpu-4-stems.dockerfile b/docker/gpu/conda-gpu-4-stems.dockerfile index 98952d1..3d9c4f7 100644 --- a/docker/gpu/conda-gpu-4-stems.dockerfile +++ b/docker/gpu/conda-gpu-4-stems.dockerfile @@ -1,4 +1,4 @@ -FROM deezer/spleeter:conda-gpu +FROM researchdeezer/spleeter:conda-gpu RUN mkdir -p /model/4stems \ && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \ diff --git a/docker/gpu/conda-gpu-5-stems.dockerfile b/docker/gpu/conda-gpu-5-stems.dockerfile index 0e8135f..5d5ae3b 100644 --- a/docker/gpu/conda-gpu-5-stems.dockerfile +++ b/docker/gpu/conda-gpu-5-stems.dockerfile @@ -1,4 +1,4 @@ -FROM deezer/spleeter:conda-gpu +FROM researchdeezer/spleeter:conda-gpu RUN mkdir -p /model/5stems \ && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \ diff --git a/docker/gpu/conda-gpu.dockerfile b/docker/gpu/conda-gpu.dockerfile index 3da59d0..e1fa3d0 100644 --- a/docker/gpu/conda-gpu.dockerfile +++ b/docker/gpu/conda-gpu.dockerfile @@ -1,12 +1,21 @@ -FROM continuumio/miniconda3:4.7.10 +FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04 -RUN conda install -y ipython \ - && conda install -y tensorflow-gpu==1.14.0 \ - && conda install -y -c conda-forge ffmpeg \ - && conda install -y -c conda-forge libsndfile \ - && conda install -y -c anaconda pandas==0.25.1 \ -RUN mkdir -p /model -ENV MODEL_PATH /model -RUN pip install spleeter +RUN apt-get update --fix-missing && \ + apt-get install -y wget bzip2 ca-certificates curl git && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* +RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.6.14-Linux-x86_64.sh -O ~/miniconda.sh && \ + /bin/bash ~/miniconda.sh -b -p /opt/conda && \ + rm ~/miniconda.sh && \ + /opt/conda/bin/conda clean -tipsy && \ + ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ + echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ + echo "conda activate base" >> ~/.bashrc + +RUN conda install -y tensorflow-gpu==1.14.0 +RUN conda install -y -c conda-forge musdb +# RUN conda install -y -c conda-forge museval +# Note: switch to spleeter GPU once published. +RUN conda install -y -c conda-forge spleeter ENTRYPOINT ["spleeter"] \ No newline at end of file diff --git a/docker/gpu/gpu.dockerfile b/docker/gpu/gpu.dockerfile deleted file mode 100644 index aedeeda..0000000 --- a/docker/gpu/gpu.dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04 - -# set work directory -WORKDIR /workspace - -# install anaconda -ENV PATH /opt/conda/bin:$PATH -COPY docker/install_miniconda.sh . -RUN bash ./install_miniconda.sh && rm install_miniconda.sh - -RUN conda update -n base -c defaults conda - -# install tensorflow for GPU -RUN conda install -y tensorflow-gpu==1.14.0 - -# install ffmpeg for audio loading/writing -RUN conda install -y -c conda-forge ffmpeg - -# install extra libs -RUN conda install -y -c anaconda pandas==0.25.1 -RUN conda install -y -c conda-forge libsndfile - -# install ipython -RUN conda install -y ipython - -RUN mkdir /cache/ - -# clone inside image github repository -COPY ./ spleeter/ - -WORKDIR /workspace/spleeter -RUN pip install . - - -ENTRYPOINT ["python", "-m", "spleeter"] \ No newline at end of file diff --git a/docker/gpu/install_miniconda.sh b/docker/gpu/install_miniconda.sh deleted file mode 100644 index 6ea58bc..0000000 --- a/docker/gpu/install_miniconda.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -apt-get update --fix-missing && \ -apt-get install -y wget bzip2 ca-certificates curl git && \ -apt-get clean && \ -rm -rf /var/lib/apt/lists/* - -wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.6.14-Linux-x86_64.sh -O ~/miniconda.sh && \ -/bin/bash ~/miniconda.sh -b -p /opt/conda && \ -rm ~/miniconda.sh && \ -/opt/conda/bin/conda clean -tipsy && \ -ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ -echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ -echo "conda activate base" >> ~/.bashrc \ No newline at end of file