From d763e0863fa88e7f0f34d61587b92cbfeef67bef Mon Sep 17 00:00:00 2001 From: Nikita Shulga Date: Fri, 28 Oct 2022 13:19:53 -0700 Subject: [PATCH] Small fix `cmake_cache_vars` does not exist everywhere, create global function to take care of it --- setup.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index e6a8198044da576..bcfeaf83c0c8117 100644 --- a/setup.py +++ b/setup.py @@ -762,6 +762,14 @@ def run(self): super().run() +def get_cmake_cache_vars(): + try: + return defaultdict(lambda: False, cmake.get_cmake_cache_variables()) + except FileNotFoundError: + # CMakeCache.txt does not exist. Probably running "python setup.py clean" over a clean directory. + return defaultdict(lambda: False) + + def configure_extension_build(): r"""Configures extension build options according to system environment and user's choice. @@ -769,11 +777,7 @@ def configure_extension_build(): The input to parameters ext_modules, cmdclass, packages, and entry_points as required in setuptools.setup. """ - try: - cmake_cache_vars = defaultdict(lambda: False, cmake.get_cmake_cache_variables()) - except FileNotFoundError: - # CMakeCache.txt does not exist. Probably running "python setup.py clean" over a clean directory. - cmake_cache_vars = defaultdict(lambda: False) + cmake_cache_vars = get_cmake_cache_vars() ################################################################################ # Configure compile flags @@ -1162,7 +1166,7 @@ def main(): 'utils/model_dump/*.mjs', ] - if cmake_cache_vars['BUILD_CAFFE2']: + if get_cmake_cache_vars()['BUILD_CAFFE2']: torch_package_data.extend([ 'include/caffe2/**/*.h', 'include/caffe2/utils/*.h',