yuzu/spleeter
1
0
Fork 0
mirror of https://github.com/YuzuZensai/spleeter.git synced 2026-01-31 14:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #576 from deezer/contribution

Browse Source 
Contribution
This commit is contained in:
Félix Voituret
2021-02-12 10:59:21 +01:00
committed by GitHub
parent 8994dde6e8 5ac9b01d0c
commit dc6f9fe08f
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/docker.yml vendored
View File

@@ -1,6 +1,11 @@
name: docker name: docker
on: on:
- workflow_dispatch workflow_dispatch:
inputs:
version:
description: "Spleeter version to build image for"
required: true
default: "2.1.2"
jobs: jobs:
build-test-push: build-test-push:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -19,7 +24,6 @@ jobs:
echo "::set-env name=base::python:${{ matrix.distribution }}" echo "::set-env name=base::python:${{ matrix.distribution }}"
echo "::set-env name=tag::${{ matrix.distribution }}" echo "::set-env name=tag::${{ matrix.distribution }}"
echo "::set-env name=file::spleeter" echo "::set-env name=file::spleeter"
echo "::set-env name=package::spleeter"
- if: ${{ matrix.distribution == 'conda' }} - if: ${{ matrix.distribution == 'conda' }}
name: Build Conda base image name: Build Conda base image
run: | run: |
@@ -31,17 +35,16 @@ jobs:
docker build \ docker build \
--build-arg BASE=python:${{ matrix.distribution }} \ --build-arg BASE=python:${{ matrix.distribution }} \
-t cuda:${{ matrix.distribution }} \ -t cuda:${{ matrix.distribution }} \
-f docker/cuda-10-0.dockerfile . -f docker/cuda-10-1.dockerfile .
echo "::set-env name=base::cuda:${{ matrix.distribution }}" echo "::set-env name=base::cuda:${{ matrix.distribution }}"
echo "::set-env name=tag::${{ matrix.distribution }}-gpu" echo "::set-env name=tag::${{ matrix.distribution }}-gpu"
echo "::set-env name=package::spleeter-gpu"
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Note: image building. # Note: image building.
- name: Build deezer/spleeter:${{ env.tag }} image - name: Build deezer/spleeter:${{ env.tag }} image
run: | run: |
docker build \ docker build \
--build-arg BASE=${{ env.base }} \ --build-arg BASE=${{ env.base }} \
--build-arg SPLEETER_PACKAGE=${{ env.package }} \ --build-arg SPLEETER_VERSION=${{ github.event.inputs.version }} \
-t deezer/spleeter:${{ env.tag }} \ -t deezer/spleeter:${{ env.tag }} \
-f docker/${{ env.file }}.dockerfile . -f docker/${{ env.file }}.dockerfile .
echo "::set-env name=modelargs::" echo "::set-env name=modelargs::"
@@ -54,7 +57,7 @@ jobs:
-t deezer/spleeter:${{ env.tag }}-${{ matrix.model }} \ -t deezer/spleeter:${{ env.tag }}-${{ matrix.model }} \
-f docker/spleeter-model.dockerfile . -f docker/spleeter-model.dockerfile .
echo "::set-env name=tag::${{ env.tag }}-${{ matrix.model }}" echo "::set-env name=tag::${{ env.tag }}-${{ matrix.model }}"
echo "::set-env name=modelarg::-p spleeter:${{ matrix.model }}" echo "::set-env name=modelarg::-p spleeter:${{ matrix.model }}"
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Note: image testing. # Note: image testing.
- name: Test deezer/spleeter:${{ env.tag }} image - name: Test deezer/spleeter:${{ env.tag }} image

4
docker/spleeter-conda.dockerfile
View File

@@ -2,12 +2,12 @@ ARG BASE=conda
FROM ${BASE} FROM ${BASE}
ARG SPLEETER_PACKAGE=spleeter
ARG SPLEETER_VERSION=1.5.3 ARG SPLEETER_VERSION=1.5.3
ENV MODEL_PATH /model ENV MODEL_PATH /model
RUN mkdir -p /model RUN mkdir -p /model
RUN conda config --add channels conda-forge
RUN conda install -y -c conda-forge musdb RUN conda install -y -c conda-forge musdb
RUN conda install -y -c conda-forge ${SPLEETER_PACKAGE}==${SPLEETER_VERSION} RUN conda install -y -c deezer-research spleeter
COPY docker/conda-entrypoint.sh spleeter-entrypoint.sh COPY docker/conda-entrypoint.sh spleeter-entrypoint.sh
ENTRYPOINT ["/bin/bash", "spleeter-entrypoint.sh"] ENTRYPOINT ["/bin/bash", "spleeter-entrypoint.sh"]

3
docker/spleeter.dockerfile
View File

@@ -2,13 +2,12 @@ ARG BASE=python:3.6
FROM ${BASE} FROM ${BASE}
ARG SPLEETER_PACKAGE=spleeter
ARG SPLEETER_VERSION=1.5.3 ARG SPLEETER_VERSION=1.5.3
ENV MODEL_PATH /model ENV MODEL_PATH /model
RUN mkdir -p /model RUN mkdir -p /model
RUN apt-get update && apt-get install -y ffmpeg libsndfile1 RUN apt-get update && apt-get install -y ffmpeg libsndfile1
RUN pip install musdb museval RUN pip install musdb museval
RUN pip install ${SPLEETER_PACKAGE}==${SPLEETER_VERSION} RUN pip install spleeter==${SPLEETER_VERSION}
ENTRYPOINT ["spleeter"] ENTRYPOINT ["spleeter"]