From a9fecdaeba83a4717146e76e1a7780bfdad369ee Mon Sep 17 00:00:00 2001
From: Scott Todd <scott.todd0@gmail.com>
Date: Thu, 26 Sep 2024 12:34:29 -0700
Subject: [PATCH] Revert "[libshortfin] Fix standalone Python package build to
 include subpackages." (#224)

Reverts nod-ai/SHARK-Platform#223

This broke a build:
https://github.com/nod-ai/SHARK-Platform/actions/runs/11058808130/job/30725674259#step:9:86
```
 ImportError while loading conftest '/home/runner/work/SHARK-Platform/SHARK-Platform/libshortfin/tests/conftest.py'.
tests/conftest.py:10: in <module>
    import shortfin as sf
E   ModuleNotFoundError: No module named 'shortfin'
```
---
 libshortfin/README.md | 35 ++++++++---------------------------
 libshortfin/setup.py  | 25 +++++++++----------------
 2 files changed, 17 insertions(+), 43 deletions(-)

diff --git a/libshortfin/README.md b/libshortfin/README.md
index d160a3bbf..1cb06cfa8 100644
--- a/libshortfin/README.md
+++ b/libshortfin/README.md
@@ -3,18 +3,12 @@
 Build options
 
 1. Native C++ build
-2. Local Python release build
-3. Package Python release build
-4. Python dev build
-
-Prerequisites
-
-* A modern C/C++ compiler, such as clang 18 or gcc 12
-* A modern Python, such as Python 3.12
+2. Python release build
+3. Python dev build
 
 ## Native C++ Builds
 
-```bash
+```
 cmake -GNinja -S. -Bbuild \
     -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
     -DCMAKE_LINKER_TYPE=LLD
@@ -24,28 +18,15 @@ If Python bindings are enabled in this mode (`-DSHORTFIN_BUILD_PYTHON_BINDINGS=O
 then `pip install -e build/` will install from the build dir (and support
 build/continue).
 
-## Local Python Release Builds
+## Python Release Builds
 
-```bash
-pip install -v -e .
 ```
-
-## Package Python Release Builds
-
-```bash
-# Build shortfin.*.whl into the dist/ directory
-#   e.g. `shortfin-0.9-cp312-cp312-linux_x86_64.whl`
-python -m pip wheel -v -w dist .
-
-# Install the built wheel.
-python -m pip install dist/*.whl
+pip install -v -e .
 ```
 
-TODO: helper script to build under manylinux using Docker
-
 ## Python Dev Builds
 
-```bash
+```
 # Install build system pre-reqs (since we are building in dev mode, this
 # is not done for us). See source of truth in pyproject.toml:
 pip install setuptools wheel
@@ -100,13 +81,13 @@ this is not considered to be a significant issue.
 
 Run platform independent tests only:
 
-```bash
+```
 pytest tests/
 ```
 
 Run tests including for a specific platform:
 
-```bash
+```
 pytest tests/ --system amdgpu
 ```
 
diff --git a/libshortfin/setup.py b/libshortfin/setup.py
index 721ed7672..196a82064 100644
--- a/libshortfin/setup.py
+++ b/libshortfin/setup.py
@@ -11,7 +11,6 @@
 import os
 from pathlib import Path
 from distutils.command.build import build as _build
-from setuptools import find_namespace_packages
 from setuptools.command.build_ext import build_ext as _build_ext
 from setuptools.command.build_py import build_py as _build_py
 
@@ -308,26 +307,20 @@ def populate_built_package(abs_dir):
 if ENABLE_TRACY:
     populate_built_package(os.path.join(PYTHON_TRACY_BINARY_DIR / "_shortfin_tracy"))
 
-packages = find_namespace_packages(
-    where=os.path.join(SETUPPY_DIR, "python"),
-    include=[
-        "_shortfin",
-        "_shortfin_default",
-        "shortfin",
-        "shortfin.*",
-        "shortfin_apps",
-        "shortfin_apps.*",
-    ]
-    + (["_shortfin_tracy"] if ENABLE_TRACY else []),
-)
-print(f"Found libshortfin packages: {packages}")
-
 setup(
     name="shortfin",
     version="0.9",
     description="Shortfin native library implementation",
     author="SHARK Authors",
-    packages=packages,
+    packages=(
+        [
+            "_shortfin",
+            "_shortfin_default",
+            "shortfin",
+            "shortfin_apps",
+        ]
+        + (["_shortfin_tracy"] if ENABLE_TRACY else [])
+    ),
     zip_safe=False,
     package_dir=combine_dicts(
         {