From a40e0a7f2d235586237122e92561eef13169bb8f Mon Sep 17 00:00:00 2001 From: "Gao, Xiang" Date: Mon, 25 Mar 2019 19:54:27 -0700 Subject: [PATCH] Add torch.version.git_version (#18299) Summary: Fixes: https://github.com/pytorch/pytorch/issues/18293 cc: colesbury Pull Request resolved: https://github.com/pytorch/pytorch/pull/18299 Differential Revision: D14611972 Pulled By: soumith fbshipit-source-id: cdb48ef37c8869713a9a43ea0da08e1bed9279a2 --- setup.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index deed8b5..d501c54 100644 --- a/setup.py +++ b/setup.py @@ -231,18 +231,21 @@ cmake_python_include_dir = distutils.sysconfig.get_python_inc() ################################################################################ package_name = os.getenv('TORCH_PACKAGE_NAME', 'torch') version = '1.1.0a0' +sha = 'Unknown' + +try: + sha = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=cwd).decode('ascii').strip() +except Exception: + pass + if os.getenv('PYTORCH_BUILD_VERSION'): assert os.getenv('PYTORCH_BUILD_NUMBER') is not None build_number = int(os.getenv('PYTORCH_BUILD_NUMBER')) version = os.getenv('PYTORCH_BUILD_VERSION') if build_number > 1: version += '.post' + str(build_number) -else: - try: - sha = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=cwd).decode('ascii').strip() - version += '+' + sha[:7] - except Exception: - pass +elif sha != 'Unknown': + version += '+' + sha[:7] report("Building wheel {}-{}".format(package_name, version)) @@ -257,6 +260,7 @@ def build_deps(): # this would claim to be a release build when it's not.) f.write("debug = {}\n".format(repr(DEBUG))) f.write("cuda = {}\n".format(repr(CUDA_VERSION))) + f.write("git_version = {}\n".format(repr(sha))) def check_file(f): if not os.path.exists(f): -- 2.7.4