Refactor version management to use version.txt with date suffix for develop builds (#76314)

Author: swgu98

.github/workflows/_Distribute-stable-Formers.yml

@@ -72,7 +72,7 @@ jobs:
           CACHE_DIR: /root/.cache/build
           CCACHE_DIR: /root/.ccache/formers
           CFS_DIR: /home/data/cfs
-          paddle_whl: /workspace/dist/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
+          paddle_whl: /workspace/dist/*.whl
           formers_docker: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/paddle:cuda126-dev-latest
         run: |
           export CUDA_SO="$(\ls -d /usr/lib64/libcuda* | xargs -I{} echo '-v {}:{}') $(\ls -d /usr/lib64/libnvidia* | xargs -I{} echo '-v {}:{}')"

.github/workflows/_Distribute-stable.yml

@@ -49,7 +49,6 @@ jobs:
           WITH_TESTING: "ON"
           WITH_INFERENCE_API_TEST: "OFF"
           COVERALLS_UPLOAD: "ON"
-          PADDLE_VERSION: 0.0.0
           CUDA_VISIBLE_DEVICES: 0,1
           GIT_PR_ID: ${{ github.event.pull_request.number }}
           GPUBOX_DEMO_INSTALL_DIR: /root/.cache/build
@@ -89,7 +88,6 @@ jobs:
             -e WITH_TESTING \
             -e COVERALLS_UPLOAD \
             -e GIT_PR_ID \
-            -e PADDLE_VERSION \
             -e WITH_DISTRIBUTE \
             -e PY_VERSION \
             -e WITH_TENSORRT \
@@ -190,7 +188,7 @@ jobs:
         env:
           home_path: ${{ github.workspace }}/..
           bos_file: ${{ github.workspace }}/../bos_retry/BosClient.py
-          paddle_whl: paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl
+          paddle_whl: "*.whl"
         run: |
           docker exec -t ${{ env.container_name }} /bin/bash -c '
           set -x

.github/workflows/_Windows-GPU.yml

@@ -35,6 +35,7 @@ jobs:
     runs-on:
       group: win-gpu
     env:
+      PADDLE_VERSION: 0.0.0
       NIGHTLY_MODE: "OFF"
       WITH_UNITY_BUILD: "ON"
       WITH_TPCACHE: "ON"

.github/workflows/_Windows-Inference.yml

@@ -35,6 +35,7 @@ jobs:
     runs-on:
       group: win-infer
     env:
+      PADDLE_VERSION: 0.0.0
       NIGHTLY_MODE: "OFF"
       WITH_UNITY_BUILD: "ON"
       WITH_TPCACHE: "ON"

.github/workflows/_Windows-OPENBLAS.yml

@@ -36,6 +36,7 @@ jobs:
     runs-on:
       group: win-openblas
     env:
+      PADDLE_VERSION: 0.0.0
       NIGHTLY_MODE: "OFF"
       WITH_UNITY_BUILD: "ON"
       WITH_CACHE: "OFF"

ci/distribute_test.sh

@@ -148,7 +148,7 @@ pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
 pip install onnx==1.17.0
 pip install -r "${work_dir}/python/requirements.txt"
 pip install -r "${work_dir}/python/unittest_py/requirements.txt"
-pip install  --force-reinstall ${work_dir}/dist/paddlepaddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl --no-deps
+pip install  --force-reinstall ${work_dir}/dist/*.whl --no-deps
 echo "::endgroup::"
 ldconfig
 

cmake/version.cmake

@@ -1,6 +1,10 @@
 # Get the latest git tag.
 set(PADDLE_VERSION $ENV{PADDLE_VERSION})
-if(WITH_NIGHTLY_BUILD)
+
+if(NOT PADDLE_VERSION)
+  file(READ "${CMAKE_SOURCE_DIR}/version.txt" PADDLE_VERSION)
+  string(STRIP "${PADDLE_VERSION}" PADDLE_VERSION)
+  message(STATUS "Paddle version from version.txt: ${PADDLE_VERSION}")
   execute_process(
     COMMAND ${GIT_EXECUTABLE} show -s --format=%ci HEAD
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -12,65 +16,6 @@ if(WITH_NIGHTLY_BUILD)
   message(STATUS "Last commit date: ${DATE_ONLY}")
   set(PADDLE_VERSION "${PADDLE_VERSION}.dev${DATE_ONLY}")
 endif()
-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]+[0-9a-f]+[0-9a-f]+[0-9a-f]+[0-9a-f]+")
-while("${PADDLE_VERSION}" STREQUAL "")
-  # Check current branch name
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref ${tmp_version}
-    WORKING_DIRECTORY ${PADDLE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_BRANCH_NAME
-    RESULT_VARIABLE GIT_BRANCH_RESULT
-    ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(NOT ${GIT_BRANCH_RESULT})
-    execute_process(
-      COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0 --always
-              ${tmp_version}
-      WORKING_DIRECTORY ${PADDLE_SOURCE_DIR}
-      OUTPUT_VARIABLE GIT_TAG_NAME
-      RESULT_VARIABLE GIT_RESULT
-      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(NOT ${GIT_RESULT})
-      # Check if current branch is release branch
-      if(${GIT_BRANCH_NAME} MATCHES "release/${TAG_VERSION_REGEX}")
-        # Check the tag is a correct version
-        if(${GIT_TAG_NAME} MATCHES "${COMMIT_VERSION_REGEX}")
-          # if no tag was found, set PADDLE_VERSION to 0.0.0 to represent latest
-          set(PADDLE_VERSION "0.0.0")
-        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")
-        endif()
-      else()
-        execute_process(
-          COMMAND ${GIT_EXECUTABLE} describe --exact-match --tags ${tmp_version}
-          WORKING_DIRECTORY ${PADDLE_SOURCE_DIR}
-          OUTPUT_VARIABLE GIT_EXACT_TAG_NAME
-          RESULT_VARIABLE GIT_EXACT_TAG_RESULT
-          ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-        if(NOT ${GIT_EXACT_TAG_NAME})
-          # Check if current branch is tag branch
-          if(${GIT_EXACT_TAG_NAME} MATCHES "v${TAG_VERSION_REGEX}")
-            string(REPLACE "v" "" PADDLE_VERSION ${GIT_EXACT_TAG_NAME})
-          else()
-            set(PADDLE_VERSION "0.0.0")
-          endif()
-        else()
-          # otherwise, we always set PADDLE_VERSION to 0.0.0 to represent latest
-          set(PADDLE_VERSION "0.0.0")
-        endif()
-      endif()
-    else()
-      set(PADDLE_VERSION "0.0.0")
-      message(WARNING "Cannot add paddle version from git tag")
-    endif()
-  else()
-    set(PADDLE_VERSION "0.0.0")
-    message(WARNING "Cannot add paddle version for wrong git branch result")
-  endif()
-endwhile()
 
 string(REPLACE "-" "." PADDLE_VER_LIST ${PADDLE_VERSION})
 string(REPLACE "." ";" PADDLE_VER_LIST ${PADDLE_VER_LIST})

python/setup.py.in

@@ -176,12 +176,15 @@ def get_tensorrt_version() -> str:
         print(f"Error while getting TensorRT version: {e}")
         return None
 
+def get_paddle_version() -> str:
+    return '@PADDLE_VERSION@'
+
 def write_version_py(filename='paddle/version/__init__.py'):
     cnt = '''# THIS FILE IS GENERATED FROM PADDLEPADDLE SETUP.PY
 #
 import inspect
 
-full_version     = '%(major)d.%(minor)d.%(patch)s'
+full_version     = '%(paddle_version)s'
 major            = '%(major)d'
 minor            = '%(minor)d'
 patch            = '%(patch)s'
@@ -502,6 +505,7 @@ def cuda_archs():
 
     with open(filename, 'w') as f:
         f.write(cnt % {
+            'paddle_version': get_paddle_version(),
             'major': get_major(),
             'minor': get_minor(),
             'patch': get_patch(),

setup.py

@@ -497,12 +497,16 @@ def find_libnvinfer():
         return None
 
 
+def get_paddle_version() -> int:
+    return env_dict.get("PADDLE_VERSION")
+
+
 def write_version_py(filename='paddle/version/__init__.py'):
     cnt = '''# THIS FILE IS GENERATED FROM PADDLEPADDLE SETUP.PY
 #
 import inspect
 
-full_version     = '%(major)d.%(minor)d.%(patch)s'
+full_version     = '%(paddle_version)s'
 major            = '%(major)d'
 minor            = '%(minor)d'
 patch            = '%(patch)s'
@@ -824,6 +828,7 @@ def cuda_archs():
         f.write(
             cnt
             % {
+                'paddle_version': get_paddle_version(),
                 'major': get_major(),
                 'minor': get_minor(),
                 'patch': get_patch(),

version.txt

@@ -0,0 +1 @@
+3.3.0