From 3e79126322cca8ca423d2931c479f3bff0998144 Mon Sep 17 00:00:00 2001 From: Kazuki Otao Date: Thu, 25 Jul 2019 13:55:12 +0900 Subject: [PATCH 1/4] move .py files to src --- SyncNetInstance.py => src/SyncNetInstance.py | 0 SyncNetModel.py => src/SyncNetModel.py | 0 demo_feature.py => src/demo_feature.py | 0 demo_syncnet.py => src/demo_syncnet.py | 0 download_model.sh => src/download_model.sh | 0 run_pipeline.py => src/run_pipeline.py | 0 run_syncnet.py => src/run_syncnet.py | 0 run_visualise.py => src/run_visualise.py | 0 {utils => src/utils}/label_map_util.py | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename SyncNetInstance.py => src/SyncNetInstance.py (100%) rename SyncNetModel.py => src/SyncNetModel.py (100%) rename demo_feature.py => src/demo_feature.py (100%) rename demo_syncnet.py => src/demo_syncnet.py (100%) rename download_model.sh => src/download_model.sh (100%) rename run_pipeline.py => src/run_pipeline.py (100%) rename run_syncnet.py => src/run_syncnet.py (100%) rename run_visualise.py => src/run_visualise.py (100%) rename {utils => src/utils}/label_map_util.py (100%) diff --git a/SyncNetInstance.py b/src/SyncNetInstance.py similarity index 100% rename from SyncNetInstance.py rename to src/SyncNetInstance.py diff --git a/SyncNetModel.py b/src/SyncNetModel.py similarity index 100% rename from SyncNetModel.py rename to src/SyncNetModel.py diff --git a/demo_feature.py b/src/demo_feature.py similarity index 100% rename from demo_feature.py rename to src/demo_feature.py diff --git a/demo_syncnet.py b/src/demo_syncnet.py similarity index 100% rename from demo_syncnet.py rename to src/demo_syncnet.py diff --git a/download_model.sh b/src/download_model.sh similarity index 100% rename from download_model.sh rename to src/download_model.sh diff --git a/run_pipeline.py b/src/run_pipeline.py similarity index 100% rename from run_pipeline.py rename to src/run_pipeline.py diff --git a/run_syncnet.py b/src/run_syncnet.py similarity index 100% rename from run_syncnet.py rename to src/run_syncnet.py diff --git a/run_visualise.py b/src/run_visualise.py similarity index 100% rename from run_visualise.py rename to src/run_visualise.py diff --git a/utils/label_map_util.py b/src/utils/label_map_util.py similarity index 100% rename from utils/label_map_util.py rename to src/utils/label_map_util.py From b188b94d0d7d3409b402cf7830ab12e06a1cba51 Mon Sep 17 00:00:00 2001 From: Kazuki Otao Date: Thu, 25 Jul 2019 13:56:36 +0900 Subject: [PATCH 2/4] add editorconfig --- .editorconfig | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..664de3c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +indent_size = 4 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false From 12531e45f2d108d0405ea963f87cb364d45544bb Mon Sep 17 00:00:00 2001 From: Kazuki Otao Date: Thu, 25 Jul 2019 15:44:31 +0900 Subject: [PATCH 3/4] Add dockerfile --- docker-compose.yml | 7 +++++++ docker/Dockerfile | 46 +++++++++++++++++++++++++++++++++++++++++ docker/requirements.txt | 7 +++++++ src/download_model.sh | 2 +- src/run_syncnet.py | 6 +++--- src/run_visualise.py | 4 ++-- 6 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 docker-compose.yml create mode 100644 docker/Dockerfile create mode 100644 docker/requirements.txt diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..906605d --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,7 @@ +version: '2.3' +services: + syncnet: + build: ./docker + runtime: nvidia + volumes: + - ./src:/home diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..5be9dca --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,46 @@ +FROM nvidia/cuda:9.0-cudnn7-devel + +RUN apt-get update \ + && apt-get upgrade -y \ + && apt-get install -y --no-install-recommends \ + gcc \ + git \ + make \ + wget \ + curl \ + unzip \ + cmake \ + libsm6 \ + libxext6 \ + libpq-dev \ + libxrender1 \ + libglib2.0-0 \ + liblapack-dev \ + libxrender-dev \ + libopenblas-dev \ + build-essential \ + ca-certificates \ + python-pip \ + python2.7 \ + python2.7-dev \ + python-tk \ + && curl -kL https://bootstrap.pypa.io/get-pip.py | python + +# pip +COPY ./requirements.txt /tmp +RUN pip install --upgrade pip setuptools \ + && pip install -r /tmp/requirements.txt \ + && rm -rf /tmp/requirements.txt + +# ffmpeg +RUN mkdir /tmp/ffmepg \ + && wget -O /tmp/ffmepg/ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz \ + && tar xvf /tmp/ffmepg/ffmpeg.tar.xz -C /tmp/ffmepg --strip-components 1 \ + && cp /tmp/ffmepg/ffmpeg /usr/local/bin \ + && cp /tmp/ffmepg/ffprobe /usr/local/bin \ + && rm -rf /tmp/ffmepg + +RUN apt-get clean \ + && rm -rf /var/chache/apt/archives/* /var/lib/apt/lists/* + + diff --git a/docker/requirements.txt b/docker/requirements.txt new file mode 100644 index 0000000..148d702 --- /dev/null +++ b/docker/requirements.txt @@ -0,0 +1,7 @@ +torch==1.1.0 +numpy==1.14.3 +scipy==1.0.1 +opencv-python==3.4.0.14 +python_speech_features==0.6 +tensorflow==1.4 +scenedetect==0.5 diff --git a/src/download_model.sh b/src/download_model.sh index 7045f17..f7ba7bc 100755 --- a/src/download_model.sh +++ b/src/download_model.sh @@ -13,4 +13,4 @@ unzip facedet.zip -d protos/ rm -f facedet.zip cat /dev/null > protos/__init__.py -cat /dev/null > utils/__init__.py \ No newline at end of file +cat /dev/null > utils/__init__.py diff --git a/src/run_syncnet.py b/src/run_syncnet.py index 6532059..2329154 100755 --- a/src/run_syncnet.py +++ b/src/run_syncnet.py @@ -32,7 +32,7 @@ # ==================== GET OFFSETS ==================== with open(os.path.join(opt.work_dir,opt.reference,'tracks.pckl'), 'rb') as fil: - tracks = pickle.load(fil, encoding='latin1') + tracks = pickle.load(fil) dists = [] offsets = [] @@ -42,13 +42,13 @@ offsets.append(offset) dists.append(dist) confs.append(conf) - + # ==================== PRINT RESULTS TO FILE ==================== with open(os.path.join(opt.work_dir,opt.reference,'offsets.txt'), 'w') as fil: fil.write('FILENAME\tOFFSET\tCONF\n') for ii, track in enumerate(tracks): fil.write('%05d.avi\t%d\t%.3f\n'%(ii, offsets[ii], confs[ii])) - + with open(os.path.join(opt.work_dir,opt.reference,'activesd.pckl'), 'wb') as fil: pickle.dump(dists, fil) diff --git a/src/run_visualise.py b/src/run_visualise.py index 198c5fd..8cb1f88 100644 --- a/src/run_visualise.py +++ b/src/run_visualise.py @@ -28,10 +28,10 @@ # ==================== LOAD FILES ==================== with open(os.path.join(opt.work_dir,opt.reference,'tracks.pckl'), 'rb') as fil: - tracks = pickle.load(fil, encoding='latin1') + tracks = pickle.load(fil) with open(os.path.join(opt.work_dir,opt.reference,'activesd.pckl'), 'rb') as fil: - dists = pickle.load(fil, encoding='latin1') + dists = pickle.load(fil) # ==================== SMOOTH FACES ==================== From 77e527b9ab968e49ef04a0049075d95153413831 Mon Sep 17 00:00:00 2001 From: Kazuki Otao Date: Thu, 25 Jul 2019 15:47:48 +0900 Subject: [PATCH 4/4] Update README --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 96e879d..dcca25c 100755 --- a/README.md +++ b/README.md @@ -27,6 +27,18 @@ pyscenedetect (0.5) The demo has been tested with the package versions shown above, but may also work on other versions. +### Docker + +Build +```sh +docker-compose build +``` + +Exec bash +```sh +docker-compose run syncnet bin/bash +``` + ## Demo SyncNet demo: