diff --git a/docker/mace-micro-dev/mace-micro-dev.dockerfile b/docker/mace-micro-dev/mace-micro-dev.dockerfile index abc1f132fbce20ccf42f2ee9e8eaf5ec38dfb4e3..fda33d87ea3cc75c9c96e3d9d1c01b3a75ced33b 100644 --- a/docker/mace-micro-dev/mace-micro-dev.dockerfile +++ b/docker/mace-micro-dev/mace-micro-dev.dockerfile @@ -1,13 +1,19 @@ FROM ubuntu:18.04 -RUN apt-get update +RUN apt-get update --fix-missing RUN apt-get install -y wget -RUN apt-get install -y g++ gcc + +RUN wget https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-Linux-x86_64.sh && chmod +x cmake-3.18.4-Linux-x86_64.sh && ./cmake-3.18.4-Linux-x86_64.sh --skip-license --prefix=/usr + +RUN apt-get install -y g++-5 gcc-5 RUN apt-get install -y gcc-arm-none-eabi -RUN apt-get install -y python3 python3-pip git mercurial +RUN apt-get install -y git mercurial +RUN apt-get install -y python python-pip +RUN apt-get install -y python3 python3-pip -RUN wget https://cdn.cnbj1.fds.api.mi-img.com/mace/third-party/cmake-3.18.3-Linux-x86_64.sh -RUN chmod +x cmake-3.18.3-Linux-x86_64.sh && ./cmake-3.18.3-Linux-x86_64.sh --skip-license --prefix=/usr +RUN python -m pip install -U pip +RUN python -m pip install jinja2 pyyaml sh numpy six filelock +RUN python -m pip install tensorflow==1.8.0 RUN python3 -m pip install -U pip RUN python3 -m pip install jinja2 pyyaml sh numpy six filelock diff --git a/micro/.gitlab-ci.yml b/micro/.gitlab-ci.yml index 2bd826c14c82e92cab84509bf59fa6b2da92f8b2..5da27f9d1b9a368a4e96257fc728b796024fa7da 100644 --- a/micro/.gitlab-ci.yml +++ b/micro/.gitlab-ci.yml @@ -1,3 +1,8 @@ +default: + tags: + - mace-micro + image: mace-micro-dev + before_script: - git submodule deinit -f . - git submodule sync @@ -23,6 +28,5 @@ cross-build: - bash micro/tools/ci/cross_build.sh - bash micro/tools/ci/host_build_and_run_examples.sh - bash micro/tools/ci/host_build_and_run_tests.sh - # The mbed-cli protobuf version conflicts with others - # - bash micro/tools/ci/build_mbed_example.sh + - bash micro/tools/ci/build_mbed_example.sh diff --git a/micro/examples/classifier/.mbed b/micro/examples/classifier/.mbed index 9c0edc955256fc417c5f1d340253bbb08ec16e2e..4b3e34a6a81261995f995023dcf5bc046108ccc3 100644 --- a/micro/examples/classifier/.mbed +++ b/micro/examples/classifier/.mbed @@ -1,2 +1,3 @@ TARGET=NUCLEO_F767ZI ROOT=. +TOOLCHAIN=GCC_ARM diff --git a/micro/tools/ci/model_convert.sh b/micro/tools/ci/model_convert.sh index c18acf4e7306007701e6421bf8b177a30b6ba7ba..b3a3f6fcfa8225346cf9772edcc57867a669c769 100755 --- a/micro/tools/ci/model_convert.sh +++ b/micro/tools/ci/model_convert.sh @@ -3,7 +3,7 @@ rm -rf mace-models rm -rf build/micro -GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git clone git@git.n.xiaomi.com:applied-machine-learning/sysml/mace-models.git +GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git clone git@git.n.xiaomi.com:applied-machine-learning/sysml/mace-models.git || exit -1 git submodule update --init . || exit -1