Build Test

Author: Kevin Vu te Laar

.gitlab-ci.yml

@@ -173,7 +173,10 @@ test:unit:
   image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}
   script:
     - cmake -S . -B build ${CMAKE_OPTS}
-    - export PYTHONPATH=$PYTHONPATH:${PWD}/build/python/binding/:${PWD}/python/villas/node/
+    - cmake --build build ${CMAKE_BUILD_OPTS} --target python_binding
+    - export PYTHONPATH=$PYTHONPATH:${PWD}/python/villas/node/
+    - python_binding=$(find ${PWD}/build/python/binding/ -name "python_binding*.so" | head -n1)
+    - ls -ln "$python_binding" ${PWD}/python/villas/node/$(basename "$python_binding")
     - cmake --build build ${CMAKE_BUILD_OPTS} --target run-unit-tests run-unit-tests-common run-python-unit-tests
   needs:
     - job: "build:source: [fedora]"
@@ -184,7 +187,10 @@ test:integration:
   image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}
   script:
     - cmake -S . -B build ${CMAKE_OPTS}
-    - export PYTHONPATH=$PYTHONPATH:${PWD}/build/python/binding/:${PWD}/python/villas/node/
+    - cmake --build build ${CMAKE_BUILD_OPTS} --target python_binding
+    - export PYTHONPATH=$PYTHONPATH:${PWD}/python/villas/node/
+    - python_binding=$(find ${PWD}/build/python/binding/ -name "python_binding*.so" | head -n1)
+    - ls -ln "$python_binding" ${PWD}/python/villas/node/$(basename "$python_binding")
     - cmake --build build ${CMAKE_BUILD_OPTS} --target run-integration-tests run-python-integration-tests
   artifacts:
     name: ${CI_PROJECT_NAME}-integration-tests-${CI_BUILD_REF}

lib/api/requests/graph.cpp

@@ -45,7 +45,7 @@ class GraphRequest : public Request {
     auto *graph = sn->getGraph();
 
     char *data;
-    unsigned len;
+    size_t len;
 
     std::list<std::string> supportedLayouts = {
         "circo", "dot",   "fdp",       "neato", "nop",  "nop1",

python/binding/CMakeLists.txt

@@ -11,25 +11,29 @@ if(pybind11_FOUND)
   find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
 
   execute_process(
-    COMMAND "${Python3_EXECUTABLE}" -c "import sysconfig; print(sysconfig.get_path('stdlib') + '/lib-dynload')"
-    OUTPUT_VARIABLE PYTHON_LIB_DYNLOAD_DIR
+    COMMAND "${Python3_EXECUTABLE}" -c "import sysconfig; print(sysconfig.get_path('purelib'))"
+    OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
 
   message(STATUS "Found Python version: ${Python_VERSION}")
   message(STATUS "Python major version: ${Python_VERSION_MAJOR}")
   message(STATUS "Python minor version: ${Python_VERSION_MINOR}")
-  message(STATUS "Python .so install directory: ${PYTHON_LIB_DYNLOAD_DIR}")
 
-  pybind11_add_module(python-binding villas-python-binding.cpp)
-  set_target_properties(python-binding PROPERTIES OUTPUT_NAME villas_node)
-  target_link_libraries(python-binding PUBLIC villas)
+  pybind11_add_module(python_binding python_binding.cpp)
+  target_link_libraries(python_binding PUBLIC villas)
 
   install(
-    TARGETS python-binding
+    TARGETS python_binding
     COMPONENT lib
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${PYTHON_LIB_DYNLOAD_DIR}
+    LIBRARY DESTINATION ${PYTHON_SITE_PACKAGES}/villas/node
+  )
+  file(WRITE "${CMAKE_BINARY_DIR}/python/villas/__init__.py" "")
+  file(WRITE "${CMAKE_BINARY_DIR}/python/villas/node/__init__.py" "")
+  install(
+    DIRECTORY "${CMAKE_BINARY_DIR}/python/villas"
+    DESTINATION "${PYTHON_SITE_PACKAGES}"
+    FILES_MATCHING PATTERN "__init__.py"
   )
 else()
   message(STATUS "pybind11 not found. Skipping Python wrapper build.")

python/binding/villas-python-binding.cpp python/binding/python_binding.cpppython/binding/villas-python-binding.cpp renamed to python/binding/python_binding.cpp

@@ -67,7 +67,7 @@ class Array {
  * @param villas_node   Name of the module to be bound
  * @param m             Access variable for modifying the module code
  */
-PYBIND11_MODULE(villas_node, m) {
+PYBIND11_MODULE(python_binding, m) {
   m.def("memory_init", &memory_init);
 
   m.def("node_check", [](void *n) -> int { return node_check((vnode *)n); });

python/villas/node/binding.py

@@ -10,7 +10,7 @@
 import json
 import logging
 
-import villas_node as vn
+import villas.node.python_binding as vn
 
 logger = logging.getLogger("villas.node")
 

python/villas/node/python_binding.pyi

@@ -0,0 +1,63 @@
+import typing
+from typing import Any, overload
+
+Array = Any
+capsule = Any
+timespec = Any
+
+
+class SamplesArray:
+    def __init__(self, len: int) -> None: ...
+    def bulk_alloc(self, arg0: int, arg1: int, arg2: int) -> None: ...
+    def get_block(self, arg0: int) -> capsule: ...
+    def __getitem__(self, arg0: int) -> capsule: ...
+    def __iter__(self) -> typing.Iterator[capsule]: ...
+    def __setitem__(self, arg0: int, arg1: capsule) -> None: ...
+
+
+def memory_init(arg0: int) -> int: ...
+def node_check(arg0: capsule) -> int: ...
+def node_destroy(arg0: capsule) -> int: ...
+def node_details(arg0: capsule) -> str: ...
+def node_input_signals_max_cnt(arg0: capsule) -> int: ...
+def node_is_enabled(arg0: capsule) -> bool: ...
+def node_is_valid_name(arg0: str) -> bool: ...
+def node_name(arg0: capsule) -> str: ...
+def node_name_full(arg0: capsule) -> str: ...
+def node_name_short(arg0: capsule) -> str: ...
+def node_netem_fds(arg0: capsule, arg1: int) -> int: ...
+def node_new(arg0: str, arg1: str) -> capsule: ...
+def node_output_signals_max_cnt(arg0: capsule) -> int: ...
+def node_pause(arg0: capsule) -> int: ...
+def node_poll_fds(arg0: capsule, arg1: int) -> int: ...
+def node_prepare(arg0: capsule) -> int: ...
+@overload
+def node_read(arg0: capsule, arg1: Array, arg2: int) -> int: ...
+@overload
+def node_read(arg0: capsule, arg1: capsule, arg2: int) -> int: ...  # type: ignore[overload-cannot-match]
+def node_restart(arg0: capsule) -> int: ...
+def node_resume(arg0: capsule) -> int: ...
+def node_reverse(arg0: capsule) -> int: ...
+def node_start(arg0: capsule) -> int: ...
+def node_stop(arg0: capsule) -> int: ...
+def node_to_json_str(arg0: capsule) -> str: ...
+@overload
+def node_write(arg0: capsule, arg1: Array, arg2: int) -> int: ...
+@overload
+def node_write(arg0: capsule, arg1: capsule, arg2: int) -> int: ...  # type: ignore[overload-cannot-match]
+def sample_alloc(arg0: int) -> capsule: ...
+def sample_decref(arg0: capsule) -> None: ...
+def sample_length(arg0: capsule) -> int: ...
+def sample_pack(
+    arg0: int, arg1: timespec, arg2: timespec, arg3: int, arg4: float
+) -> capsule: ...
+def sample_unpack(
+    arg0: capsule,
+    arg1: int,
+    arg2: timespec,
+    arg3: timespec,
+    arg4: int,
+    arg5: int,
+    arg6: float,
+) -> None: ...
+def smps_array(arg0: int) -> Array: ...

tests/integration/CMakeLists.txt

@@ -22,7 +22,7 @@ add_custom_target(run-python-integration-tests
     COMMAND
         python3 -m unittest discover ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS
-        python-binding
+        python_binding
     USES_TERMINAL
 )