Remove Local Version Identifier (pytorch#1631)

Summary:
- Remove local version identifier from build versioning
- Use CPU-only instances for CPU-only tests

Pull Request resolved: pytorch#1631

Reviewed By: shintaro-iwasaki

Differential Revision: D43915104

Pulled By: q10

fbshipit-source-id: 223845c1c38d911f650d5db926aa7f2f59561b85

.github/scripts/setup_env.bash

@@ -963,6 +963,10 @@ __build_fbgemm_gpu_common_pre_steps () {
   echo "[BUILD] Running pre-build cleanups ..."
   print_exec rm -rf dist
   print_exec conda run -n "${env_name}" python setup.py clean
+
+  echo "[BUILD] Printing git status ..."
+  print_exec git status
+  print_exec git diff
 }
 
 check_fbgemm_gpu_build () {

.github/workflows/fbgemm_nightly_build_cpu.yml

@@ -102,7 +102,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ linux.g5.4xlarge.nvidia.gpu ]
+        os: [ linux.4xlarge ]
         python-version: [ "3.8", "3.9", "3.10" ]
     needs: build_artifact
 

.github/workflows/fbgemm_release_build_cpu.yml

@@ -94,7 +94,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ linux.g5.4xlarge.nvidia.gpu ]
+        os: [ linux.4xlarge ]
         python-version: [ "3.8", "3.9", "3.10" ]
     needs: build_artifact
 

fbgemm_gpu/setup.py

@@ -38,7 +38,8 @@ def generate_package_version(package_name: str):
         print(
             f"[SETUP.PY] TAG: {gitversion.get_tag()}, BRANCH: {gitversion.get_branch()}, SHA: {gitversion.get_sha()}"
         )
-        version = gitversion.version_from_git()
+        # Remove the local version identifier, if any (0.4.0rc0.post0+git.6a63116c.dirty => 0.4.0rc0.post0)
+        version = gitversion.version_from_git().split("+")[0]
 
     print(f"[SETUP.PY] Setting the package version: {version}")
     return version