move Cinder/module to CinderX/

Summary: I want to add a compilation unit under `Cinder/` for general Cinder infra that is not specifically part of the JIT, Static Python, or Strict Modules. But currently all Cinder compilation units have to be symlinked into the `Cinder/module` directory, since we have the dual build setup where we can either build the Cinder module standalone, or build Cinder features into the main runtime the way we've always done. And I don't want to introduce a cyclic symlink from `Cinder/module/Cinder -> Cinder/`. So instead move `Cinder/module/` out to a separate top-level `CinderX/` to avoid this cycle. The naming between "Cinder" and "CinderX" is a bit confusing here, but my intended logic is that "CinderX/" is specifically the extension module, whereas "Cinder/" is general Cinder code that can be built either as part of CinderX or into the runtime (though eventually only as part of CinderX, at which point the symlinks to `Cinder/`, `Jit/`, etc inside `CinderX` will become the sole real locations of those directories.) Reviewed By: alexmalyshev Differential Revision: D48019256 fbshipit-source-id: a65ab67c05c76d177b543fb8885a8b497b75d50f
facebookincubator · Aug 9, 2023 · 6ff5adb · 6ff5adb
1 parent 86fcab9
commit 6ff5adb
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 8 deletions.
diff --git a/Cinder/module/Jit b/Cinder/module/Jit
diff --git a/Cinder/module/StaticPython b/Cinder/module/StaticPython
diff --git a/Cinder/module/StrictModules b/Cinder/module/StrictModules
diff --git a/Cinder/module/ThirdParty b/Cinder/module/ThirdParty
diff --git a/CinderX/Jit b/CinderX/Jit
@@ -0,0 +1 @@
+../Jit
diff --git a/Cinder/module/LICENSE → CinderX/LICENSE b/Cinder/module/LICENSE → CinderX/LICENSE
diff --git a/Cinder/module/README.md → CinderX/README.md b/Cinder/module/README.md → CinderX/README.md
diff --git a/CinderX/StaticPython b/CinderX/StaticPython
@@ -0,0 +1 @@
+../StaticPython
diff --git a/CinderX/StrictModules b/CinderX/StrictModules
@@ -0,0 +1 @@
+../StrictModules
diff --git a/CinderX/ThirdParty b/CinderX/ThirdParty
@@ -0,0 +1 @@
+../ThirdParty
diff --git a/Cinder/module/bootstrap.sh → CinderX/bootstrap.sh b/Cinder/module/bootstrap.sh → CinderX/bootstrap.sh
diff --git a/Cinder/module/build.sh → CinderX/build.sh b/Cinder/module/build.sh → CinderX/build.sh
diff --git a/Cinder/module/cinder.cpp → CinderX/cinderx.cpp b/Cinder/module/cinder.cpp → CinderX/cinderx.cpp
diff --git a/...module/known-core-python-exported-symbols → CinderX/known-core-python-exported-symbols b/...module/known-core-python-exported-symbols → CinderX/known-core-python-exported-symbols
diff --git a/Cinder/module/make-current-symbols.sh → CinderX/make-current-symbols.sh b/Cinder/module/make-current-symbols.sh → CinderX/make-current-symbols.sh
diff --git a/Cinder/module/pip.pyz → CinderX/pip.pyz b/Cinder/module/pip.pyz → CinderX/pip.pyz
diff --git a/Cinder/module/pyproject.toml → CinderX/pyproject.toml b/Cinder/module/pyproject.toml → CinderX/pyproject.toml
diff --git a/Cinder/module/setup.py → CinderX/setup.py b/Cinder/module/setup.py → CinderX/setup.py
@@ -14,8 +14,8 @@
 MODULE_DIR = os.path.dirname(os.path.realpath(__file__))
 
 THIRD_PARTY_DIR = os.path.realpath(f"{MODULE_DIR}/ThirdParty")
-CINDER_DIR = os.path.realpath(f"{MODULE_DIR}/..")
-PYTHON_DIR = os.path.realpath(f"{MODULE_DIR}/../../")
+PYTHON_DIR = os.path.realpath(f"{MODULE_DIR}/..")
+CINDER_DIR = os.path.realpath(f"{PYTHON_DIR}/Cinder/")
 
 INCLUDE_DIRS = [
     f"{CINDER_DIR}/Include",

diff --git a/...module/setuptools-65.6.0-py3-none-any.whl → CinderX/setuptools-65.6.0-py3-none-any.whl b/...module/setuptools-65.6.0-py3-none-any.whl → CinderX/setuptools-65.6.0-py3-none-any.whl
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -328,7 +328,7 @@ ASAN_TEST_ENV_WITH_LSAN= @ASAN_TEST_ENV_WITH_LSAN@
 
 ENABLE_CINDERX_SO=@ENABLE_CINDERX_SO@
 ifeq ($(ENABLE_CINDERX_SO), yes)
-	CINDERX_SO=$(abs_srcdir)/Cinder/module/build/cinderx.$(SOABI).so
+	CINDERX_SO=$(abs_srcdir)/CinderX/build/cinderx.$(SOABI).so
 else
 	CINDERX_SO=
 endif
@@ -836,7 +836,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
 
 .PHONY: $(CINDERX_SO)
 $(CINDERX_SO):
-	$(abs_srcdir)/Cinder/module/build.sh
+	$(abs_srcdir)/CinderX/build.sh
 
 # Build the interpreter
 $(BUILDPYTHON):	Programs/python.o $(LIBRARY_DEPS) $(CINDERX_SO)