Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
37a43221
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
1 年多 前同步成功
通知
696
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
37a43221
编写于
7月 06, 2018
作者:
M
minqiyang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polish the code in setup.py.in
Change the PADDLE_VERSION in develop branch to latest
上级
add2e1b7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
23 deletion
+16
-23
cmake/version.cmake
cmake/version.cmake
+7
-2
python/setup.py.in
python/setup.py.in
+9
-21
未找到文件。
cmake/version.cmake
浏览文件 @
37a43221
# Get the latest git tag.
# Get the latest git tag.
set
(
PADDLE_VERSION $ENV{PADDLE_VERSION}
)
set
(
PADDLE_VERSION $ENV{PADDLE_VERSION}
)
set
(
tmp_version
"HEAD"
)
set
(
tmp_version
"HEAD"
)
set
(
TAG_VERSION_REGEX
"[0-9]+
\\
.[0-9]+
\\
.[0-9]+(
\\
.(a|b|rc)
\\
.[0-9]+)?"
)
set
(
COMMIT_VERSION_REGEX
"[0-9a-f]{5,40}"
)
while
(
"
${
PADDLE_VERSION
}
"
STREQUAL
""
)
while
(
"
${
PADDLE_VERSION
}
"
STREQUAL
""
)
execute_process
(
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
describe --tags --abbrev=0
${
tmp_version
}
COMMAND
${
GIT_EXECUTABLE
}
describe --tags --abbrev=0
--always
${
tmp_version
}
WORKING_DIRECTORY
${
PADDLE_SOURCE_DIR
}
WORKING_DIRECTORY
${
PADDLE_SOURCE_DIR
}
OUTPUT_VARIABLE GIT_TAG_NAME
OUTPUT_VARIABLE GIT_TAG_NAME
RESULT_VARIABLE GIT_RESULT
RESULT_VARIABLE GIT_RESULT
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
)
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
NOT
${
GIT_RESULT
}
)
if
(
NOT
${
GIT_RESULT
}
)
# Check the tag is a correct version
# Check the tag is a correct version
if
(
${
GIT_TAG_NAME
}
MATCHES
"v[0-9]+
\\
.[0-9]+
\\
.[0-9]+(
\\
.(a|b|rc)
\\
.[0-9]+)?"
)
if
(
${
GIT_TAG_NAME
}
MATCHES
"
${
COMMIT_VERSION_REGEX
}
"
)
# if no tag was found, set PADDLE_VERSION to latest
set
(
PADDLE_VERSION
"latest"
)
elseif
(
${
GIT_TAG_NAME
}
MATCHES
"v
${
VERSION_REGEX
}
"
)
string
(
REPLACE
"v"
""
PADDLE_VERSION
${
GIT_TAG_NAME
}
)
string
(
REPLACE
"v"
""
PADDLE_VERSION
${
GIT_TAG_NAME
}
)
else
()
# otherwise, get the previous git tag name.
else
()
# otherwise, get the previous git tag name.
set
(
tmp_version
"
${
GIT_TAG_NAME
}
~1"
)
set
(
tmp_version
"
${
GIT_TAG_NAME
}
~1"
)
...
...
python/setup.py.in
浏览文件 @
37a43221
...
@@ -23,34 +23,22 @@ def _get_version_detail(idx):
...
@@ -23,34 +23,22 @@ def _get_version_detail(idx):
assert idx < 3, "vesion info consists of %(major)d.%(minor)d.%(patch)d, \
assert idx < 3, "vesion info consists of %(major)d.%(minor)d.%(patch)d, \
so detail index must less than 3"
so detail index must less than 3"
version_details = '@PADDLE_VERSION@'.split('.')
if re.match('@TAG_VERSION_REGEX@', '@PADDLE_VERSION@'):
if len(version_details) == 3:
version_details = '@PADDLE_VERSION@'.split('.')
detail = version_details[idx]
if re.match('[0-9]+', detail):
return int(detail)
return None
if len(version_details) == 3:
return version_details[idx]
def get_major():
major = _get_version_detail(0)
if major is not None:
return major
return 'UNKNOWN'
return 'UNKNOWN'
def get_minor():
def get_major():
minor = _get_version_detail(1)
return _get_version_detail(0)
if minor is not None:
return minor
return 'UNKNOWN'
def get_minor():
return _get_version_detail(1)
def get_patch():
def get_patch():
patch = _get_version_detail(2)
return _get_version_detail(2)
if patch is not None:
return patch
return 'UNKNOWN'
def is_taged():
def is_taged():
try:
try:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录