From 05721ba8d9df97db4abedfa1a3ff3c5e114d3a53 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 23 Jan 2024 18:24:24 -0500 Subject: [PATCH 1/3] detect version in advance before building deepmd-kit-cu11 Fx #3168. Signed-off-by: Jinzhe Zeng --- .github/workflows/build_wheel.yml | 11 +++++++++++ pyproject.toml | 1 + 2 files changed, 12 insertions(+) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 23076e9bf5..e35a3c621a 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -68,6 +68,17 @@ jobs: - uses: docker/setup-qemu-action@v3 name: Setup QEMU if: matrix.platform_id == 'manylinux_aarch64' && matrix.os == 'ubuntu-latest' + # detect version in advance. See #3168 + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: ${{ matrix.python }} + cache: 'pip' + if: matrix.dp_pkg_name == 'deepmd-kit-cu11' + - run: | + python -m pip install setuptools_scm + python -c "from setuptools_scm import get_version;print('SETUPTOOLS_SCM_PRETEND_VERSION_FOR_deepmd-kit-cu11='+get_version())" >> $GITHUB_ENV + if: matrix.dp_pkg_name == 'deepmd-kit-cu11' - name: Build wheels uses: pypa/cibuildwheel@v2.16 env: diff --git a/pyproject.toml b/pyproject.toml index e91fd320f3..643b7d9521 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -155,6 +155,7 @@ environment-pass = [ "DP_VARIANT", "CUDA_VERSION", "DP_PKG_NAME", + "SETUPTOOLS_SCM_PRETEND_VERSION_FOR_deepmd-kit-cu11", ] environment = { PIP_PREFER_BINARY="1", DP_LAMMPS_VERSION="stable_2Aug2023_update2", DP_ENABLE_IPI="1", MPI_HOME="/usr/lib64/mpich", PATH="/usr/lib64/mpich/bin:$PATH" } before-all = [ From d39e7db0c45d322a1acc295a3508de6ddadd87cb Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 23 Jan 2024 18:32:43 -0500 Subject: [PATCH 2/3] fix Python version Signed-off-by: Jinzhe Zeng --- .github/workflows/build_wheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index e35a3c621a..81b346dda8 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -72,7 +72,7 @@ jobs: - uses: actions/setup-python@v5 name: Install Python with: - python-version: ${{ matrix.python }} + python-version: '3.11' cache: 'pip' if: matrix.dp_pkg_name == 'deepmd-kit-cu11' - run: | From 66c865fdb0a8bcd48d24df0654721daf070e1d75 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 23 Jan 2024 19:10:16 -0500 Subject: [PATCH 3/3] env name should be uppercase --- .github/workflows/build_wheel.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 81b346dda8..fa109cac5e 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -77,7 +77,7 @@ jobs: if: matrix.dp_pkg_name == 'deepmd-kit-cu11' - run: | python -m pip install setuptools_scm - python -c "from setuptools_scm import get_version;print('SETUPTOOLS_SCM_PRETEND_VERSION_FOR_deepmd-kit-cu11='+get_version())" >> $GITHUB_ENV + python -c "from setuptools_scm import get_version;print('SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DEEPMD-KIT-CU11='+get_version())" >> $GITHUB_ENV if: matrix.dp_pkg_name == 'deepmd-kit-cu11' - name: Build wheels uses: pypa/cibuildwheel@v2.16 diff --git a/pyproject.toml b/pyproject.toml index 643b7d9521..550fbc4b54 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -155,7 +155,7 @@ environment-pass = [ "DP_VARIANT", "CUDA_VERSION", "DP_PKG_NAME", - "SETUPTOOLS_SCM_PRETEND_VERSION_FOR_deepmd-kit-cu11", + "SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DEEPMD-KIT-CU11", ] environment = { PIP_PREFER_BINARY="1", DP_LAMMPS_VERSION="stable_2Aug2023_update2", DP_ENABLE_IPI="1", MPI_HOME="/usr/lib64/mpich", PATH="/usr/lib64/mpich/bin:$PATH" } before-all = [