This is an automated email from the ASF dual-hosted git repository.
kaiping pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-singa.git
The following commit(s) were added to refs/heads/master by this push:
new fc258a2 SINGA-409 Basic `singa-cpu` import throws error
new bc3bd42 Merge pull request #463 from nudles/SINGA-409
fc258a2 is described below
commit fc258a220c8929b918c22b08931368b268ebd3f8
Author: Wang Wei <[email protected]>
AuthorDate: Tue May 28 17:48:02 2019 +0800
SINGA-409 Basic `singa-cpu` import throws error
Update the dependency list.
---
tool/conda/singa/conda_build_config.yaml | 3 +++
tool/conda/singa/meta.yaml | 16 ++++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/tool/conda/singa/conda_build_config.yaml
b/tool/conda/singa/conda_build_config.yaml
index aa516db..3cce8f4 100644
--- a/tool/conda/singa/conda_build_config.yaml
+++ b/tool/conda/singa/conda_build_config.yaml
@@ -26,6 +26,9 @@ cudnn: # [linux]
- "7.3.1 cuda9.0_0" # [environ.get("CUDA")=="9.0"]
mkldnn:
- 0.14
+python:
+ - 3.6
+ - 3.7
build_str:
- "cudnn7.3.1_cuda10.0" # [environ.get("CUDA")=="10.0"]
- "cudnn7.3.1_cuda9.0" # [environ.get("CUDA")=="9.0"]
diff --git a/tool/conda/singa/meta.yaml b/tool/conda/singa/meta.yaml
index 6cca7c4..48561e9 100644
--- a/tool/conda/singa/meta.yaml
+++ b/tool/conda/singa/meta.yaml
@@ -37,26 +37,26 @@ requirements:
- {{ compiler('cxx') }}
- {{ compiler('c') }}
- cmake >=3.12.2
- - make # [unix]
+ - make # [unix]
host:
- swig 3.0.12
- openblas 0.3.3
- - protobuf 3.4.0
- - glog 0.3.5
- - python 3.6*
+ - protobuf 3.6.1
+ - glog 0.3.5
- numpy 1.16.0
- cudnn {{ cudnn }} # ['cudnn' in str(build_str)]
- mkl-dnn {{ mkldnn }}
+ - python {{ python }}
- run:
- - {{ pin_compatible('libopenblas', max_pin='x.x') }}
- - {{ pin_compatible('libprotobuf', max_pin='x.x') }}
+ run:
- {{ 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 str(build_str)]
- - python 3.6*
+ - python {{ python }}
+ - libprotobuf 3.6.1
+ - libopenblas 0.3.3
- pillow
- future
- tqdm
