This is an automated email from the ASF dual-hosted git repository.
zhaojing pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/singa.git
The following commit(s) were added to refs/heads/dev by this push:
new d5df6b24 update conda and docker files for v3.3.0
new e69c96dc Merge pull request #965 from lzjpaul/22-5-25-conda-setup
d5df6b24 is described below
commit d5df6b24b14e8d2aeb0bc28eaa5bac9f0cb8e407
Author: zhaojing <[email protected]>
AuthorDate: Wed May 25 15:41:46 2022 +0800
update conda and docker files for v3.3.0
---
setup.py | 2 +-
tool/conda/singa/conda_build_config.yaml | 6 +++---
tool/conda/singa/meta.yaml | 2 +-
tool/docker/devel/centos6/cuda10/Dockerfile.manylinux2014 | 3 ++-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/setup.py b/setup.py
index 4e9a6445..759fad99 100644
--- a/setup.py
+++ b/setup.py
@@ -83,7 +83,7 @@ can be installed via
from datetime import date
# stable version
-VERSION = '3.2.0'
+VERSION = '3.3.0'
# get the git hash
# git_hash = subprocess.check_output(["git",
"describe"]).strip().split('-')[-1][1:]
# comment the next line to build wheel for stable version
diff --git a/tool/conda/singa/conda_build_config.yaml
b/tool/conda/singa/conda_build_config.yaml
index ddef9d00..1226855f 100644
--- a/tool/conda/singa/conda_build_config.yaml
+++ b/tool/conda/singa/conda_build_config.yaml
@@ -26,12 +26,12 @@ CONDA_BUILD_SYSROOT:
-
"/Applications/Xcode_11.7.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
# [osx]
cudnn: # [linux]
- "7.6.5 cuda10.2_0" # [environ.get("CUDA")=="10.2"]
- - "7.6.5 cuda10.0_0" # [environ.get("CUDA")=="10.0"]
- - "7.6.5 cuda9.0_0" # [environ.get("CUDA")=="9.0"]
+# - "7.6.5 cuda10.0_0" # [environ.get("CUDA")=="10.0"]
+# - "7.6.5 cuda9.0_0" # [environ.get("CUDA")=="9.0"]
dnnl:
- 1.1
python:
- - 3.6
+ - 3.8
# - 3.7
nccl:
- 2.6.4.1 # [environ.get("CUDA")=="10.2"]
diff --git a/tool/conda/singa/meta.yaml b/tool/conda/singa/meta.yaml
index 5cacf3b1..b639ba63 100644
--- a/tool/conda/singa/meta.yaml
+++ b/tool/conda/singa/meta.yaml
@@ -20,7 +20,7 @@
#
https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#templating-with-jinja
# {% set data =
load_setup_py_data(setup_file='../../../python/singa/setup.py',
from_recipe_dir=True) %}
-{% set version = "3.2.0" %}
+{% set version = "3.3.0" %}
package:
name: singa
diff --git a/tool/docker/devel/centos6/cuda10/Dockerfile.manylinux2014
b/tool/docker/devel/centos6/cuda10/Dockerfile.manylinux2014
index 80ca7882..1472c9fc 100644
--- a/tool/docker/devel/centos6/cuda10/Dockerfile.manylinux2014
+++ b/tool/docker/devel/centos6/cuda10/Dockerfile.manylinux2014
@@ -28,6 +28,7 @@ RUN yum install -y \
openssh-server \
pcre-devel \
cmake \
+ rpm-build rpmdevtools \
&& yum clean all \
&& rm -rf /var/cache/yum/*
@@ -137,4 +138,4 @@ RUN wget
http://www.mpich.org/static/downloads/3.3.2/mpich-3.3.2.tar.gz -P $HOME
&& tar xfz mpich-3.3.2.tar.gz \
&& cd mpich-3.3.2 \
&& ./configure --prefix=/usr/local --disable-fortran \
- && make && make install && cd .. && rm -rf mpich-3.3.2
\ No newline at end of file
+ && make && make install && cd .. && rm -rf mpich-3.3.2
