pyxcp 0.22.1__tar.gz → 0.22.3__tar.gz

pyxcp-0.22.3/CMakeLists.txt

@@ -0,0 +1,123 @@
+
+cmake_minimum_required(VERSION 3.20...3.30)
+project(pyxcp_extensions LANGUAGES C CXX)
+
+cmake_policy(SET CMP0135 NEW)
+cmake_policy(SET CMP0094 NEW)
+
+find_package(Python3 COMPONENTS Interpreter Development)
+find_package(pybind11 CONFIG)
+
+SET(CMAKE_C_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
+
+message( STATUS "Found pybind11 v${pybind11_VERSION} ${pybind11_VERSION_TYPE}: ${pybind11_INCLUDE_DIRS}")
+
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/dist")
+
+
+SET(GCC_N_CLANG_BASE_OPTIONS "-std=c++23 -Wall -Wextra -Wpedantic -Warray-bounds -mtune=native -fexceptions")
+
+SET(MSVC_BASE_OPTIONS "/W3 /permissive- /EHsc /bigobj /Zc:__cplusplus /std:c++latest")
+
+
+
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+	if (MSVC)
+		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS}  /Od /fsanitize=address /Zi")
+	else()
+		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} -Og -g3 -ggdb --fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined -fsanitize=bounds")	# -fsanitize=hwaddress
+	endif()
+else ()
+	if (MSVC)
+		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} /Ox")
+	else()
+		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} -O3 --fomit-frame-pointer")
+	endif()
+ endif ()
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL  "Darwin")
+    set(ENV{MACOSX_DEPLOYMENT_TARGET}  "11.0")
+	SET(GCC_N_CLANG_EXTRA_OPTIONS "-stdlib=libc++")
+	message("Platform is Darwin")
+elseif (CMAKE_SYSTEM_NAME STREQUAL  "Windows")
+	message("Platform is WINDOWS")
+	SET(MSVC_EXTRA_OPTIONS "")
+elseif (CMAKE_SYSTEM_NAME STREQUAL  "Linux")
+	SET(GCC_N_CLANG_EXTRA_OPTIONS "-fvisibility=hidden -g0") # -fcoroutines
+	message("Platform is LINUX")
+endif()
+
+
+IF (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+
+ELSEIF (CMAKE_C_COMPILER_ID MATCHES "Clang")
+
+ELSEIF (CMAKE_C_COMPILER_ID MATCHES "MSVC")
+
+ELSE ()
+
+ENDIF ()
+
+IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+
+ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+
+ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+
+ELSE ()
+
+
+ENDIF ()
+
+message("Compiling C with: " ${CMAKE_C_COMPILER_ID})
+message("Compiling Cpp with: " ${CMAKE_CXX_COMPILER_ID})
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+set(EXTENSION_INCS ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/cpp_ext)
+
+pybind11_add_module(rekorder pyxcp/recorder/wrap.cpp pyxcp/recorder/lz4.c pyxcp/recorder/lz4hc.c)
+pybind11_add_module(cpp_ext pyxcp/cpp_ext/extension_wrapper.cpp)
+pybind11_add_module(stim pyxcp/daq_stim/stim_wrapper.cpp pyxcp/daq_stim/stim.cpp pyxcp/daq_stim/scheduler.cpp)
+
+target_include_directories(rekorder PRIVATE ${EXTENSION_INCS} ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/recorder)
+target_include_directories(cpp_ext PRIVATE ${EXTENSION_INCS})
+target_include_directories(stim PRIVATE ${EXTENSION_INCS} ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/daq_stim)
+
+target_compile_options(rekorder PUBLIC "-DEXTENSION_NAME=pyxcp.recorder.rekorder")
+target_compile_options(cpp_ext PUBLIC "-DEXTENSION_NAME=pyxcp.cpp_ext.cpp_ext")
+target_compile_options(stim PUBLIC "-DEXTENSION_NAME=pyxcp.daq_stim.stim")
+
+add_executable(asamkeydll ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/asamkeydll.c)
+if (CMAKE_SYSTEM_NAME STREQUAL  "Linux")
+	target_link_libraries(asamkeydll PRIVATE dl)
+endif()
+
+
+if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    # CMAKE_SYSTEM_NAME STREQUAL  "Windows"
+endif()
+
+IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_N_CLANG_BASE_OPTIONS} ${GCC_N_CLANG_EXTRA_OPTIONS}")
+	target_link_options(cpp_ext PUBLIC -flto=auto)
+	target_link_options(stim PUBLIC -flto=auto)
+	target_link_options(rekorder PUBLIC -flto=auto)
+ELSEIF (CMAKE_C_COMPILER_ID MATCHES "MSVC")
+	SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${MSVC_BASE_OPTIONS} ${MSVC_EXTRA_OPTIONS}")
+ENDIF()
+
+IF (CMAKE_SYSTEM_NAME STREQUAL  "Linux" AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	# SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS}" -fuse-ld=lld)
+ENDIF()
+
+# target_include_directories(preprocessor PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pya2l/extensions>)
+# target_link_libraries(preprocessor pybind11::headers)
+# set_target_properties(preprocessor PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON CXX_VISIBILITY_PRESET ON VISIBILITY_INLINES_HIDDEN ON)
+
+install(TARGETS rekorder LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/recorder)
+install(TARGETS cpp_ext LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/cpp_ext)
+install(TARGETS stim LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/daq_stim)
+# install(TARGETS asamkeydll LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/)

{pyxcp-0.22.1 → pyxcp-0.22.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxcp
-Version: 0.22.1
+Version: 0.22.3
 Summary: Universal Calibration Protocol for Python
 Home-page: https://github.com/christoph2/pyxcp
 License: LGPLv3

pyxcp-0.22.3/build_ext.py

@@ -0,0 +1,140 @@
+#!/usr/bin/env python
+
+import multiprocessing as mp
+import os
+import platform
+import re
+import subprocess  # nosec
+import sys
+import sysconfig
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+
+TOP_DIR = Path(__file__).parent
+
+print("Platform", platform.system())
+uname = platform.uname()
+if uname.system == "Darwin":
+    os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.13"
+
+VARS = sysconfig.get_config_vars()
+
+
+def get_python_base() -> str:
+    # Applies in this form only to Windows.
+    if "base" in VARS and VARS["base"]:
+        return VARS["base"]
+    if "installed_base" in VARS and VARS["installed_base"]:
+        return VARS["installed_base"]
+
+
+def alternate_libdir(pth: str):
+    base = Path(pth).parent
+    libdir = Path(base) / "libs"
+    if libdir.exists():
+        # available_libs = os.listdir(libdir)
+        return str(libdir)
+    else:
+        return ""
+
+
+def get_py_config() -> dict:
+    pynd = VARS["py_version_nodot"]  # Should always be present.
+    include = sysconfig.get_path("include")  # Seems to be cross-platform.
+    if uname.system == "Windows":
+        base = get_python_base()
+        library = f"python{pynd}.lib"
+        libdir = Path(base) / "libs"
+        if libdir.exists():
+            available_libs = os.listdir(libdir)
+            if library in available_libs:
+                libdir = str(libdir)
+            else:
+                libdir = ""
+        else:
+            libdir = alternate_libdir(include)
+    else:
+        library = VARS["LIBRARY"]
+        DIR_VARS = ("LIBDIR", "BINLIBDEST", "DESTLIB", "LIBDEST", "MACHDESTLIB", "DESTSHARED", "LIBPL")
+        arch = None
+        if uname.system == "Linux":
+            arch = VARS.get("MULTIARCH", "")
+        for dir_var in DIR_VARS:
+            dir_name = VARS.get(dir_var)
+            if not dir_name:
+                continue
+            if uname.system == "Darwin":
+                full_path = [Path(dir_name) / library]
+            elif uname.system == "Linux":
+                full_path = [Path(dir_name) / arch / library, Path(dir_name) / library]
+            else:
+                print("PF?", uname.system)
+            for fp in full_path:
+                if fp.exists():
+                    print(f"found Python library: '{full_path}'")
+                    libdir = dir_name
+                    break
+                # else:
+                #    print(f"NOT found: '{full_path}'")
+    return dict(exe=sys.executable, include=include, libdir=libdir, library=library)
+
+
+def banner(msg: str) -> None:
+    print("=" * 80)
+    print(str.center(msg, 80))
+    print("=" * 80)
+
+
+def build_extension(debug: bool = False, use_temp_dir: bool = False) -> None:
+    print("build_ext::build_extension()")
+
+    debug = bool(os.environ.get("DEBUG", 0)) or debug
+    cfg = "Debug" if debug else "Release"
+    print(f" BUILD-TYPE: {cfg!r}")
+
+    py_cfg = get_py_config()
+
+    cmake_args = [
+        f"-DPython3_EXECUTABLE={py_cfg['exe']}",
+        f"-DPython3_INCLUDE_DIR={py_cfg['include']}",
+        f"-DPython3_LIBRARY={str(Path(py_cfg['libdir']) / Path(py_cfg['library']))}",
+        f"-DCMAKE_BUILD_TYPE={cfg}",  # not used on MSVC, but no harm
+    ]
+
+    build_args = ["--config Release", "--verbose"]
+    # cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 /path/to/src
+
+    if sys.platform.startswith("darwin"):
+        # Cross-compile support for macOS - respect ARCHFLAGS if set
+        archs = re.findall(r"-arch (\S+)", os.environ.get("ARCHFLAGS", ""))
+        if archs:
+            cmake_args += ["-DCMAKE_OSX_ARCHITECTURES={}".format(";".join(archs))]
+
+    if use_temp_dir:
+        build_temp = Path(TemporaryDirectory(suffix=".build-temp").name) / "extension_it_in"
+    else:
+        build_temp = Path(".")
+    # print("cwd:", os.getcwd(), "build-dir:", build_temp, "top:", str(TOP_DIR))
+    if not build_temp.exists():
+        build_temp.mkdir(parents=True)
+
+    banner("Step #1: Configure")
+    # cmake_args += ["--debug-output"]
+    subprocess.run(["cmake", "-S", str(TOP_DIR), *cmake_args], cwd=build_temp, check=True)  # nosec
+
+    cmake_args += [f"--parallel {mp.cpu_count()}"]
+
+    banner("Step #2: Build")
+    # build_args += ["-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"]
+    subprocess.run(["cmake", "--build", str(build_temp), *build_args], cwd=TOP_DIR, check=True)  # nosec
+
+    banner("Step #3: Install")
+    subprocess.run(["cmake", "--install", "."], cwd=build_temp, check=True)  # nosec
+    subprocess.run(["cmake", "--install", build_temp], cwd=TOP_DIR, check=True)  # nosec
+
+
+if __name__ == "__main__":
+    includes = subprocess.getoutput("pybind11-config --cmakedir")  # nosec
+    os.environ["pybind11_DIR"] = includes
+    build_extension(False)

{pyxcp-0.22.1 → pyxcp-0.22.3}/pyproject.toml

@@ -1,6 +1,6 @@
 
 [build-system]
-requires = ["poetry-core>=1.0.0", "setuptools>=68.0.0", "pybind11>=2.12.0",  "pybind11[global]>=2.12.0"]
+requires = ["poetry-core>=1.0.0", "pybind11>=2.12.0",  "pybind11[global]>=2.12.0"]	# "setuptools>=68.0.0",
 build-backend = "poetry.core.masonry.api"
 
 
@@ -36,7 +36,7 @@ dynamic = ["license", "readme", "authors", "requires-python", "description", "cl
 [tool.poetry]
 authors = ["Christoph Schueler <cpu.gems@googlemail.com>"]
 name = "pyxcp"
-version = "0.22.1"
+version = "0.22.3"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]
@@ -63,7 +63,14 @@ include = [
     { path = "pyxcp/recorder/*.so", format = "wheel" },
     { path = "pyxcp/recorder/*.pyd", format = "wheel" },
     { path = "pyxcp/*.exe", format = "wheel" },
-    { path = "CMakeLists.txt", format = "wheel" },
+    { path = "CMakeLists.txt", format = "sdist" },
+
+	{ path = "pyxcp/cpp_ext/*hpp", format = "sdist" },
+	{ path = "pyxcp/cpp_ext/*cpp", format = "sdist" },
+	{ path = "pyxcp/daq_stim/*hpp", format = "sdist" },
+	{ path = "pyxcp/daq_stim/*cpp", format = "sdist" },
+	{ path = "pyxcp/recorder/*hpp", format = "sdist" },
+	{ path = "pyxcp/recorder/*cpp", format = "sdist" },
 ]
 
 [tool.poetry.dependencies]
@@ -112,7 +119,7 @@ show_column_numbers = true
 show_error_context = true
 
 [tool.flake8]
-ignore = ["F403", "D203", "E203", "E266", "E501", "W503", "E501", "F401", "BLK100"]
+ignore = ["D203", "E203", "E266", "E501", "W503", "F403", "F401", "BLK100"]
 exclude = '''
 /(
     \.git
@@ -135,8 +142,8 @@ statistics = true
 show-source = true
 max-line-length = 132
 select = ["B","C","E","F","W","T4","B9"]
-extend-select = "B950"
-extend-ignore = ["E203", "E501", "E701"]
+# extend-select = "B950"
+# extend-ignore = ["E203", "E501", "E701"]
 
 [tool.ruff]
 line-length = 132
@@ -163,16 +170,30 @@ exclude = '''
 [tool.cibuildwheel]
 build-verbosity = 3
 #test-command = "pytest {package}/tests"
-#test-command = "pytest -svv pyxcp/tests"
+
 build = "cp3{8,9,10,11,12,13}-*"
-skip = ["*-manylinux_i686", "*-musllinux_x86_64", "*-musllinux_i686"] # Skip Linux 32bit and MUSL builds.
-build-frontend = "pip"
+skip = ["*-manylinux_i686", "*-musllinux_x86_64", "*-musllinux_i686", "cp38-manylinux*", "cp39-manylinux*"]
+build-frontend = "build"
+
+[tool.cibuildwheel.macos]
+archs = ["x86_64", "universal2", "arm64"]
+
+[tool.cibuildwheel.windows]
+archs = ["AMD64"]	# , "ARM64"
+
+[[tool.cibuildwheel.overrides]]
+select = "cp3?-*"
+manylinux-x86_64-image = "manylinux_2_35"
+manylinux-aarch64-image = "manylinux_2_35"
+
+[tool.cibuildwheel.linux]
+# archs = ["auto", "aarch64"]
+archs = ["x86_64", "aarch64"]
+before-all = "yum install -y libffi openssl openssl-devel gcc"
 
 [tool.pyright]
 include = ["pyxcp", "build_ext.py"]
-ignore = ["pyxcp/conf_test.py", "pyxcp/config_new.py", "pyxcp/config_tr.py", "pyxcp/examples/memxfer.py",
-	"pyxcp/examples/ts_tester.py", "pyxcp/recorder/converter/**", "pyxcp/transport/candriver/**", "pyxcp/recorder/simdjson/**",
-	"pyxcp/recorder/mio/**", "pyxcp/recorder/lz4/**"]
+ignore = ["pyxcp/recorder/converter/**", "pyxcp/recorder/simdjson/**","pyxcp/recorder/mio/**", "pyxcp/recorder/lz4/**"]
 #defineConstant = { DEBUG = true }
 #stubPath = "src/stubs"
 

{pyxcp-0.22.1 → pyxcp-0.22.3}/pyxcp/__init__.py

@@ -17,4 +17,4 @@ tb_install(show_locals=True, max_frames=3)  # Install custom exception handler.
 
 # if you update this manually, do not forget to update
 # .bumpversion.cfg and pyproject.toml.
-__version__ = "0.22.1"
+__version__ = "0.22.3"

pyxcp-0.22.1/build_ext.py

@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-
-import multiprocessing as mp
-import os
-import platform
-import re
-import subprocess  # nosec
-import sys
-from pathlib import Path
-from tempfile import TemporaryDirectory
-
-
-TOP_DIR = Path(__file__).parent
-
-print("Platform", platform.system())
-uname = platform.uname()
-if uname.system == "Darwin":
-    os.environ["MACOSX_DEPLOYMENT_TARGET"] = "11.0"
-
-
-def banner(msg: str) -> None:
-    print("=" * 80)
-    print(str.center(msg, 80))
-    print("=" * 80)
-
-
-def build_extension(debug: bool = False, use_temp_dir: bool = False) -> None:
-    print("CMakeBuild::build_extension()")
-
-    debug = bool(os.environ.get("DEBUG", 0)) or debug
-    cfg = "Debug" if debug else "Release"
-    print(f" BUILD-TYPE: {cfg!r}")
-    cmake_args = [
-        f"-DPYTHON_EXECUTABLE={sys.executable}",
-        f"-DCMAKE_BUILD_TYPE={cfg}",  # not used on MSVC, but no harm
-    ]
-    build_args = ["--config Release", "--verbose"]
-    # cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 /path/to/src
-
-    if sys.platform.startswith("darwin"):
-        # Cross-compile support for macOS - respect ARCHFLAGS if set
-        archs = re.findall(r"-arch (\S+)", os.environ.get("ARCHFLAGS", ""))
-        if archs:
-            cmake_args += ["-DCMAKE_OSX_ARCHITECTURES={}".format(";".join(archs))]
-
-    if use_temp_dir:
-        build_temp = Path(TemporaryDirectory(suffix=".build-temp").name) / "extension_it_in"
-    else:
-        build_temp = Path(".")
-    # print("cwd:", os.getcwd(), "build-dir:", build_temp, "top:", str(TOP_DIR))
-    if not build_temp.exists():
-        build_temp.mkdir(parents=True)
-
-    banner("Step #1: Configure")
-    # cmake_args += ["--debug-output"]
-    subprocess.run(["cmake", str(TOP_DIR), *cmake_args], cwd=build_temp, check=True)  # nosec
-
-    cmake_args += [f"--parallel {mp.cpu_count()}"]
-
-    banner("Step #2: Build")
-    # build_args += ["-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"]
-    subprocess.run(["cmake", "--build", build_temp, *build_args], cwd=TOP_DIR, check=True)  # nosec
-
-    banner("Step #3: Install")
-    # subprocess.run(["cmake", "--install", "."], cwd=build_temp, check=True)  # nosec
-    subprocess.run(["cmake", "--install", build_temp], cwd=TOP_DIR, check=True)  # nosec
-
-
-if __name__ == "__main__":
-    includes = subprocess.getoutput("pybind11-config --cmakedir")  # nosec
-    os.environ["pybind11_DIR"] = includes
-    build_extension(False)