From 3de0665d0b5283e85c03722d0d99167c132e98e7 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Wed, 22 Jan 2020 16:54:16 -0800 Subject: [PATCH 01/24] Test and push ARM build --- .travis.yml | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b3b276..51f4f3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,47 @@ language: python + python: - - 3.6 + - 3.7 + services: - docker + +before_install: + # Replace all slashes (which are common in branch names) in VERSION with dashes for Docker compatibility + - if [[ "$TRAVIS_BRANCH" == "master" ]]; then + VERSION=latest; + else + VERSION=${TRAVIS_BRANCH//\//-}; + fi + + # Default variables (used by Jenkins) + - '[[ -z "$DOCKERFILE" ]] && export DOCKERFILE=Dockerfile || /bin/true' + - '[[ -z "$IMAGE" ]] && export IMAGE=test || /bin/true' + - '[[ -z "$ARCH" ]] && export ARCH=x86_64 || /bin/true' + - '[[ -z "$VERSION" ]] && export VERSION=jenkins || /bin/true' + install: - - docker build -t max-audio-classifier . - - docker run -it -d -p 5000:5000 max-audio-classifier - - pip install pytest requests flake8 + - docker build -f "$DOCKERFILE" -t codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" . + - docker run -it -d --rm -p 5000:5000 codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" + - pip install -r requirements-test.txt + before_script: - - flake8 . --max-line-length=127 + - flake8 . --max-line-length=127 --exclude utils/,protos/,training/training_code/ - sleep 30 + script: - pytest tests/test.py + +after_success: + - if [[ "$IMAGE" != "test" && "$TRAVIS_PULL_REQUEST" == "false" ]] && [[ "$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "$TRAVIS_TAG" ]]; then + echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin; + docker push codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION"; + fi + +matrix: + include: + - os: linux + env: DOCKERFILE=Dockerfile IMAGE=test ARCH=x86_64 + - os: linux + arch: arm64 + env: DOCKERFILE=Dockerfile.arm32v7 IMAGE=arm ARCH=arm32v7 From 49621d6dc1aae0a411b788f77a83751f80df7ddd Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Wed, 22 Jan 2020 16:56:16 -0800 Subject: [PATCH 02/24] Remove the exclusion of non-existing folders --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 51f4f3f..851a669 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ install: - pip install -r requirements-test.txt before_script: - - flake8 . --max-line-length=127 --exclude utils/,protos/,training/training_code/ + - flake8 . --max-line-length=127 - sleep 30 script: From b2a402213c5490319b14fad8ca5c337accab09e9 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Wed, 22 Jan 2020 16:56:57 -0800 Subject: [PATCH 03/24] Remove non-existent file --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 851a669..64efc9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ before_install: install: - docker build -f "$DOCKERFILE" -t codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" . - docker run -it -d --rm -p 5000:5000 codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" - - pip install -r requirements-test.txt before_script: - flake8 . --max-line-length=127 From 3996c86ec49245279256bd08f0f65c531b0f0ec2 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Wed, 22 Jan 2020 16:58:22 -0800 Subject: [PATCH 04/24] Add back pip install -r requirements-test.txt --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 64efc9c..751293e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ install: before_script: - flake8 . --max-line-length=127 - sleep 30 + - pip install -r requirements-test.txt script: - pytest tests/test.py From 58551673ad52fadb8e87dd6a5991940c6b1d28e8 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Wed, 22 Jan 2020 16:59:33 -0800 Subject: [PATCH 05/24] Create requirements-test.txt --- requirements-test.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 requirements-test.txt diff --git a/requirements-test.txt b/requirements-test.txt new file mode 100644 index 0000000..6172c9c --- /dev/null +++ b/requirements-test.txt @@ -0,0 +1,3 @@ +pytest +requests +flake8 From 7a2e7f8cd30e2a917e088e44bbf12a5500d614b0 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Wed, 22 Jan 2020 17:00:56 -0800 Subject: [PATCH 06/24] Move pip install up --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 751293e..851a669 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,11 +23,11 @@ before_install: install: - docker build -f "$DOCKERFILE" -t codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" . - docker run -it -d --rm -p 5000:5000 codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" + - pip install -r requirements-test.txt before_script: - flake8 . --max-line-length=127 - sleep 30 - - pip install -r requirements-test.txt script: - pytest tests/test.py From 512892bd1d827a80976317703365acdd19a46f19 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 23 Jan 2020 10:57:30 -0800 Subject: [PATCH 07/24] Downgrade tensorflow to 1.14.0 for ARM compatibility --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 00314c4..1c17b3f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ numpy==1.17.4 -tensorflow==1.15.0 +tensorflow==1.14.0 scipy==1.2.2 resampy==0.2.1 pandas==0.24.2 From 30730dc6ab6f9306ebf2fc757af5712a4bd091a3 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 23 Jan 2020 12:15:25 -0800 Subject: [PATCH 08/24] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1c17b3f..b0c5d6c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ numpy==1.17.4 -tensorflow==1.14.0 +tensorflow==1.13.1 scipy==1.2.2 resampy==0.2.1 pandas==0.24.2 From 77bf5ad82f16b825d0758ce80d494936b1a52ea2 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 23 Jan 2020 13:21:35 -0800 Subject: [PATCH 09/24] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b0c5d6c..1c17b3f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ numpy==1.17.4 -tensorflow==1.13.1 +tensorflow==1.14.0 scipy==1.2.2 resampy==0.2.1 pandas==0.24.2 From 6c82045ffd13e5609d20b67dcb35a05547098e67 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 23 Jan 2020 13:23:33 -0800 Subject: [PATCH 10/24] Install tensorflow from a given URL on Pi --- Dockerfile.arm32v7 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index d4171bd..1829a22 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -26,6 +26,8 @@ RUN apt-get update && apt-get -y install llvm-dev libatlas3-base libhdf5-dev && RUN wget -nv --show-progress --progress=bar:force:noscroll ${model_bucket}/${model_file} --output-document=assets/${model_file} && \ tar -x -C assets/ -f assets/${model_file} -v && rm assets/${model_file} +# We install TensorFlow directly from the URL here because of a bug in pip: https://github.com/pypa/packaging/pull/234 +RUN python -m pip install https://www.piwheels.org/simple/tensorflow/tensorflow-1.14.0-cp37-none-linux_armv7l.whl COPY requirements.txt /workspace RUN pip install -r requirements.txt From f0038d4a07c55d17714fbdcce53219cdfa06204d Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 23 Jan 2020 15:51:34 -0800 Subject: [PATCH 11/24] Update Dockerfile.arm32v7 --- Dockerfile.arm32v7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 1829a22..6fd310f 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -1,5 +1,5 @@ # -# Copyright 2018-2019 IBM Corp. All Rights Reserved. +# Copyright 2018-2020 IBM Corp. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -FROM codait/max-base:arm-arm32v7-v1.3.0 +FROM codait/max-base:arm-arm32v7-v1.3.1 ARG model_bucket=https://max.cdn.appdomain.cloud/max-audio-classifier/1.0.0 ARG model_file=assets.tar.gz From 042ce09c681139d583fcfcc585d57174d72a3d08 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 23 Jan 2020 16:04:12 -0800 Subject: [PATCH 12/24] our own fork of pip --- Dockerfile.arm32v7 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 6fd310f..4a3756b 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -26,7 +26,8 @@ RUN apt-get update && apt-get -y install llvm-dev libatlas3-base libhdf5-dev && RUN wget -nv --show-progress --progress=bar:force:noscroll ${model_bucket}/${model_file} --output-document=assets/${model_file} && \ tar -x -C assets/ -f assets/${model_file} -v && rm assets/${model_file} -# We install TensorFlow directly from the URL here because of a bug in pip: https://github.com/pypa/packaging/pull/234 +# We use our own branch of pip and install TensorFlow directly from the URL here because of a bug in pip: https://github.com/pypa/packaging/pull/234 +RUN git clone --branch arm64 https://github.com/xuhdev/pip.git && cd pip && python setup.py install RUN python -m pip install https://www.piwheels.org/simple/tensorflow/tensorflow-1.14.0-cp37-none-linux_armv7l.whl COPY requirements.txt /workspace RUN pip install -r requirements.txt From e5de2149c825f7e06030ddb11c4fa42725f815bb Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 23 Jan 2020 16:12:44 -0800 Subject: [PATCH 13/24] tensorflow 1.13.1 --- Dockerfile.arm32v7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 4a3756b..dc54232 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -28,7 +28,7 @@ RUN wget -nv --show-progress --progress=bar:force:noscroll ${model_bucket}/${mod # We use our own branch of pip and install TensorFlow directly from the URL here because of a bug in pip: https://github.com/pypa/packaging/pull/234 RUN git clone --branch arm64 https://github.com/xuhdev/pip.git && cd pip && python setup.py install -RUN python -m pip install https://www.piwheels.org/simple/tensorflow/tensorflow-1.14.0-cp37-none-linux_armv7l.whl +RUN python -m pip install https://www.piwheels.org/simple/tensorflow/tensorflow-1.13.1-cp37-none-linux_armv7l.whl COPY requirements.txt /workspace RUN pip install -r requirements.txt From cf621458de3e38805598ebf95111066f20c434b4 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 23 Jan 2020 16:22:44 -0800 Subject: [PATCH 14/24] Remove existing pip --- Dockerfile.arm32v7 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index dc54232..6621e5b 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -27,8 +27,10 @@ RUN wget -nv --show-progress --progress=bar:force:noscroll ${model_bucket}/${mod tar -x -C assets/ -f assets/${model_file} -v && rm assets/${model_file} # We use our own branch of pip and install TensorFlow directly from the URL here because of a bug in pip: https://github.com/pypa/packaging/pull/234 +RUN rm -rf /usr/local/lib/python3.7/site-packages/pip RUN git clone --branch arm64 https://github.com/xuhdev/pip.git && cd pip && python setup.py install -RUN python -m pip install https://www.piwheels.org/simple/tensorflow/tensorflow-1.13.1-cp37-none-linux_armv7l.whl +RUN python -m pip install https://www.piwheels.org/simple/tensorflow/tensorflow-1.14.0-cp37-none-linux_armv7l.whl + COPY requirements.txt /workspace RUN pip install -r requirements.txt From 7b374835bf0a50027e2bfefc2362fd332f7ab60e Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 23 Jan 2020 16:53:34 -0800 Subject: [PATCH 15/24] 60 seconds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 851a669..0b7656f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: before_script: - flake8 . --max-line-length=127 - - sleep 30 + - sleep 60 script: - pytest tests/test.py From ebf7e9e7f3b0d1556a917da41b8ad80f46403ea2 Mon Sep 17 00:00:00 2001 From: Brendan Dwyer Date: Thu, 11 Jun 2020 09:23:54 -0700 Subject: [PATCH 16/24] add ARM documentation to README --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index fce9649..d7ca32b 100644 --- a/README.md +++ b/README.md @@ -62,10 +62,16 @@ arXiv:1609.09430, 2016. To run the docker image, which automatically starts the model serving API, run: +Intel CPUs: ```bash $ docker run -it -p 5000:5000 codait/max-audio-classifier ``` +ARM CPUs (eg Raspberry Pi): +```bash +$ docker run -it -p 5000:5000 codait/max-audio-classifier:arm-arm32v7-latest +``` + This will pull a pre-built image from Docker Hub (or use an existing image if already cached locally) and run it. If you'd rather checkout and build the model locally you can follow the [run locally](#run-locally) steps below. @@ -115,6 +121,12 @@ To build the Docker image locally, run: $ docker build -t max-audio-classifier . ``` +For ARM CPUs (eg Raspberry Pi), run: + +```bash +$ docker build -f Dockerfile.arm32v7 -t max-audio-classifier . +``` + All required model assets will be downloaded during the build process. _Note_ that currently this Docker image is CPU only (we will add support for GPU images later). From 9d9cd4f70a80f82d38dc9d443cb7bbae074bc673 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 11 Jun 2020 12:24:32 -0700 Subject: [PATCH 17/24] Use TF 1.14.0 for arm32v7 --- Dockerfile.arm32v7 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 1a65286..8ab519f 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -27,13 +27,11 @@ RUN apt-get update && apt-get -y install llvm-dev libatlas3-base libhdf5-dev && RUN wget -nv --show-progress --progress=bar:force:noscroll ${model_bucket}/${model_file} --output-document=assets/${model_file} && \ tar -x -C assets/ -f assets/${model_file} -v && rm assets/${model_file} -# We use our own branch of pip and install TensorFlow directly from the URL here because of a bug in pip: https://github.com/pypa/packaging/pull/234 -RUN rm -rf /usr/local/lib/python3.7/site-packages/pip -RUN git clone --branch arm64 https://github.com/xuhdev/pip.git && cd pip && python setup.py install RUN python -m pip install https://www.piwheels.org/simple/tensorflow/tensorflow-1.14.0-cp37-none-linux_armv7l.whl COPY requirements.txt /workspace -RUN pip install -r requirements.txt +# Skip tensorflow in requirements.txt +RUN grep -v 'tensorflow' requirements.txt | python -m pip install -r /dev/stdin COPY . /workspace From e73f12f70b99ca6745c60a8877eff1fb83386442 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 11 Jun 2020 14:14:07 -0700 Subject: [PATCH 18/24] Pin numba version to be 0.49.1 --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index 1b65574..4ce9413 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,5 @@ resampy==0.2.1 pandas==0.24.2 keras==2.2.4 h5py==2.9.0 +# pin numba (dependency of resampy) version to be 0.49.1, because numba 0.50.1 depends on a higher version of llvmlite that travis doesn't have: https://github.com/numba/numba/commit/c2ae57a4a3ed1687f843b724a1a160188c1db2ef +numba==0.49.1 From cdd710a0761a64d346422bd64b92a440fd5bed25 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 11 Jun 2020 14:40:01 -0700 Subject: [PATCH 19/24] Temporarily disable `-d` and see what's going on on Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f347fb5..f4e0c5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: install: - docker build -f "$DOCKERFILE" -t codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" . - - docker run -it -d --rm -p 5000:5000 codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" + - docker run -it --rm -p 5000:5000 codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" - pip install -r requirements-test.txt before_script: From 9cef4ddd200b917cd8d2c19b5f797276fb1899ff Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 11 Jun 2020 15:03:59 -0700 Subject: [PATCH 20/24] Remove "-it" as well --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f4e0c5f..6e2ae84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: install: - docker build -f "$DOCKERFILE" -t codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" . - - docker run -it --rm -p 5000:5000 codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" + - docker run --rm -p 5000:5000 codait/max-audio-classifier:"$IMAGE"-"$ARCH"-"$VERSION" - pip install -r requirements-test.txt before_script: From 561cdf52ab95036edf920890549e423ab325729c Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 11 Jun 2020 16:13:02 -0700 Subject: [PATCH 21/24] Figure out where libhdfs is --- Dockerfile.arm32v7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 8ab519f..e39e0b9 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -37,7 +37,7 @@ COPY . /workspace # check file integrity RUN sha512sum -c sha512sums.txt - +RUN updatedb && locate libhdfs.so EXPOSE 5000 CMD python app.py From fb121c69b726b0ddbc9a0b20bcc5de65e63053e2 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 11 Jun 2020 16:37:52 -0700 Subject: [PATCH 22/24] Install mlocate --- Dockerfile.arm32v7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index e39e0b9..e872042 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -22,7 +22,7 @@ ARG model_file=assets.tar.gz WORKDIR /workspace -RUN apt-get update && apt-get -y install llvm-dev libatlas3-base libhdf5-dev && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get -y install llvm-dev libatlas3-base libhdf5-dev mlocate && rm -rf /var/lib/apt/lists/* RUN wget -nv --show-progress --progress=bar:force:noscroll ${model_bucket}/${model_file} --output-document=assets/${model_file} && \ tar -x -C assets/ -f assets/${model_file} -v && rm assets/${model_file} From c4d8c26d03178378dd19b3e54d935d9c858647e3 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 11 Jun 2020 17:34:04 -0700 Subject: [PATCH 23/24] Try 1.13.1 --- Dockerfile.arm32v7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index e872042..0ac2c99 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -27,7 +27,7 @@ RUN apt-get update && apt-get -y install llvm-dev libatlas3-base libhdf5-dev mlo RUN wget -nv --show-progress --progress=bar:force:noscroll ${model_bucket}/${model_file} --output-document=assets/${model_file} && \ tar -x -C assets/ -f assets/${model_file} -v && rm assets/${model_file} -RUN python -m pip install https://www.piwheels.org/simple/tensorflow/tensorflow-1.14.0-cp37-none-linux_armv7l.whl +RUN python -m pip install https://www.piwheels.org/simple/tensorflow/tensorflow-1.13.1-cp37-none-linux_armv7l.whl COPY requirements.txt /workspace # Skip tensorflow in requirements.txt From bded5a181dc75f7e123c46af55594f12fb283ce5 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Thu, 11 Jun 2020 17:37:16 -0700 Subject: [PATCH 24/24] Revert "mlocate" --- Dockerfile.arm32v7 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 0ac2c99..7756488 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -22,7 +22,7 @@ ARG model_file=assets.tar.gz WORKDIR /workspace -RUN apt-get update && apt-get -y install llvm-dev libatlas3-base libhdf5-dev mlocate && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get -y install llvm-dev libatlas3-base libhdf5-dev && rm -rf /var/lib/apt/lists/* RUN wget -nv --show-progress --progress=bar:force:noscroll ${model_bucket}/${model_file} --output-document=assets/${model_file} && \ tar -x -C assets/ -f assets/${model_file} -v && rm assets/${model_file} @@ -37,7 +37,6 @@ COPY . /workspace # check file integrity RUN sha512sum -c sha512sums.txt -RUN updatedb && locate libhdfs.so EXPOSE 5000 CMD python app.py