diff options
| author | James Conroy <james.conroy@arm.com> | 2021-11-24 15:17:49 +0000 |
|---|---|---|
| committer | James Conroy <james.conroy@arm.com> | 2021-11-30 14:24:20 +0000 |
| commit | 3c6e9edb0db369c73d53bce499cbbadbd40f14d2 (patch) | |
| tree | 3c39e777421423d2919d30b7e32201a29a57df0b /docker | |
| parent | 407cddf1554c94f967116deba88d4ad6ac70ad56 (diff) | |
| download | armnn-3c6e9edb0db369c73d53bce499cbbadbd40f14d2.tar.gz | |
MLCE-689 Fix build issues in x86 Dockerfile
* This Dockerfile was donated by an open source
contributor to ArmNN.
* Fixed issues whilst building Arm Compute Library (ACL)
and removed Boost which is no longer used by ArmNN.
Signed-off-by: James Conroy <james.conroy@arm.com>
Change-Id: Ie3588dec510d7310a36699e135d67580dde30676
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/x86_64/Dockerfile | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/docker/x86_64/Dockerfile b/docker/x86_64/Dockerfile index 314017b8e1..ce24a9674b 100644 --- a/docker/x86_64/Dockerfile +++ b/docker/x86_64/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 ENV TERM linux ENV DEBIAN_FRONTEND noninteractive @@ -103,18 +103,9 @@ 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 - -# 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 && \ - tar xfz boost_1_64_0.tar.gz && \ - rm boost_1_64_0.tar.gz && \ - cd boost_1_64_0 && \ - echo "using gcc : arm : aarch64-linux-gnu-g++ ;" > user_config.jam && \ - ./bootstrap.sh --prefix=$HOME/armnn-devenv/boost_arm64_install && \ - ./b2 install toolset=gcc-arm link=static cxxflags=-fPIC --with-filesystem --with-test --with-log --with-program_options -j$(nproc) --user-config=user_config.jam - # Download ArmNN -RUN cd $HOME/armnn-devenv && git clone https://github.com/ARM-software/armnn.git +RUN cd $HOME/armnn-devenv && git clone "https://review.mlplatform.org/ml/armnn" && \ + cd armnn && git checkout remotes/origin/branches/armnn_21_11 # Build Compute Library RUN cd $HOME/armnn-devenv/ && git clone https://review.mlplatform.org/ml/ComputeLibrary && \ @@ -180,7 +171,6 @@ RUN cd $HOME/armnn-devenv && \ -DBUILD_TESTS=1 \ -DARMCOMPUTE_ROOT=$HOME/armnn-devenv/ComputeLibrary \ -DARMCOMPUTE_BUILD_DIR=$HOME/armnn-devenv/ComputeLibrary/build/ \ - -DBOOST_ROOT=$HOME/armnn-devenv/boost_arm64_install/ \ -DARMCOMPUTENEON=1 -DARMCOMPUTECL=1 -DARMNNREF=1 \ -DONNX_GENERATED_SOURCES=$HOME/armnn-devenv/onnx \ -DBUILD_ONNX_PARSER=1 \ |