restore

Author: cccclai

install_requirements.py

@@ -77,11 +77,8 @@ def install_requirements(use_pytorch_nightly):
             "-r",
             "requirements-dev.txt",
             *TORCH_PACKAGE,
-            "--pre",
-            "--index-url",
-            torch_url,
             "--extra-index-url",
-            "https://pypi.org/simple",
+            torch_url,
         ],
         check=True,
     )
@@ -143,11 +140,8 @@ def install_optional_example_requirements(use_pytorch_nightly):
             "pip",
             "install",
             *DOMAIN_LIBRARIES,
-            "--pre",
-            "--index-url",
-            torch_url,
             "--extra-index-url",
-            "https://pypi.org/simple",
+            torch_url,
         ],
         check=True,
     )
@@ -161,11 +155,8 @@ def install_optional_example_requirements(use_pytorch_nightly):
             "install",
             "-r",
             "requirements-examples.txt",
-            "--pre",
-            "--index-url",
-            torch_url,
             "--extra-index-url",
-            "https://pypi.org/simple",
+            torch_url,
             "--upgrade-strategy",
             "only-if-needed",
         ],
@@ -175,8 +166,6 @@ def install_optional_example_requirements(use_pytorch_nightly):
 
 def main(args):
     parser = argparse.ArgumentParser()
-    print("NIGHTLY_VERSION: ", NIGHTLY_VERSION)
-    print("TORCH_VERSION: ", TORCH_VERSION)
     parser.add_argument(
         "--use-pt-pinned-commit",
         action="store_true",

setup.py

@@ -464,23 +464,12 @@ def run(self):
             return
 
         try:
-            import sys, traceback
-
-            logging.info(f"Attempting to import Qualcomm backend...")
-            logging.debug(f"sys.path = {sys.path}")
-
             # Following code is for building the Qualcomm backend.
-            logging.info("Trying to import Qualcomm backend SDK helpers")
-            logging.debug(f"sys.path = {sys.path}")
-            logging.debug(f"Current working directory = {os.getcwd()}")
-
             from backends.qualcomm.scripts.download_qnn_sdk import (
                 _download_qnn_sdk,
                 is_linux_x86,
             )
 
-            logging.info("Qualcomm backend imports succeeded")
-
             if is_linux_x86():
                 os.environ["EXECUTORCH_BUILDING_WHEEL"] = "1"
 
@@ -504,11 +493,6 @@ def run(self):
                     # Run build.sh with SDK path exported
                     env = dict(**os.environ)
                     env["QNN_SDK_ROOT"] = str(sdk_path)
-                    logging.info(
-                        f"Running build.sh: {build_sh} with QNN_SDK_ROOT={sdk_path}"
-                    )
-                    logging.info(f"Environment keys: {list(env.keys())}")
-
                     subprocess.check_call([str(build_sh), "--skip_aarch64"], env=env)
 
                     # Copy the main .so into the wheel package
@@ -546,13 +530,9 @@ def run(self):
                         self.copy_file(str(so_src), str(so_dst))
                         logging.info(f"Copied Qualcomm backend: {so_src} -> {so_dst}")
 
-        except ImportError as e:
-            logging.error("Fail to build Qualcomm backend: ImportError")
-            logging.error("Message: %s", e)
-            logging.error("sys.path at failure: %s", sys.path)
-            logging.error("cwd at failure: %s", os.getcwd())
-            traceback.print_exc()
-            raise
+        except ImportError:
+            logging.error("Fail to build Qualcomm backend")
+            logging.exception("Import error")
 
         if self.editable_mode:
             self._ran_build = True