bulatko commited on
Commit
dcb1ea4
·
1 Parent(s): ff2fe61

Runtime fallback: install local detectron2 if import fails (no build isolation)

Browse files
Files changed (1) hide show
  1. mvp.py +4 -11
mvp.py CHANGED
@@ -51,7 +51,7 @@ REPO_ROOT = os.path.dirname(os.path.abspath(__file__))
51
  sys.path.append(os.path.join(REPO_ROOT, "vggt"))
52
  MK_PATH = os.path.join(REPO_ROOT, "MaskClustering")
53
  DETECTRON2_ROOT = os.path.join(REPO_ROOT, "MaskClustering", "third_party", "detectron2")
54
- sys
55
 
56
  # Ensure local detectron2 is installed at runtime if postBuild didn't run
57
  try:
@@ -674,10 +674,8 @@ def reconstruct(
674
  check=True,
675
  env={
676
  **os.environ,
677
- # Ensure local vendored detectron2 is importable via PYTHONPATH
678
- "PYTHONPATH": DETECTRON2_ROOT
679
- + os.pathsep
680
- + MK_PATH
681
  + (os.pathsep + os.environ["PYTHONPATH"] if os.environ.get("PYTHONPATH") else ""),
682
  },
683
  )
@@ -697,12 +695,7 @@ def reconstruct(
697
  )
698
 
699
  env = dict(os.environ)
700
- env["PYTHONPATH"] = (
701
- DETECTRON2_ROOT
702
- + os.pathsep
703
- + MK_PATH
704
- + (os.pathsep + env["PYTHONPATH"] if env.get("PYTHONPATH") else "")
705
- )
706
  subprocess.run(
707
  [
708
  sys.executable,
 
51
  sys.path.append(os.path.join(REPO_ROOT, "vggt"))
52
  MK_PATH = os.path.join(REPO_ROOT, "MaskClustering")
53
  DETECTRON2_ROOT = os.path.join(REPO_ROOT, "MaskClustering", "third_party", "detectron2")
54
+ os.environ["PYTHONPATH"] = os.environ.get("PYTHONPATH", "") + ":" + os.path.join(REPO_ROOT, "MaskClustering", "third_party")
55
 
56
  # Ensure local detectron2 is installed at runtime if postBuild didn't run
57
  try:
 
674
  check=True,
675
  env={
676
  **os.environ,
677
+ # Use installed detectron2; avoid shadowing it with partial local tree
678
+ "PYTHONPATH": MK_PATH
 
 
679
  + (os.pathsep + os.environ["PYTHONPATH"] if os.environ.get("PYTHONPATH") else ""),
680
  },
681
  )
 
695
  )
696
 
697
  env = dict(os.environ)
698
+ env["PYTHONPATH"] = MK_PATH + (os.pathsep + env["PYTHONPATH"] if env.get("PYTHONPATH") else "")
 
 
 
 
 
699
  subprocess.run(
700
  [
701
  sys.executable,