diff --git a/pyproject.toml b/pyproject.toml index 92725cc71b07504bb04df9bfc9847aa2b1ba8cb4..08ca2ba2be93c4d4486dc28d3b2ed2ff02ef0e67 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,9 +42,7 @@ test = [ requires = [ "setuptools>=69", "wheel", - # "pybind11", "ruamel.yaml>=0.15.70", - #"PyYAML", "pandas", "openpyxl>=3.1.5", ] diff --git a/requirements.txt b/requirements.txt index fc39e17135769596d63048d463284f1989fc5861..8a616f1dea8a3d5cfceb549ac69c3d04c97e6d47 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,12 +4,10 @@ pystencilssfg~=0.1a4+23.g71ba6dc pymatlib~=0.1.0 pytest~=8.3.4 sympy~=1.12.1 -#pyyaml~=6.0.2 ruamel.yaml>=0.15.70 matplotlib~=3.10.0 scipy~=1.15.1 setuptools~=75.8.0 versioneer~=0.29 -# pybind11~=2.14.0.dev1 pandas~=2.2.3 openpyxl~=3.1.5 diff --git a/setup.py b/setup.py index 5e7af273e6f4c92c384a4176bb2e26e4234b6c60..e3d3fc93bd8b45718c84ba8c5a8343025027aace 100644 --- a/setup.py +++ b/setup.py @@ -1,22 +1,4 @@ -from setuptools import setup, find_packages, Extension -# import pybind11 - - -# Define the extension module -'''ext_modules = [ - Extension( - "pymatlib.core.cpp.fast_interpolation", # Module name in Python - [ - "src/pymatlib/core/cpp/module.cpp", - "src/pymatlib/core/cpp/binary_search_interpolation.cpp", - "src/pymatlib/core/cpp/double_lookup_interpolation.cpp", - ], - include_dirs=[pybind11.get_include(), - "src/pymatlib/core/cpp/include"], - extra_compile_args=['-O3', '-std=c++11'], # Enable high optimization and C++11 - language='c++' - ), -]''' +from setuptools import setup, find_packages setup( name='pymatlib', @@ -44,7 +26,6 @@ setup( 'sympy>=1.7.0', 'pytest>=6.0.0', 'pystencils@git+https://i10git.cs.fau.de/pycodegen/pystencils.git@v2.0-dev', - # 'pybind11>=2.6.0', ], extras_require={ 'dev': [ @@ -53,6 +34,5 @@ setup( 'black', # For code formatting ], }, - # ext_modules=ext_modules, include_package_data=True, # Include package data specified in MANIFEST.in ) diff --git a/src/pymatlib/core/cpp/CMakeLists.txt b/src/pymatlib/core/cpp/CMakeLists.txt index 104090d9b8f122db6ed87140b4fbe720f9235ba1..1732d15cb73e117257e52ba8780fb9335a2088df 100644 --- a/src/pymatlib/core/cpp/CMakeLists.txt +++ b/src/pymatlib/core/cpp/CMakeLists.txt @@ -3,31 +3,9 @@ project(pymatlib_interpolators) # Find required packages find_package(Python COMPONENTS Interpreter Development NumPy REQUIRED) -# execute_process( -# COMMAND ${Python_EXECUTABLE} -m pybind11 --cmakedir -# OUTPUT_VARIABLE PYBIND11_CMAKE_DIR -# OUTPUT_STRIP_TRAILING_WHITESPACE -# ) -# find_package(pybind11 PATHS ${PYBIND11_CMAKE_DIR} NO_DEFAULT_PATH REQUIRED) # Create interface library for header-only template implementation add_library(pymatlib_interpolators INTERFACE) target_include_directories(pymatlib_interpolators INTERFACE - # ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ) - -# Add the Pybind11 module -# pybind11_add_module(fast_interpolation -# module.cpp -# ) -# target_include_directories(fast_interpolation PRIVATE -# ${CMAKE_CURRENT_SOURCE_DIR}/include -# ) -# target_compile_features(fast_interpolation PRIVATE cxx_std_11) -# target_compile_options(fast_interpolation PRIVATE -O3) -# target_link_libraries(fast_interpolation PRIVATE -# interpolation_template -# pybind11::module -# Python::NumPy -# )