Skip to content

Commit 605ad59

Browse files
q10facebook-github-bot
authored andcommitted
Fix detection mechanism for FBPKG builds (#4243)
Summary: X-link: facebookresearch/FBGEMM#1325 Fix detection mechanism for FBPKG builds Pull Request resolved: #4243 Test Plan: Imported from GitHub, without a `Test Plan:` line. See successful xlformers build and tests in D75710856 / facebookresearch/FBGEMM#1315 Reviewed By: gchalump, spcyppt Differential Revision: D75845625 Pulled By: q10 fbshipit-source-id: 9a2b60292145481b319ef9acd093c2fbca30da26
1 parent 60163c5 commit 605ad59

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

fbgemm_gpu/experimental/gen_ai/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if(USE_FB_ONLY
5353
glob_files_nohip(fb_only_sources_gpu
5454
fb/src/*/*.cu)
5555

56-
if(NOT FBGEMM_BUILDING_IN_FB_INTERNAL)
56+
if(NOT FBGEMM_FBPKG_BUILD)
5757
# NOTE: Some FB-internal code explicitly require an FB-internal
5858
# environment to build, such as code that depends on NCCLX
5959
list(FILTER fb_only_sources_cpu

fbgemm_gpu/setup.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,10 @@ def from_args(cls, argv: List[str]):
103103
print(f"[SETUP.PY] Other arguments: {other_args}")
104104
return FbgemmGpuBuild(setup_py_args, other_args)
105105

106-
def onFBMachine(self) -> bool:
107-
return os.environ.get("HOSTNAME", "").endswith("facebook.com")
106+
def isFbpkgBuild(self) -> bool:
107+
# UNIFIED_FBPKG_NAME is set in build scripts for internal FBPKG build
108+
# environments
109+
return os.environ.get("UNIFIED_FBPKG_NAME") is not None
108110

109111
def nova_flag(self) -> Optional[int]:
110112
if "BUILD_FROM_NOVA" in os.environ:
@@ -320,11 +322,11 @@ def _get_cxx11_abi():
320322
print("[SETUP.PY] Include FB-internal code into the build ...")
321323
cmake_args.append("-DUSE_FB_ONLY=ON")
322324

323-
if self.onFBMachine():
325+
if self.isFbpkgBuild():
324326
# NOTE: Some FB-internal code explicitly require an FB-internal
325327
# environment to build, such as code that depends on NCCLX
326-
print("[SETUP.PY] Build takes place in an FB-internal machine ...")
327-
cmake_args.append("-DFBGEMM_BUILDING_IN_FB_INTERNAL=ON")
328+
print("[SETUP.PY] Setting FBPKG build flag ...")
329+
cmake_args.append("-DFBGEMM_FBPKG_BUILD=ON")
328330

329331
if self.args.cxxprefix:
330332
logging.debug("[SETUP.PY] Setting CMake flags ...")

0 commit comments

Comments
 (0)