PyQUDA-Utils 0.10.7.dev2__tar.gz → 0.10.7.dev4__tar.gz

{pyquda_utils-0.10.7.dev2 → pyquda_utils-0.10.7.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyQUDA-Utils
-Version: 0.10.7.dev2
+Version: 0.10.7.dev4
 Summary: Utility scripts based on PyQUDA
 Author-email: SaltyChiang <SaltyChiang@users.noreply.github.com>
 Maintainer-email: SaltyChiang <SaltyChiang@users.noreply.github.com>

{pyquda_utils-0.10.7.dev2 → pyquda_utils-0.10.7.dev4}/PyQUDA_Utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyQUDA-Utils
-Version: 0.10.7.dev2
+Version: 0.10.7.dev4
 Summary: Utility scripts based on PyQUDA
 Author-email: SaltyChiang <SaltyChiang@users.noreply.github.com>
 Maintainer-email: SaltyChiang <SaltyChiang@users.noreply.github.com>

{pyquda_utils-0.10.7.dev2 → pyquda_utils-0.10.7.dev4}/PyQUDA_Utils.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ setup.py
 PyQUDA_Utils.egg-info/PKG-INFO
 PyQUDA_Utils.egg-info/SOURCES.txt
 PyQUDA_Utils.egg-info/dependency_links.txt
+PyQUDA_Utils.egg-info/entry_points.txt
 PyQUDA_Utils.egg-info/requires.txt
 PyQUDA_Utils.egg-info/top_level.txt
 pyquda_io/__init__.py

pyquda_utils-0.10.7.dev4/PyQUDA_Utils.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+pyquda_plugins = pyquda_plugins.__main__:main

{pyquda_utils-0.10.7.dev2 → pyquda_utils-0.10.7.dev4}/pyproject.toml

@@ -42,3 +42,6 @@ Homepage = "https://github.com/CLQCD/PyQUDA"
 Documentation = "https://github.com/CLQCD/PyQUDA/wiki/Documentation"
 Repository = "https://github.com/CLQCD/PyQUDA.git"
 Issues = "https://github.com/CLQCD/PyQUDA/issues"
+
+[project.scripts]
+pyquda_plugins = "pyquda_plugins.__main__:main"

{pyquda_utils-0.10.7.dev2 → pyquda_utils-0.10.7.dev4}/pyquda_plugins/__main__.py

@@ -5,10 +5,7 @@ import logging
 import os
 import shutil
 from setuptools import Extension
-
-from distutils.command.build_py import build_py
-from distutils.command.build_ext import build_ext
-from distutils.command.install_lib import install_lib
+from setuptools.command.build_ext import build_ext
 import sys
 import tempfile
 
@@ -20,17 +17,14 @@ import numpy
 
 
 def dynamic(lib, header, include_path, library_path):
-    from pyquda_plugins.plugin_pyx import Plugin
+    from pyquda_plugins.plugin_pyx import build_plugin_pyx
 
-    plugins_root = os.path.dirname(__file__)
-    plugin = Plugin(lib, header, include_path)
-    plugin.write(plugins_root)
-    source = os.path.join(plugins_root, f"py{lib}", "src", f"_py{lib}.pyx")
+    build_plugin_pyx(os.path.dirname(__file__), lib, header, include_path)
     return cythonize(
         [
             Extension(
                 name=f"pyquda_plugins.py{lib}._py{lib}",
-                sources=[source],
+                sources=[os.path.join(f"pyquda_plugins/py{lib}/src/_py{lib}.pyx")],
                 include_dirs=[include_path, numpy.get_include()],
                 define_macros=[("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
                 library_dirs=[library_path],
@@ -43,8 +37,7 @@ def dynamic(lib, header, include_path, library_path):
     )[0]
 
 
-def build_and_install(lib, module, inplace):
-    build_temp = tempfile.mkdtemp(prefix="pyquda_plugins_")
+def build_and_install(module):
     dist = Distribution(
         {
             "ext_modules": [module],
@@ -54,34 +47,28 @@ def build_and_install(lib, module, inplace):
         }
     )
 
-    log.info("running build_py")
-    _build_py = build_py(dist)
-    _build_py.build_lib = build_temp
-    _build_py.ensure_finalized()
-    _build_py.run()
-    log.info("running build_ext")
-    _build_ext = build_ext(dist)
-    _build_ext.build_temp = build_temp
-    _build_ext.inplace = inplace
-    _build_ext.ensure_finalized()
-    _build_ext.run()
-    if not inplace:
-        log.info("running install_lib")
-        _install_lib = install_lib(dist)
-        _install_lib.inplace = inplace
-        _install_lib.ensure_finalized()
-        _install_lib.run()
-
-    # if not inplace:
-    #     site_packages = sysconfig.get_path("purelib")
-    #     plugins_root = os.path.join(site_packages, "pyquda_plugins")
-    #     ext = cmd.get_outputs()
-    #     for src, module in zip(ext, module_list):
-    #         dst = "/tmp"
-    #         log.info(f"copying {src} -> {dst}")
-    #         # shutil.copy2(src, dst)
-
-    shutil.rmtree(build_temp)
+    build_temp = tempfile.mkdtemp(prefix="pyquda_plugins_")
+    try:
+        # log.info("running build_py")
+        # _build_py = build_py(dist)
+        # _build_py.build_lib = build_temp
+        # _build_py.ensure_finalized()
+        # _build_py.run()
+        log.info("running build_ext")
+        _build_ext = build_ext(dist)
+        _build_ext.build_lib = build_temp
+        _build_ext.build_temp = build_temp
+        _build_ext.inplace = True
+        _build_ext.ensure_finalized()
+        _build_ext.run()
+        # if not inplace:
+        #     log.info("running install_lib")
+        #     _install_lib = install_lib(dist)
+        #     _install_lib.inplace = inplace
+        #     _install_lib.ensure_finalized()
+        #     _install_lib.run()
+    finally:
+        shutil.rmtree(build_temp)
 
 
 def main():
@@ -106,12 +93,11 @@ def main():
         "--include_path",
         required=True,
     )
-    parser.add_argument(
-        "--inplace",
-        action="store_true",
-    )
     args = parser.parse_args()
-    build_and_install(args.lib, dynamic(args.lib, args.header, args.include_path, args.library_path), args.inplace)
+    cwd = os.getcwd()
+    os.chdir(os.path.join(os.path.dirname(__file__), ".."))
+    build_and_install(dynamic(args.lib, args.header, args.include_path, args.library_path))
+    os.chdir(cwd)
 
 
 if __name__ == "__main__":

{pyquda_utils-0.10.7.dev2 → pyquda_utils-0.10.7.dev4}/pyquda_plugins/plugin_pyx.py

@@ -182,29 +182,31 @@ def parseHeader(header, include_path):
     return funcs
 
 
-class Plugin:
-    def __init__(self, lib: str, header: str, include_path: str):
-        self.lib = lib
-        self.lib_pxd = f'cdef extern from "{header}":\n'
-        self.pylib_pyx = (
-            "from libcpp cimport bool\n"
-            "from numpy cimport ndarray\n"
-            "from pyquda_comm.pointer cimport Pointer, _NDArray\n"
-            f"cimport {lib}\n"
-            "\n"
-        )
-        self.pylib_pyi = "from numpy import int32, float64, complex128\n" "from numpy.typing import NDArray\n" "\n"
-        c_funcs = parseHeader(header, include_path)
-        for c_func in c_funcs:
-            self.lib_pxd += f"    {c_func}\n"
-            self.pylib_pyx += "\n" + c_func.pyx(self.lib)
-            self.pylib_pyi += c_func.pyi()
+def build_plugin_pyx(plugins_root, lib: str, header: str, include_path: str):
+    lib_pxd = f'cdef extern from "{header}":\n'
+    pylib_pyx = (
+        "from libcpp cimport bool\n"
+        "from numpy cimport ndarray\n"
+        "from pyquda_comm.pointer cimport Pointer, _NDArray\n"
+        f"cimport {lib}\n"
+        "\n"
+    )
+    pylib_pyi = "from numpy import int32, float64, complex128\n" "from numpy.typing import NDArray\n" "\n"
+    c_funcs = parseHeader(header, include_path)
+    for c_func in c_funcs:
+        lib_pxd += f"    {c_func}\n"
+        pylib_pyx += "\n" + c_func.pyx(lib)
+        pylib_pyi += c_func.pyi()
+
+    os.makedirs(os.path.join(plugins_root, f"py{lib}", "src"), exist_ok=True)
+    with open(os.path.join(plugins_root, f"py{lib}", "src", f"{lib}.pxd"), "w") as f:
+        f.write(lib_pxd)
+    with open(os.path.join(plugins_root, f"py{lib}", "src", f"_py{lib}.pyx"), "w") as f:
+        f.write(pylib_pyx)
+    with open(os.path.join(plugins_root, f"py{lib}", f"_py{lib}.pyi"), "w") as f:
+        f.write(pylib_pyi)
 
-    def write(self, plugins_root: str):
-        os.makedirs(os.path.join(plugins_root, f"py{self.lib}", "src"), exist_ok=True)
-        with open(os.path.join(plugins_root, f"py{self.lib}", "src", f"{self.lib}.pxd"), "w") as f:
-            f.write(self.lib_pxd)
-        with open(os.path.join(plugins_root, f"py{self.lib}", "src", f"_py{self.lib}.pyx"), "w") as f:
-            f.write(self.pylib_pyx)
-        with open(os.path.join(plugins_root, f"py{self.lib}", f"_py{self.lib}.pyi"), "w") as f:
-            f.write(self.pylib_pyi)
+    if os.path.exists(os.path.join(plugins_root, "yacctab.py")):
+        os.remove(os.path.join(plugins_root, "yacctab.py"))
+    if os.path.exists(os.path.join(plugins_root, "lextab.py")):
+        os.remove(os.path.join(plugins_root, "lextab.py"))

pyquda_utils-0.10.7.dev4/pyquda_utils/_version.py

@@ -0,0 +1 @@
+__version__ = "0.10.7.dev4"

pyquda_utils-0.10.7.dev2/pyquda_utils/_version.py

@@ -1 +0,0 @@
-__version__ = "0.10.7.dev2"