Fix stubgen searching

arbor-sim · Dec 4, 2024 · c5a3421 · c5a3421
1 parent 39b9fff
commit c5a3421
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/arbor/simulation.cpp b/arbor/simulation.cpp
@@ -36,12 +36,13 @@ auto split_sorted_range(Seq&& seq, const Value& v, Less cmp = Less{}) {
 
 // Create a new cell event_lane vector from sorted pending events, previous event_lane events,
 // and events from event generators for the given interval.
-ARB_ARBOR_API void merge_cell_events(time_type t_from,
-                                     time_type t_to,
-                                     event_span old_events,
-                                     event_span pending,
-                                     std::vector<event_generator>& generators,
-                                     pse_vector& new_events) {
+ARB_ARBOR_API void
+merge_cell_events(time_type t_from,
+                  time_type t_to,
+                  event_span old_events,                       // (spike_event*, spike_event*)
+                  event_span pending,                          // (spike_event*, spike_event*)
+                  std::vector<event_generator>& generators,
+                  pse_vector& new_events) {                    // [spike_event] sorted by time
     PE(communication:enqueue:setup);
     new_events.clear();
     constexpr auto event_time_less = [](auto const& l, auto const& r) noexcept {

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -111,7 +111,11 @@ endif()
 
 # generate type stubs and copy them to the expected places
 if(ARB_BUILD_PYTHON_STUBS)
-  find_program(PB11_STUBGEN NAMES pybind11-stubgen REQUIRED)
+  find_program(PB11_STUBGEN
+               NAMES pybind11-stubgen
+               NO_DEFAULT_PATH # do not fall into CMake weirdness with paths
+               PATHS ENV PATH  # but _do_ use $PATH
+               REQUIRED)
   add_custom_command(TARGET pyarb POST_BUILD
                      COMMAND
                        PYTHONPATH=${CMAKE_BINARY_DIR}/python:$ENV{PYTHONPATH} ${PB11_STUBGEN} -o ${CMAKE_BINARY_DIR}/stubs arbor