diff options
| author | Nikhil Raj <nikhil.raj@arm.com> | 2021-04-02 22:04:39 +0100 |
|---|---|---|
| committer | Nikhil Raj <nikhil.raj@arm.com> | 2021-04-16 14:27:27 +0100 |
| commit | 6dd178f2395b34cfb360eabb0130c19ed258f5fa (patch) | |
| tree | 6814e4729bbd1e652d8b9c18c9db28f3bc2f8a8a /docker | |
| parent | ed7fce413410d15c501ea52f9e6bfbbf71b3daf1 (diff) | |
| download | armnn-6dd178f2395b34cfb360eabb0130c19ed258f5fa.tar.gz | |
IVGCVSW-5720 Remove the Caffe Parser from ArmNN
Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: Ib00be204f549efa9aa5971ecf65c2dec4a10b10f
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/x86_64/Dockerfile | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/docker/x86_64/Dockerfile b/docker/x86_64/Dockerfile index c03a1d7407..684b5cf34b 100644 --- a/docker/x86_64/Dockerfile +++ b/docker/x86_64/Dockerfile @@ -105,10 +105,6 @@ RUN apt-get update && apt-get install -y \ libatlas-base-dev -# Download caffe 1.0 -RUN cd $HOME && git clone https://github.com/BVLC/caffe.git && \ - cd caffe && git checkout eeebdab16155d34ff8f5f42137da7df4d1c7eab0 - # Makefile update # To Do: Don't copy the Local Make file to docker # RUN cd $HOME/caffe/ && rm Makefile.config.example @@ -123,15 +119,6 @@ RUN apt-get update && apt-get install -y \ # ENV PATH=$HOME/armnn-devenv/google/x86_64_pb_install/bin/:$PATH # ENV LD_LIBRARY_PATH=$HOME/armnn-devenv/google/x86_64_pb_install/lib/:$LD_LIBRARY_PATH -# Compile CAFFE -RUN cd $HOME/caffe/ && mkdir build && cd build && \ - export PATH=$HOME/armnn-devenv/google/x86_64_pb_install/bin/:$PATH && \ - export LD_LIBRARY_PATH=$HOME/armnn-devenv/google/x86_64_pb_install/lib/:$LD_LIBRARY_PATH && \ - ldconfig && \ - cmake -DCMAKE_CXX_FLAGS=--std=c++11 ../ && \ - make all -j$(nproc) && \ - make test -j$(nproc) && \ - make runtest -j$(nproc) # Build Boost library for arm64 RUN cd $HOME && wget http://downloads.sourceforge.net/project/boost/boost/1.64.0/boost_1_64_0.tar.gz && \ @@ -211,8 +198,6 @@ RUN cd $HOME/armnn-devenv && \ -DARMCOMPUTE_BUILD_DIR=$HOME/armnn-devenv/ComputeLibrary/build/ \ -DBOOST_ROOT=$HOME/armnn-devenv/boost_arm64_install/ \ -DARMCOMPUTENEON=1 -DARMCOMPUTECL=1 -DARMNNREF=1 \ - -DCAFFE_GENERATED_SOURCES=$HOME/caffe/build/include \ - -DBUILD_CAFFE_PARSER=1 \ -DONNX_GENERATED_SOURCES=$HOME/armnn-devenv/onnx \ -DBUILD_ONNX_PARSER=1 \ -DTF_GENERATED_SOURCES=$HOME/armnn-devenv/tensorflow-protobuf \ |