optional: shared object only shows up within mt2 installation area

tpgillam · Aug 29, 2024 · 394e06b · 394e06b
1 parent 8936dd5
commit 394e06b
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -35,4 +35,4 @@ include = ["mt2*"]
 namespaces = false
 
 [tool.setuptools.package-data]
-mt2 = ["src/*.h", "src/*.cpp"]
+mt2 = ["src/_mt2/*.h", "src/_mt2/*.cpp"]
diff --git a/setup.py b/setup.py
@@ -7,8 +7,8 @@
 setup(
     ext_modules=[
         Extension(
-            "_mt2",
-            ["src/main.cpp"],
+            "mt2._mt2",
+            ["src/_mt2/main.cpp"],
             define_macros=[
                 # Pass in the version info so we can expose it in the extension.
                 ("VERSION_INFO", __version__),
@@ -19,7 +19,7 @@
                 # citation information elsewhere.
                 ("DISABLE_COPYRIGHT_PRINTING", "1"),
             ],
-            include_dirs=[numpy.get_include(), "src"],
+            include_dirs=[numpy.get_include(), "src/_mt2"],
             language="c++",
             extra_compile_args=["-std=c++11"],
         ),

diff --git a/src/lester_mt2_bisect_v7.h → src/_mt2/lester_mt2_bisect_v7.h b/src/lester_mt2_bisect_v7.h → src/_mt2/lester_mt2_bisect_v7.h
diff --git a/src/main.cpp → src/_mt2/main.cpp b/src/main.cpp → src/_mt2/main.cpp
diff --git a/src/mt2_Lallyver2.h → src/_mt2/mt2_Lallyver2.h b/src/mt2_Lallyver2.h → src/_mt2/mt2_Lallyver2.h
diff --git a/src/mt2_bisect.h → src/_mt2/mt2_bisect.h b/src/mt2_bisect.h → src/_mt2/mt2_bisect.h
diff --git a/src/mt2/__init__.py b/src/mt2/__init__.py
@@ -2,7 +2,7 @@
 
 import numpy
 
-from _mt2 import mt2_lester_ufunc, mt2_tombs_ufunc  # pyright: ignore [reportMissingImports]
+from mt2._mt2 import mt2_lester_ufunc, mt2_tombs_ufunc  # pyright: ignore [reportMissingImports]
 
 __version__ = "1.2.1"
 

diff --git a/tests/common.py b/tests/common.py
@@ -1,4 +1,4 @@
-from _mt2 import mt2_lally_ufunc, mt2_lester_ufunc, mt2_tombs_ufunc
+from mt2._mt2 import mt2_lally_ufunc, mt2_lester_ufunc, mt2_tombs_ufunc
 
 
 def mt2_lally(*args, desired_precision_on_mt2=0.0, out=None):