diff --git a/docker/mace-dev-lite/Dockerfile b/docker/mace-dev-lite/Dockerfile index 9ebcce58711c0db153779bbb8ebd7ff996b666dc..f0753cd63c6b534b26777bbacb101e8349c240a7 100644 --- a/docker/mace-dev-lite/Dockerfile +++ b/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 diff --git a/mace/core/runtime/opencl/opencl_runtime.cc b/mace/core/runtime/opencl/opencl_runtime.cc index ee4eae5961cc2d2368c8a1aa41ebac40ddc7187f..b552c65ab3f663e9e4db9add45f5e04913f0994c 100644 --- a/mace/core/runtime/opencl/opencl_runtime.cc +++ b/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 *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 { diff --git a/mace/core/runtime/opencl/opencl_runtime.h b/mace/core/runtime/opencl/opencl_runtime.h index ef1d50e1b9e1a47856f57bbdbb456c118c2c9dbf..546b80086949215f82ba7fd831f96c509590a712 100644 --- a/mace/core/runtime/opencl/opencl_runtime.h +++ b/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_; };