chore: Move Cython sources

If using an editable install, prevent mpi4py.MPI being interpreted as a namespace package when the extension module is not available in-place.
mpi4py · May 1, 2024 · f83beef · f83beef
1 parent 9d3287e
commit f83beef
Show file tree

Hide file tree

Showing 42 changed files with 5 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,8 +45,8 @@ file(
   GLOB_RECURSE MPI.deps
   ${SRCDIR}/mpi4py/*.pyx
   ${SRCDIR}/mpi4py/*.pxd
-  ${SRCDIR}/mpi4py/MPI/*.pyx
-  ${SRCDIR}/mpi4py/MPI/*.pxi
+  ${SRCDIR}/mpi4py/MPI.src/*.pyx
+  ${SRCDIR}/mpi4py/MPI.src/*.pxi
 )
 set(MPI.c ${BINDIR}/MPI.c)
 set(MPI.h ${BINDIR}/MPI.h ${BINDIR}/MPI_api.h)

diff --git a/setup.py b/setup.py
@@ -55,9 +55,8 @@ def sources():
         depends=[
             'src/mpi4py/*.pyx',
             'src/mpi4py/*.pxd',
-            'src/mpi4py/MPI/*.pyx',
-            'src/mpi4py/MPI/*.pxd',
-            'src/mpi4py/MPI/*.pxi',
+            'src/mpi4py/MPI.src/*.pyx',
+            'src/mpi4py/MPI.src/*.pxi',
         ],
     )
     #

diff --git a/src/mpi4py/MPI.pyx b/src/mpi4py/MPI.pyx
@@ -14,4 +14,4 @@
 from __future__ import annotations
 cimport cython  # no-cython-lint
 
-include "MPI/MPI.pyx"
+include "MPI.src/MPI.pyx"
diff --git a/src/mpi4py/MPI/CAPI.pxi → src/mpi4py/MPI.src/CAPI.pxi b/src/mpi4py/MPI/CAPI.pxi → src/mpi4py/MPI.src/CAPI.pxi
diff --git a/src/mpi4py/MPI/Comm.pyx → src/mpi4py/MPI.src/Comm.pyx b/src/mpi4py/MPI/Comm.pyx → src/mpi4py/MPI.src/Comm.pyx
diff --git a/src/mpi4py/MPI/Datatype.pyx → src/mpi4py/MPI.src/Datatype.pyx b/src/mpi4py/MPI/Datatype.pyx → src/mpi4py/MPI.src/Datatype.pyx
diff --git a/src/mpi4py/MPI/Errhandler.pyx → src/mpi4py/MPI.src/Errhandler.pyx b/src/mpi4py/MPI/Errhandler.pyx → src/mpi4py/MPI.src/Errhandler.pyx
diff --git a/src/mpi4py/MPI/ErrorCode.pyx → src/mpi4py/MPI.src/ErrorCode.pyx b/src/mpi4py/MPI/ErrorCode.pyx → src/mpi4py/MPI.src/ErrorCode.pyx
diff --git a/src/mpi4py/MPI/Exception.pyx → src/mpi4py/MPI.src/Exception.pyx b/src/mpi4py/MPI/Exception.pyx → src/mpi4py/MPI.src/Exception.pyx
diff --git a/src/mpi4py/MPI/File.pyx → src/mpi4py/MPI.src/File.pyx b/src/mpi4py/MPI/File.pyx → src/mpi4py/MPI.src/File.pyx
diff --git a/src/mpi4py/MPI/Group.pyx → src/mpi4py/MPI.src/Group.pyx b/src/mpi4py/MPI/Group.pyx → src/mpi4py/MPI.src/Group.pyx
diff --git a/src/mpi4py/MPI/Info.pyx → src/mpi4py/MPI.src/Info.pyx b/src/mpi4py/MPI/Info.pyx → src/mpi4py/MPI.src/Info.pyx
diff --git a/src/mpi4py/MPI/MPI.pyx → src/mpi4py/MPI.src/MPI.pyx b/src/mpi4py/MPI/MPI.pyx → src/mpi4py/MPI.src/MPI.pyx
diff --git a/src/mpi4py/MPI/Message.pyx → src/mpi4py/MPI.src/Message.pyx b/src/mpi4py/MPI/Message.pyx → src/mpi4py/MPI.src/Message.pyx
diff --git a/src/mpi4py/MPI/Op.pyx → src/mpi4py/MPI.src/Op.pyx b/src/mpi4py/MPI/Op.pyx → src/mpi4py/MPI.src/Op.pyx
diff --git a/src/mpi4py/MPI/Request.pyx → src/mpi4py/MPI.src/Request.pyx b/src/mpi4py/MPI/Request.pyx → src/mpi4py/MPI.src/Request.pyx
diff --git a/src/mpi4py/MPI/Session.pyx → src/mpi4py/MPI.src/Session.pyx b/src/mpi4py/MPI/Session.pyx → src/mpi4py/MPI.src/Session.pyx
diff --git a/src/mpi4py/MPI/Status.pyx → src/mpi4py/MPI.src/Status.pyx b/src/mpi4py/MPI/Status.pyx → src/mpi4py/MPI.src/Status.pyx
diff --git a/src/mpi4py/MPI/Win.pyx → src/mpi4py/MPI.src/Win.pyx b/src/mpi4py/MPI/Win.pyx → src/mpi4py/MPI.src/Win.pyx
diff --git a/src/mpi4py/MPI/allocate.pxi → src/mpi4py/MPI.src/allocate.pxi b/src/mpi4py/MPI/allocate.pxi → src/mpi4py/MPI.src/allocate.pxi
diff --git a/src/mpi4py/MPI/asarray.pxi → src/mpi4py/MPI.src/asarray.pxi b/src/mpi4py/MPI/asarray.pxi → src/mpi4py/MPI.src/asarray.pxi
diff --git a/src/mpi4py/MPI/asbuffer.pxi → src/mpi4py/MPI.src/asbuffer.pxi b/src/mpi4py/MPI/asbuffer.pxi → src/mpi4py/MPI.src/asbuffer.pxi
diff --git a/src/mpi4py/MPI/ascaibuf.pxi → src/mpi4py/MPI.src/ascaibuf.pxi b/src/mpi4py/MPI/ascaibuf.pxi → src/mpi4py/MPI.src/ascaibuf.pxi
diff --git a/src/mpi4py/MPI/asdlpack.pxi → src/mpi4py/MPI.src/asdlpack.pxi b/src/mpi4py/MPI/asdlpack.pxi → src/mpi4py/MPI.src/asdlpack.pxi
diff --git a/src/mpi4py/MPI/asfspath.pxi → src/mpi4py/MPI.src/asfspath.pxi b/src/mpi4py/MPI/asfspath.pxi → src/mpi4py/MPI.src/asfspath.pxi
diff --git a/src/mpi4py/MPI/asstring.pxi → src/mpi4py/MPI.src/asstring.pxi b/src/mpi4py/MPI/asstring.pxi → src/mpi4py/MPI.src/asstring.pxi
diff --git a/src/mpi4py/MPI/atimport.pxi → src/mpi4py/MPI.src/atimport.pxi b/src/mpi4py/MPI/atimport.pxi → src/mpi4py/MPI.src/atimport.pxi
diff --git a/src/mpi4py/MPI/attrimpl.pxi → src/mpi4py/MPI.src/attrimpl.pxi b/src/mpi4py/MPI/attrimpl.pxi → src/mpi4py/MPI.src/attrimpl.pxi
diff --git a/src/mpi4py/MPI/bufaimpl.pxi → src/mpi4py/MPI.src/bufaimpl.pxi b/src/mpi4py/MPI/bufaimpl.pxi → src/mpi4py/MPI.src/bufaimpl.pxi
diff --git a/src/mpi4py/MPI/commimpl.pxi → src/mpi4py/MPI.src/commimpl.pxi b/src/mpi4py/MPI/commimpl.pxi → src/mpi4py/MPI.src/commimpl.pxi
diff --git a/src/mpi4py/MPI/drepimpl.pxi → src/mpi4py/MPI.src/drepimpl.pxi b/src/mpi4py/MPI/drepimpl.pxi → src/mpi4py/MPI.src/drepimpl.pxi
diff --git a/src/mpi4py/MPI/errhimpl.pxi → src/mpi4py/MPI.src/errhimpl.pxi b/src/mpi4py/MPI/errhimpl.pxi → src/mpi4py/MPI.src/errhimpl.pxi
diff --git a/src/mpi4py/MPI/msgbuffer.pxi → src/mpi4py/MPI.src/msgbuffer.pxi b/src/mpi4py/MPI/msgbuffer.pxi → src/mpi4py/MPI.src/msgbuffer.pxi
diff --git a/src/mpi4py/MPI/msgpickle.pxi → src/mpi4py/MPI.src/msgpickle.pxi b/src/mpi4py/MPI/msgpickle.pxi → src/mpi4py/MPI.src/msgpickle.pxi
diff --git a/src/mpi4py/MPI/objmodel.pxi → src/mpi4py/MPI.src/objmodel.pxi b/src/mpi4py/MPI/objmodel.pxi → src/mpi4py/MPI.src/objmodel.pxi
diff --git a/src/mpi4py/MPI/opimpl.pxi → src/mpi4py/MPI.src/opimpl.pxi b/src/mpi4py/MPI/opimpl.pxi → src/mpi4py/MPI.src/opimpl.pxi
diff --git a/src/mpi4py/MPI/reqimpl.pxi → src/mpi4py/MPI.src/reqimpl.pxi b/src/mpi4py/MPI/reqimpl.pxi → src/mpi4py/MPI.src/reqimpl.pxi
diff --git a/src/mpi4py/MPI/stdlib.pxi → src/mpi4py/MPI.src/stdlib.pxi b/src/mpi4py/MPI/stdlib.pxi → src/mpi4py/MPI.src/stdlib.pxi
diff --git a/src/mpi4py/MPI/typedec.pxi → src/mpi4py/MPI.src/typedec.pxi b/src/mpi4py/MPI/typedec.pxi → src/mpi4py/MPI.src/typedec.pxi
diff --git a/src/mpi4py/MPI/typemap.pxi → src/mpi4py/MPI.src/typemap.pxi b/src/mpi4py/MPI/typemap.pxi → src/mpi4py/MPI.src/typemap.pxi
diff --git a/src/mpi4py/MPI/typestr.pxi → src/mpi4py/MPI.src/typestr.pxi b/src/mpi4py/MPI/typestr.pxi → src/mpi4py/MPI.src/typestr.pxi
diff --git a/src/mpi4py/MPI/winimpl.pxi → src/mpi4py/MPI.src/winimpl.pxi b/src/mpi4py/MPI/winimpl.pxi → src/mpi4py/MPI.src/winimpl.pxi