[singa] branch dev updated: conda build fix git get tag

[wangwei]

This is an automated email from the ASF dual-hosted git repository.

wangwei 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 952ee03  conda build fix git get tag
     new d1951ed  Merge pull request #653 from dcslin/conda-build-fix
952ee03 is described below

commit 952ee03aedc528f2f5d91991ea65a967f0798137
Author: Your Name <y...@example.com>
AuthorDate: Sat Apr 4 17:03:11 2020 +0000

    conda build fix git get tag
---
 tool/conda/cpu/meta.yaml   | 9 ++++++---
 tool/conda/gpu/meta.yaml   | 9 ++++++---
 tool/conda/singa/meta.yaml | 2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/tool/conda/cpu/meta.yaml b/tool/conda/cpu/meta.yaml
index 1963701..c9ba5a6 100644
--- a/tool/conda/cpu/meta.yaml
+++ b/tool/conda/cpu/meta.yaml
@@ -19,11 +19,14 @@
 
 package:
   name: singa-cpu
-  version: {{ environ.get('GIT_DESCRIBE_TAG') }}
+  version: {{ environ.get('GIT_DESCRIBE_TAG', '') | replace("-", ".") }}
+
+source:
+  path: ../../../
 
 requirements:
   run:
-    - singa {{ environ.get('GIT_DESCRIBE_TAG') }} cpu_py{{ py }}
+    - singa {{ environ.get('GIT_DESCRIBE_TAG', '') | replace("-", ".") }} 
cpu_py{{ py }}
 
 build:
   number: 0
@@ -32,4 +35,4 @@ build:
 about:
   home: http://singa.apache.org/
   license: Apache V2
-  summary: SINGA is an Apache Incubating project for providing distributed 
deep learning. Apache disclaimers 
http://singa.apache.org/en/index.html#disclaimers
\ No newline at end of file
+  summary: SINGA is an Apache Incubating project for providing distributed 
deep learning. Apache disclaimers 
http://singa.apache.org/en/index.html#disclaimers
diff --git a/tool/conda/gpu/meta.yaml b/tool/conda/gpu/meta.yaml
index f59901c..c247372 100644
--- a/tool/conda/gpu/meta.yaml
+++ b/tool/conda/gpu/meta.yaml
@@ -19,11 +19,14 @@
 
 package:
   name: singa-gpu
-  version: {{ environ.get('GIT_DESCRIBE_TAG') }}
+  version: {{ environ.get('GIT_DESCRIBE_TAG') | replace("-", ".") }}
+
+source:
+  path: ../../../
 
 requirements:
   run:
-    - singa {{ environ.get('GIT_DESCRIBE_TAG') }} cudnn7.3.1_cuda10.0_py{{ py 
}}
+    - singa {{ environ.get('GIT_DESCRIBE_TAG') | replace("-", ".") }} 
cudnn7.3.1_cuda10.0_py{{ py }}
 
 build:
   number: 0
@@ -33,4 +36,4 @@ build:
 about:
   home: http://singa.apache.org/
   license: Apache V2
-  summary: SINGA is an Apache Incubating project for providing distributed 
deep learning. Apache disclaimers 
http://singa.apache.org/en/index.html#disclaimers
\ No newline at end of file
+  summary: SINGA is an Apache Incubating project for providing distributed 
deep learning. Apache disclaimers 
http://singa.apache.org/en/index.html#disclaimers
diff --git a/tool/conda/singa/meta.yaml b/tool/conda/singa/meta.yaml
index 3ed1852..30ebeb6 100644
--- a/tool/conda/singa/meta.yaml
+++ b/tool/conda/singa/meta.yaml
@@ -24,7 +24,7 @@
 
 package:
   name: singa
-  version: {{ environ.get('GIT_DESCRIBE_TAG', version) }}
+  version: {{ environ.get('GIT_DESCRIBE_TAG', version) | replace("-", ".") }}
 
 source:
   path: ../../../