Skip to content

Commit 8616ed7

Browse files
q10facebook-github-bot
authored andcommitted
Remove Local Version Identifier (#1631)
Summary: - Remove local version identifier from build versioning - Use CPU-only instances for CPU-only tests Pull Request resolved: #1631 Reviewed By: shintaro-iwasaki Differential Revision: D43915104 Pulled By: q10 fbshipit-source-id: 223845c1c38d911f650d5db926aa7f2f59561b85
1 parent 9e343d1 commit 8616ed7

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.github/scripts/setup_env.bash

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,10 @@ __build_fbgemm_gpu_common_pre_steps () {
963963
echo "[BUILD] Running pre-build cleanups ..."
964964
print_exec rm -rf dist
965965
print_exec conda run -n "${env_name}" python setup.py clean
966+
967+
echo "[BUILD] Printing git status ..."
968+
print_exec git status
969+
print_exec git diff
966970
}
967971

968972
check_fbgemm_gpu_build () {

.github/workflows/fbgemm_nightly_build_cpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
strategy:
103103
fail-fast: false
104104
matrix:
105-
os: [ linux.g5.4xlarge.nvidia.gpu ]
105+
os: [ linux.4xlarge ]
106106
python-version: [ "3.8", "3.9", "3.10" ]
107107
needs: build_artifact
108108

.github/workflows/fbgemm_release_build_cpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
strategy:
9595
fail-fast: false
9696
matrix:
97-
os: [ linux.g5.4xlarge.nvidia.gpu ]
97+
os: [ linux.4xlarge ]
9898
python-version: [ "3.8", "3.9", "3.10" ]
9999
needs: build_artifact
100100

fbgemm_gpu/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ def generate_package_version(package_name: str):
3838
print(
3939
f"[SETUP.PY] TAG: {gitversion.get_tag()}, BRANCH: {gitversion.get_branch()}, SHA: {gitversion.get_sha()}"
4040
)
41-
version = gitversion.version_from_git()
41+
# Remove the local version identifier, if any (0.4.0rc0.post0+git.6a63116c.dirty => 0.4.0rc0.post0)
42+
version = gitversion.version_from_git().split("+")[0]
4243

4344
print(f"[SETUP.PY] Setting the package version: {version}")
4445
return version

0 commit comments

Comments
 (0)