DeepGPR 0.0.9__tar.gz → 0.0.11__tar.gz

{deepgpr-0.0.9 → deepgpr-0.0.11}/PKG-INFO

@@ -1,19 +1,15 @@
 Metadata-Version: 2.4
 Name: DeepGPR
-Version: 0.0.9
+Version: 0.0.11
 Summary: PyTorch and CUDA for GPR FWI
 Author-email: Lei Liu <liulei990222@gmail.com>
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
-Classifier: Topic :: Scientific/Engineering
-Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: numpy
-Requires-Dist: scipy
 Requires-Dist: matplotlib
-Requires-Dist: torch
 
 # DeepGPR
 

{deepgpr-0.0.9 → deepgpr-0.0.11}/pyproject.toml

@@ -1,34 +1,31 @@
 [build-system]
-requires = ["setuptools>=70", "wheel"]
+requires = [
+    "setuptools>=68",
+    "wheel"
+]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "DeepGPR"
-version = "0.0.9"
+version = "0.0.11"
 authors = [
-    { name = "Lei Liu", email = "liulei990222@gmail.com" }
+  { name = "Lei Liu", email = "liulei990222@gmail.com" }
 ]
 description = "PyTorch and CUDA for GPR FWI"
 readme = "README.md"
 requires-python = ">=3.8"
-
+dependencies = [
+    "numpy",
+    "matplotlib"
+]
 classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: Microsoft :: Windows",
-    "Operating System :: POSIX :: Linux",
-    "Topic :: Scientific/Engineering",
-    "Topic :: Scientific/Engineering :: Physics"
-]
-
-dependencies = [
-    "numpy",
-    "scipy",
-    "matplotlib",
-    "torch"
+    "Operating System :: POSIX :: Linux"
 ]
 
 [tool.setuptools]
-package-dir = { "" = "src" }
+package-dir = {"" = "src"}
 include-package-data = true
 
 [tool.setuptools.packages.find]
@@ -36,13 +33,6 @@ where = ["src"]
 
 [tool.setuptools.package-data]
 DeepGPR = [
-    "lib/*.cu",
-    "lib/*.cuh",
-    "lib/*.h",
-    "lib/*.hpp",
-    "lib/*.cpp",
-    "lib/*.c",
     "lib/*.dll",
-    "lib/*.so",
-    "lib/*.pyd"
+    "lib/*.so"
 ]

deepgpr-0.0.11/src/DeepGPR/__init__.py

@@ -0,0 +1,210 @@
+import ctypes
+import os
+import platform
+from pathlib import Path
+
+
+_FLOAT_P = ctypes.POINTER(ctypes.c_float)
+_INT_P = ctypes.POINTER(ctypes.c_int)
+
+_PACKAGE_DIR = Path(__file__).resolve().parent
+_LIB_DIR = _PACKAGE_DIR / "lib"
+_SYSTEM_NAME = platform.system()
+
+
+def _candidate_library_paths() -> list[Path]:
+    """
+    Return possible precompiled DeepGPR library paths for the current platform.
+
+    Expected files:
+        Windows:
+            src/DeepGPR/lib/deepgpr.dll
+
+        Linux:
+            src/DeepGPR/lib/libdeepgpr.so
+            or
+            src/DeepGPR/lib/deepgpr.so
+
+    This package no longer compiles deepgpr.cu during import.
+    The corresponding precompiled library must already be included in the package.
+    """
+    if _SYSTEM_NAME == "Windows":
+        return [
+            _LIB_DIR / "deepgpr.dll",
+        ]
+
+    if _SYSTEM_NAME == "Linux":
+        return [
+            _LIB_DIR / "libdeepgpr.so",
+            _LIB_DIR / "deepgpr.so",
+        ]
+
+    raise RuntimeError(f"Unsupported operating system: {_SYSTEM_NAME}")
+
+
+def _select_library_path() -> Path:
+    candidates = _candidate_library_paths()
+
+    for path in candidates:
+        if path.is_file():
+            return path
+
+    available_files = []
+    if _LIB_DIR.is_dir():
+        available_files = [p.name for p in _LIB_DIR.iterdir()]
+
+    expected = "\n".join(str(p) for p in candidates)
+    raise FileNotFoundError(
+        "DeepGPR precompiled shared library was not found.\n\n"
+        f"Current platform: {_SYSTEM_NAME}\n"
+        f"Expected one of:\n{expected}\n\n"
+        f"Available files in {_LIB_DIR}:\n{available_files}\n\n"
+        "Please put the compiled library file into src/DeepGPR/lib before building "
+        "or installing the package."
+    )
+
+
+_LIB_PATH = _select_library_path()
+
+
+def _add_windows_dll_search_paths() -> None:
+    """Make DLL dependency lookup more reliable on Python 3.8+ for Windows."""
+    if _SYSTEM_NAME != "Windows" or not hasattr(os, "add_dll_directory"):
+        return
+
+    search_dirs: list[Path] = [_LIB_DIR]
+
+    cuda_path = os.environ.get("CUDA_PATH")
+    if cuda_path:
+        search_dirs.append(Path(cuda_path) / "bin")
+
+    for key, value in os.environ.items():
+        if key.startswith("CUDA_PATH_V") and value:
+            search_dirs.append(Path(value) / "bin")
+
+    conda_prefix = os.environ.get("CONDA_PREFIX")
+    if conda_prefix:
+        search_dirs.append(Path(conda_prefix) / "Library" / "bin")
+
+    seen = set()
+    for directory in search_dirs:
+        directory = Path(directory)
+        if directory in seen:
+            continue
+        seen.add(directory)
+
+        try:
+            if directory.is_dir():
+                os.add_dll_directory(str(directory))
+        except OSError:
+            pass
+
+
+def _load_deepgpr_library() -> ctypes.CDLL:
+    _add_windows_dll_search_paths()
+
+    try:
+        return ctypes.CDLL(str(_LIB_PATH.resolve()))
+    except OSError as exc:
+        raise RuntimeError(
+            f"Failed to load DeepGPR shared library:\n{_LIB_PATH}\n\n"
+            "Possible causes:\n"
+            "1. The DLL/SO was compiled for a different operating system or CPU architecture.\n"
+            "2. CUDA runtime DLLs/shared libraries are missing or cannot be found.\n"
+            "3. The NVIDIA driver or CUDA runtime version is incompatible.\n"
+            "4. On Windows, CUDA_PATH\\bin or the required dependency directory is not in the DLL search path."
+        ) from exc
+
+
+def _require_exported_symbols(lib: ctypes.CDLL, symbols: tuple[str, ...]) -> None:
+    missing = [name for name in symbols if not hasattr(lib, name)]
+    if missing:
+        raise RuntimeError(
+            "The shared library was loaded, but the following exported C ABI symbols "
+            f"were not found: {missing}. "
+            "Check that the corresponding functions in deepgpr.cu are declared with DEEPGPR_API."
+        )
+
+
+c_lib = _load_deepgpr_library()
+_require_exported_symbols(c_lib, ("forward", "backward"))
+
+
+c_lib.forward.argtypes = [
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P,
+
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+
+    ctypes.c_int, ctypes.c_int, ctypes.c_int,
+    ctypes.c_int, ctypes.c_int, ctypes.c_int,
+
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+
+    ctypes.c_float, ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_float,
+    _INT_P, _FLOAT_P,
+    ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_int,
+    _INT_P, _FLOAT_P,
+    ctypes.c_int, ctypes.c_int,
+]
+c_lib.forward.restype = None
+
+
+c_lib.backward.argtypes = [
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P,
+
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+
+    ctypes.c_int, ctypes.c_int, ctypes.c_int,
+    ctypes.c_int, ctypes.c_int, ctypes.c_int,
+
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+    _FLOAT_P, _FLOAT_P, _FLOAT_P, _FLOAT_P,
+
+    ctypes.c_float, ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_float,
+    ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_int,
+    _INT_P, _FLOAT_P,
+    ctypes.c_int,
+    _FLOAT_P, _FLOAT_P,
+    ctypes.c_int, ctypes.c_int, ctypes.c_int,
+]
+c_lib.backward.restype = None
+
+
+from .common import *
+from .compute2 import *
+from .multiscale import *
+from .wavelet import *
+
+
+_EXCLUDED_FROM_ALL = {
+    "ctypes",
+    "os",
+    "platform",
+    "Path",
+}
+
+__all__ = [
+    name for name in globals()
+    if not name.startswith("_") and name not in _EXCLUDED_FROM_ALL
+]

{deepgpr-0.0.9 → deepgpr-0.0.11}/src/DeepGPR/lib/deepgpr.cu

@@ -3,6 +3,13 @@
 #include <stdio.h>
 #include <cfloat>
 
+
+#ifdef _WIN32
+#define DEEPGPR_API extern "C" __declspec(dllexport)
+#else
+#define DEEPGPR_API extern "C" __attribute__((visibility("default")))
+#endif
+
 __constant__ float e0 = 8.8541878128e-12;
 __constant__ float m0 = 1.25663706212e-06;
 
@@ -598,9 +605,7 @@ __global__ void accumulate_gradients(
 }
 
 
-extern "C" {
-
-void forward(const float* __restrict__ er, const float* __restrict__ se, const float* __restrict__ mr,  
+DEEPGPR_API void forward(const float* __restrict__ er, const float* __restrict__ se, const float* __restrict__ mr,  
              float* __restrict__ Eall_ptr, 
              float* __restrict__ Ex,  float* __restrict__ Ey, float* __restrict__ Ez,  
              float* __restrict__ Hx, float* __restrict__ Hy,  float* __restrict__ Hz,
@@ -702,7 +707,7 @@ void forward(const float* __restrict__ er, const float* __restrict__ se, const f
     }
 }
 
-void backward(const float* __restrict__ er, const float* __restrict__ se, const float* __restrict__ mr,  
+DEEPGPR_API void backward(const float* __restrict__ er, const float* __restrict__ se, const float* __restrict__ mr,  
              const float* __restrict__ Eall_ptr,
              float* __restrict__ Ex,  float* __restrict__ Ey, float* __restrict__ Ez,  
              float* __restrict__ Hx, float* __restrict__ Hy,  float* __restrict__ Hz,
@@ -815,6 +820,4 @@ void backward(const float* __restrict__ er, const float* __restrict__ se, const
         cudaStreamDestroy(stream_comp);
         cudaStreamDestroy(stream_trans);
     }
-}
-
 }

{deepgpr-0.0.9 → deepgpr-0.0.11}/src/DeepGPR.egg-info/PKG-INFO

@@ -1,19 +1,15 @@
 Metadata-Version: 2.4
 Name: DeepGPR
-Version: 0.0.9
+Version: 0.0.11
 Summary: PyTorch and CUDA for GPR FWI
 Author-email: Lei Liu <liulei990222@gmail.com>
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
-Classifier: Topic :: Scientific/Engineering
-Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: numpy
-Requires-Dist: scipy
 Requires-Dist: matplotlib
-Requires-Dist: torch
 
 # DeepGPR
 

{deepgpr-0.0.9 → deepgpr-0.0.11}/src/DeepGPR.egg-info/SOURCES.txt

@@ -11,4 +11,5 @@ src/DeepGPR.egg-info/dependency_links.txt
 src/DeepGPR.egg-info/requires.txt
 src/DeepGPR.egg-info/top_level.txt
 src/DeepGPR/lib/deepgpr.cu
+src/DeepGPR/lib/deepgpr.dll
 src/DeepGPR/lib/deepgpr.so

{deepgpr-0.0.9 → deepgpr-0.0.11}/src/DeepGPR.egg-info/requires.txt

@@ -1,4 +1,2 @@
 numpy
-scipy
 matplotlib
-torch

deepgpr-0.0.9/src/DeepGPR/__init__.py

@@ -1,140 +0,0 @@
-import ctypes
-import os
-import subprocess
-import platform
-from pathlib import Path
-
-
-system_name = platform.system()
-lib_dir = Path(__file__).parent / 'lib'
-cu_file = lib_dir / 'deepgpr.cu'
-
-if system_name == "Windows":
-    lib_extension = ".dll"
-    lib_filename = f'deepgpr{lib_extension}'
-    lib_path_obj = lib_dir / lib_filename
-    
-    nvcc_cmd = [
-        'nvcc', '-shared', 
-        '-o', str(lib_path_obj), 
-        str(cu_file)
-    ]
-else:
-    lib_extension = ".so"
-    lib_filename = f'deepgpr{lib_extension}'
-    lib_path_obj = lib_dir / lib_filename
-    
-    nvcc_cmd = [
-        'nvcc', '-shared', '-Xcompiler', '-fPIC', 
-        '-D_GLIBCXX_USE_CXX11_ABI=0', 
-        '-o', str(lib_path_obj), 
-        str(cu_file)
-    ]
-
-if not lib_path_obj.is_file():
-    print(f'Compiling CUDA extension for {system_name} directly via nvcc...')
-    try:
-        subprocess.run(nvcc_cmd, check=True)
-    except FileNotFoundError:
-        raise RuntimeError(
-            "Compilation failed: 'nvcc' command not found. "
-            "Please ensure NVIDIA CUDA Toolkit is installed and 'nvcc' is added to your system PATH."
-        )
-    except subprocess.CalledProcessError as e:
-        raise RuntimeError(f"Compilation failed with error code {e.returncode}.")
-
-lib_path = str(lib_path_obj)
-c_lib = ctypes.cdll.LoadLibrary(lib_path)
-
-
-c_lib.forward.argtypes = [
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-
-    ctypes.c_int, ctypes.c_int, ctypes.c_int, 
-    ctypes.c_int, ctypes.c_int, ctypes.c_int, 
-
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    
-    ctypes.c_float,ctypes.c_int,ctypes.c_int,ctypes.c_int,ctypes.c_float,
-    ctypes.POINTER(ctypes.c_int), ctypes.POINTER(ctypes.c_float),
-    ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_int, 
-    ctypes.POINTER(ctypes.c_int), ctypes.POINTER(ctypes.c_float),
-    ctypes.c_int, ctypes.c_int
-]
-c_lib.forward.restype = None  
-
-c_lib.backward.argtypes = [
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),#16
-    
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),#40
-
-    ctypes.c_int, ctypes.c_int, ctypes.c_int, 
-    ctypes.c_int, ctypes.c_int, ctypes.c_int, 
-
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), 
-    ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float), #58
-    
-    ctypes.c_float,ctypes.c_int,ctypes.c_int,ctypes.c_int,ctypes.c_float,
-    ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_int, 
-    ctypes.POINTER(ctypes.c_int), ctypes.POINTER(ctypes.c_float),
-    ctypes.c_int ,ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
-    ctypes.c_int, ctypes.c_int , ctypes.c_int 
-]
-
-c_lib.backward.restype = None 
-__all__ = ['c_lib']
-
-
-from .common import *
-from .compute2 import *
-from .multiscale import *
-from .wavelet import *