From 822366c85eefde0cdce7588500ced7adb8d630fc Mon Sep 17 00:00:00 2001 From: Luca Terracciano Date: Mon, 6 Oct 2025 13:58:02 +0200 Subject: [PATCH 1/4] fix: fix exception message --- include/hllm/parseConfigImpl.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/hllm/parseConfigImpl.hpp b/include/hllm/parseConfigImpl.hpp index 62a3f7b..cd9538d 100644 --- a/include/hllm/parseConfigImpl.hpp +++ b/include/hllm/parseConfigImpl.hpp @@ -51,13 +51,13 @@ __INLINE__ std::unordered_map Engine::parseDependen { if (dependenciesMap.contains(output) == false) { - HICR_THROW_RUNTIME("Producer %s defined in partition %s has no consumers defined", output.get(), partition["Name"]); + HICR_THROW_RUNTIME("Producer %s defined in partition %s has no consumers defined", output.get().c_str(), partition["Name"].get().c_str()); } if (dependenciesMap[output].contains("Producer")) { HICR_THROW_RUNTIME("Set two producers for buffered dependency %s is not allowed. Producer: %s, tried to add %s", - output, + output.get().c_str(), hicr::json::getNumber(dependenciesMap[output], "Producer"), hicr::json::getString(partition, "Name").c_str()); } From 8b1e29377f034f83a2628198f96ce68d4607df23 Mon Sep 17 00:00:00 2001 From: Luca Terracciano Date: Mon, 6 Oct 2025 13:59:54 +0200 Subject: [PATCH 2/4] feat: update TaskR --- extern/TaskR | 2 +- include/hllm/engine.hpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/extern/TaskR b/extern/TaskR index bac7f45..fafba44 160000 --- a/extern/TaskR +++ b/extern/TaskR @@ -1 +1 @@ -Subproject commit bac7f45b10e35f3abf3b282f6a08e81e2927c28c +Subproject commit fafba4452f38b6982ed28a0ae5d2f23c147f6cac diff --git a/include/hllm/engine.hpp b/include/hllm/engine.hpp index a44d0f2..b1434e5 100644 --- a/include/hllm/engine.hpp +++ b/include/hllm/engine.hpp @@ -498,10 +498,11 @@ class Engine final _taskr->setTaskCallbackHandler(HiCR::tasking::Task::callback_t::onTaskSuspend, [&](taskr::Task *task) { _taskr->resumeTask(task); }); // Setting service to listen for incoming administrative messages - std::function RPCListeningService = [this]() { + std::function RPCListeningServiceFc = [this]() { if (_rpcEngine->hasPendingRPCs()) _rpcEngine->listen(); }; - _taskr->addService(&RPCListeningService); + _rpcListeningService = std::make_unique(RPCListeningServiceFc, 50); + _taskr->addService(_rpcListeningService.get()); // Running TaskR _taskr->run(); @@ -626,6 +627,8 @@ class Engine final HiCR::Instance::instanceId_t _deployerInstanceId; std::map _partitionRunnerIdMap; + + std::unique_ptr _rpcListeningService; }; // class Engine } // namespace hLLM From 28201c64b9f9b863974be8b1e9c3c4be07be7b8b Mon Sep 17 00:00:00 2001 From: Luca Terracciano Date: Mon, 6 Oct 2025 14:00:44 +0200 Subject: [PATCH 3/4] ci: disable early fails for warnings --- .github/workflows/master-test-workflow.yml | 2 +- .github/workflows/pr-development-workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master-test-workflow.yml b/.github/workflows/master-test-workflow.yml index 6004998..a4781c5 100644 --- a/.github/workflows/master-test-workflow.yml +++ b/.github/workflows/master-test-workflow.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v4 - name: Setup - run: source /home/hicr/.bashrc && meson setup build -Dengines=mpi,cloudr -Db_coverage=true -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true + run: source /home/hicr/.bashrc && meson setup build -Dengines=mpi,cloudr -Db_coverage=true -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=false - name: Compile run: source /home/hicr/.bashrc && meson compile -C build diff --git a/.github/workflows/pr-development-workflow.yml b/.github/workflows/pr-development-workflow.yml index ce0ec05..b2df216 100644 --- a/.github/workflows/pr-development-workflow.yml +++ b/.github/workflows/pr-development-workflow.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v4 - name: Setup - run: source /home/hicr/.bashrc && meson setup build -Db_coverage=true -Dengines=mpi,cloudr -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true + run: source /home/hicr/.bashrc && meson setup build -Db_coverage=true -Dengines=mpi,cloudr -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=false - name: Compile run: source /home/hicr/.bashrc && meson compile -C build From ab01dd61df60eed53896203264ddde8b7bc5131e Mon Sep 17 00:00:00 2001 From: Luca Terracciano Date: Mon, 6 Oct 2025 14:04:23 +0200 Subject: [PATCH 4/4] style: format files --- include/hllm/channelCreationImpl.hpp | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/include/hllm/channelCreationImpl.hpp b/include/hllm/channelCreationImpl.hpp index 721368e..a2cb3dd 100644 --- a/include/hllm/channelCreationImpl.hpp +++ b/include/hllm/channelCreationImpl.hpp @@ -188,14 +188,14 @@ __INLINE__ void createChannelBuffers(HiCR::MemoryManager } void createChannels(HiCR::MemoryManager &memoryManager, - HiCR::CommunicationManager &communicationManager, - std::shared_ptr &memorySpace, - std::map &consumersData, - std::map &producersData, - HiCR::GlobalMemorySlot::tag_t channelsIds, - std::map &channelTagNameMap, - std::unordered_map> &consumers, - std::unordered_map> &producers) + HiCR::CommunicationManager &communicationManager, + std::shared_ptr &memorySpace, + std::map &consumersData, + std::map &producersData, + HiCR::GlobalMemorySlot::tag_t channelsIds, + std::map &channelTagNameMap, + std::unordered_map> &consumers, + std::unordered_map> &producers) { std::map> memorySlotsToExchange; std::map> coordinationBufferSizesSlots; @@ -319,22 +319,22 @@ void Engine::createDependencies() } createChannels(*_unbufferedMemoryManager, - *_unbufferedCommunicationManager, - _unbufferedMemorySpace, - unbufferedConsumers, - unbufferedProducers, - unbufferedChannelId, - unbufferedChannelTagNameMap, - _consumers, - _producers); + *_unbufferedCommunicationManager, + _unbufferedMemorySpace, + unbufferedConsumers, + unbufferedProducers, + unbufferedChannelId, + unbufferedChannelTagNameMap, + _consumers, + _producers); createChannels(*_bufferedMemoryManager, - *_bufferedCommunicationManager, - _bufferedMemorySpace, - bufferedConsumers, - bufferedProducers, - bufferedChannelId, - bufferedChannelTagNameMap, - _consumers, - _producers); + *_bufferedCommunicationManager, + _bufferedMemorySpace, + bufferedConsumers, + bufferedProducers, + bufferedChannelId, + bufferedChannelTagNameMap, + _consumers, + _producers); } } // namespace hLLM \ No newline at end of file