This is an automated email from the ASF dual-hosted git repository. zhaojing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-singa.git
commit f3b66b5faf895d17f708c8e462521f5db4f5faed Author: Wang Wei <[email protected]> AuthorDate: Fri Mar 15 23:42:41 2019 +0800 SINGA-432 Update depdent lib versions in conda-build config fix syntax error --- tool/conda/singa/conda_build_config.yaml | 2 +- tool/conda/singa/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tool/conda/singa/conda_build_config.yaml b/tool/conda/singa/conda_build_config.yaml index 8b25cd6..aa516db 100644 --- a/tool/conda/singa/conda_build_config.yaml +++ b/tool/conda/singa/conda_build_config.yaml @@ -29,4 +29,4 @@ mkldnn: build_str: - "cudnn7.3.1_cuda10.0" # [environ.get("CUDA")=="10.0"] - "cudnn7.3.1_cuda9.0" # [environ.get("CUDA")=="9.0"] - - "cpu" # [environ.get("CUDA")== ""] \ No newline at end of file + - "cpu" # [environ.get("CUDA", "")== ""] \ No newline at end of file diff --git a/tool/conda/singa/meta.yaml b/tool/conda/singa/meta.yaml index eaca5c5..47de1f5 100644 --- a/tool/conda/singa/meta.yaml +++ b/tool/conda/singa/meta.yaml @@ -44,7 +44,7 @@ requirements: - glog 0.3.5 - python 3.6* - numpy 1.16.0 - - cudnn {{ cudnn }} # ['cudnn' in build_str] + - cudnn {{ cudnn }} # ['cudnn' in str(build_str)] - mkl-dnn {{ mkldnn }} run: @@ -53,7 +53,7 @@ requirements: - {{ pin_compatible('glog', max_pin='x.x') }} - {{ pin_compatible('numpy', max_pin='x.x') }} - {{ pin_compatible('mkl-dnn', max_pin='x.x') }} - - cudnn {{ cudnn }} # ['cudnn' in build_str] + - cudnn {{ cudnn }} # ['cudnn' in str(build_str)] - python 3.6* - pillow - future
