diff --git a/cmake/version.cmake b/cmake/version.cmake
index 96f2eff6cbfb0b18cbdbbc982583d5b9c71fc25a..4a86ad2e09fadbb2d69d34417ab056a6eb28d0ca 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -2,7 +2,7 @@
 set(PADDLE_VERSION $ENV{PADDLE_VERSION})
 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}")
+set(COMMIT_VERSION_REGEX "[0-9a-f]+")
 while ("${PADDLE_VERSION}" STREQUAL "")
   execute_process(
     COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0 --always ${tmp_version}
@@ -15,7 +15,7 @@ while ("${PADDLE_VERSION}" STREQUAL "")
     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}")
+    elseif (${GIT_TAG_NAME} MATCHES "v${TAG_VERSION_REGEX}")
       string(REPLACE "v" "" PADDLE_VERSION ${GIT_TAG_NAME})
     else()  # otherwise, get the previous git tag name.
       set(tmp_version "${GIT_TAG_NAME}~1")
diff --git a/python/setup.py.in b/python/setup.py.in
index 8ea828ce65df64dccd86dcfe5904726c719e5c09..6e21512b864768e60acd4d14d419376adbeef9ee 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -29,7 +29,7 @@ def _get_version_detail(idx):
         if len(version_details) == 3:
             return version_details[idx]
 
-    return 'UNKNOWN'
+    return 0
 
 def get_major():
     return _get_version_detail(0)