Merge branch 'update_dockerfile' into 'master'

update dockerfile to support onnx, and fix typo

See merge request !892

docker/mace-dev-lite/Dockerfile

@@ -22,6 +22,7 @@ RUN apt-get install -y --no-install-recommends \
     python-dev \
     python-pip \
     protobuf-compiler \
+    libprotoc-dev \
     rsync \
     software-properties-common \
     unzip \
@@ -95,7 +96,6 @@ RUN apt-get install -y --no-install-recommends \
     android-tools-adb
 RUN pip install -i http://pypi.douban.com/simple/ --trusted-host pypi.douban.com setuptools
 RUN pip install -i http://pypi.douban.com/simple/ --trusted-host pypi.douban.com \
-    tensorflow==1.8.0 \
     "numpy>=1.14.0" \
     scipy \
     jinja2 \
@@ -104,6 +104,19 @@ RUN pip install -i http://pypi.douban.com/simple/ --trusted-host pypi.douban.com
     pycodestyle==2.4.0 \
     filelock
 
+# Install Tensorflow
+RUN pip install -i http://pypi.douban.com/simple/ --trusted-host pypi.douban.com \
+    tensorflow==1.8.0
+
+# Install pytorch (refer to: https://pytorch.org/get-started/locally/)
+RUN pip install future==0.17.1 torchvision_nightly
+RUN pip install torch_nightly -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
+
+# Install ONNX
+RUN pip install -i http://pypi.douban.com/simple/ --trusted-host pypi.douban.com \
+    onnx==1.3.0 \
+    onnx-tf==1.2.0
+
 # fix docker in docker error: `error while loading shared libraries: libltdl.so.7`
 # refer to: https://github.com/jenkinsci/docker/issues/506
 RUN apt-get install -y libltdl7

mace/core/runtime/opencl/opencl_runtime.cc

@@ -425,7 +425,7 @@ OpenCLRuntime::OpenCLRuntime(
   }
 
   device_->getInfo(CL_DEVICE_GLOBAL_MEM_CACHE_SIZE,
-                   &device_gloabl_mem_cache_size_);
+                   &device_global_mem_cache_size_);
 
   device_->getInfo(CL_DEVICE_MAX_COMPUTE_UNITS,
                    &device_compute_units_);
@@ -464,7 +464,7 @@ cl::CommandQueue &OpenCLRuntime::command_queue() { return *command_queue_; }
 Tuner<uint32_t> *OpenCLRuntime::tuner() { return tuner_.get(); }
 
 uint64_t OpenCLRuntime::device_global_mem_cache_size() const {
-  return device_gloabl_mem_cache_size_;
+  return device_global_mem_cache_size_;
 }
 
 uint32_t OpenCLRuntime::device_compute_units() const {

mace/core/runtime/opencl/opencl_runtime.h

@@ -147,7 +147,7 @@ class OpenCLRuntime {
   std::string platform_info_;
   std::string precompiled_binary_platform_info_;
   bool out_of_range_check_;
-  uint64_t device_gloabl_mem_cache_size_;
+  uint64_t device_global_mem_cache_size_;
   uint32_t device_compute_units_;
 };