diff --git a/docker/README.md b/docker/README.md deleted file mode 100644 index 7ef46679bf4af1d7e73471bb1f6a9312b869160f..0000000000000000000000000000000000000000 --- a/docker/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Usage - -Wiki url: [http://v9.git.n.xiaomi.com/deep-computing/mace/wikis/Docker%20Environment/Usage](http://v9.git.n.xiaomi.com/deep-computing/mace/wikis/Docker%20Environment/Usage) diff --git a/docker/gitlab-runner/Dockerfile b/docker/gitlab-runner/Dockerfile index 2a102cf0fd01ff53f4f8ab0287f0e8dfa3d89743..b24522ff821092b387eccf6e9829dc84f097d579 100644 --- a/docker/gitlab-runner/Dockerfile +++ b/docker/gitlab-runner/Dockerfile @@ -1,4 +1,4 @@ -FROM miaimace/mace-dev:latest +FROM xiaomimace/mace-dev:latest # Update source RUN apt-get update -y diff --git a/docs/getting_started/how_to_build.rst b/docs/getting_started/how_to_build.rst index 552269a0a5bb219848c5ee68c63d32bc819ca1d3..f541660ef80513bc8fca355fe01b01c8d6fee351 100644 --- a/docs/getting_started/how_to_build.rst +++ b/docs/getting_started/how_to_build.rst @@ -68,38 +68,16 @@ the pre-built image is also available: .. code:: sh - sudo docker pull cr.d.xiaomi.net/mace/mace-dev - sudo docker run -it --rm --privileged -v /dev/bus/usb:/dev/bus/usb --net=host -v /local/path:/container/path cr.d.xiaomi.net/mace/mace-dev /bin/bash + # Build with Dockerfile + cd docker + docker build -t xiaomimace/mace-dev + # Pull image from docker hub + docker pull xiaomimace/mace-dev -Docker Images ----------------- - -* Login in `Xiaomi Docker Registry `__ - -.. code:: sh - - docker login cr.d.xiaomi.net - -* Build with Dockerfile - -.. code:: sh - - docker build -t cr.d.xiaomi.net/mace/mace-dev - - -* Pull image from docker registry - -.. code:: sh - - docker pull cr.d.xiaomi.net/mace/mace-dev - -* Create container - -.. code:: sh - + # Create container # Set 'host' network to use ADB - docker run -it --rm -v /local/path:/container/path --net=host cr.d.xiaomi.net/mace/mace-dev /bin/bash + docker run -it --rm --privileged -v /dev/bus/usb:/dev/bus/usb --net=host -v /local/path:/container/path xiaomimace/mace-dev /bin/bash Usage @@ -130,9 +108,7 @@ Usage TensorFlow provides a `Graph Transform Tool `__ -to improve inference efficiency. You can build it from TensorFlow source, -or download `a pre-compiled x86-64 binary `__. -The MiAI Compute Engine docker image has this tool pre-installed. +to improve inference efficiency. The following commands show the suggested graph transformations and optimizations for CPU, GPU and DSP runtime. diff --git a/docs/getting_started/how_to_build_zh.rst b/docs/getting_started/how_to_build_zh.rst index 11897f4b74909c7dbdc50dc9b0a00694dc6f9261..7bbf05d93f8fa076c74aceb611c851a1e26a0e71 100644 --- a/docs/getting_started/how_to_build_zh.rst +++ b/docs/getting_started/how_to_build_zh.rst @@ -23,8 +23,16 @@ MiAI计算引擎提供了包含开发运行所需环境的docker镜像,镜像 .. code:: sh - sudo docker pull cr.d.xiaomi.net/mace/mace-dev - sudo docker run -it --rm --privileged -v /dev/bus/usb:/dev/bus/usb --net=host -v /local/path:/container/path cr.d.xiaomi.net/mace/mace-dev /bin/bash + # 从Dockerfile编译镜像 + cd docker + docker build -t xiaomimace/mace-dev + + # 从docker hub拉取镜像 + docker pull xiaomimace/mace-dev + + # 创建容器 + # 为了adb连接需要设置'host'参数 + docker run -it --rm --privileged -v /dev/bus/usb:/dev/bus/usb --net=host -v /local/path:/container/path xiaomimace/mace-dev /bin/bash 如果用户希望配置开发机上的环境,可以参考如下环境要求: @@ -70,35 +78,6 @@ MiAI计算引擎提供了包含开发运行所需环境的docker镜像,镜像 - >= 17.09.0-ce - `install doc `__ -Docker Images ----------------- - -* Login in `Xiaomi Docker Registry `__ - -.. code:: sh - - docker login cr.d.xiaomi.net - -* Build with Dockerfile - -.. code:: sh - - docker build -t cr.d.xiaomi.net/mace/mace-dev - - -* Pull image from docker registry - -.. code:: sh - - docker pull cr.d.xiaomi.net/mace/mace-dev - -* Create container - -.. code:: sh - - # Set 'host' network to use ADB - docker run -it --rm -v /local/path:/container/path --net=host cr.d.xiaomi.net/mace/mace-dev /bin/bash - 使用简介 -------- @@ -133,10 +112,7 @@ Docker Images TensorFlow训练得到的模型进行一系列的转换,可以提升设备上的运行速度。TensorFlow提供了官方工具 `TensorFlow Graph Transform Tool `__ -来进行模型优化 -(此工具Docker镜像中已经提供,也可以直接点击 -`transform_graph `__ -下载这个工具,用户亦可从官方源码编译)。以下分别是GPU模型和DSP模型的优化命令: +来进行模型优化。以下分别是GPU模型和DSP模型的优化命令: .. code:: sh