Skip to content

feat: update TaskR #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lterrac merged 4 commits into from
Oct 6, 2025
Merged

feat: update TaskR #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
822366c
fix: fix exception message
lterrac Oct 6, 2025
8b1e293
feat: update TaskR
lterrac Oct 6, 2025
28201c6
ci: disable early fails for warnings
lterrac Oct 6, 2025
ab01dd6
style: format files
lterrac Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/master-test-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-development-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion extern/TaskR
Open in desktop
Submodule TaskR updated 37 files
+6 −1 .build-tools/containers/buildenv/Dockerfile
+1 −0 .build-tools/containers/buildenv/requirements.txt
+7 −30 .github/workflows/master-test-workflow.yml
+2 −2 .github/workflows/master.yml
+0 −67 .github/workflows/pr-development-coverage.yml
+8 −34 .github/workflows/pr-development-workflow.yml
+1 −1 .gitlab-ci.yml
+2 −6 .gitmodules
+2 −2 examples/abcTasks/meson.build
+2 −2 examples/cholesky/meson.build
+8 −8 examples/conditionVariable/meson.build
+2 −2 examples/energySaver/meson.build
+2 −2 examples/fibonacci/meson.build
+21 −20 examples/jacobi3d/meson.build
+3 −1 examples/jacobi3d/source/nosv.cpp
+2 −2 examples/manyParallel/meson.build
+2 −2 examples/multiJob/meson.build
+2 −2 examples/mutex/meson.build
+2 −2 examples/mutex/python/mutex.py
+2 −2 examples/pendingOperation/meson.build
+2 −2 examples/resourceList/meson.build
+2 −2 examples/simple/meson.build
+2 −2 examples/suspend/meson.build
+1 −1 examples/suspend/python/main.py
+1 −1 examples/suspend/python/suspend.py
+2 −2 examples/workerSpecific/meson.build
+1 −0 extern/HiCR
+0 −1 extern/hicr
+0 −1 extern/pybind11
+6 −4 include/pytaskr/README.md
+3 −3 include/pytaskr/meson.build
+0 −5 include/taskr/common.hpp
+27 −21 include/taskr/runtime.hpp
+115 −0 include/taskr/service.hpp
+9 −6 meson.build
+3 −3 meson_options.txt
+1 −1 tests/meson.build
48 changes: 24 additions & 24 deletions include/hllm/channelCreationImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,14 +188,14 @@ __INLINE__ void createChannelBuffers(HiCR::MemoryManager
}

void createChannels(HiCR::MemoryManager &memoryManager,
HiCR::CommunicationManager &communicationManager,
std::shared_ptr<HiCR::MemorySpace> &memorySpace,
std::map<HiCR::GlobalMemorySlot::tag_t, nlohmann::json> &consumersData,
std::map<HiCR::GlobalMemorySlot::tag_t, nlohmann::json> &producersData,
HiCR::GlobalMemorySlot::tag_t channelsIds,
std::map<HiCR::GlobalMemorySlot::tag_t, std::string> &channelTagNameMap,
std::unordered_map<std::string, std::unique_ptr<hLLM::channel::channelConsumerInterface_t>> &consumers,
std::unordered_map<std::string, std::unique_ptr<hLLM::channel::channelProducerInterface_t>> &producers)
HiCR::CommunicationManager &communicationManager,
std::shared_ptr<HiCR::MemorySpace> &memorySpace,
std::map<HiCR::GlobalMemorySlot::tag_t, nlohmann::json> &consumersData,
std::map<HiCR::GlobalMemorySlot::tag_t, nlohmann::json> &producersData,
HiCR::GlobalMemorySlot::tag_t channelsIds,
std::map<HiCR::GlobalMemorySlot::tag_t, std::string> &channelTagNameMap,
std::unordered_map<std::string, std::unique_ptr<hLLM::channel::channelConsumerInterface_t>> &consumers,
std::unordered_map<std::string, std::unique_ptr<hLLM::channel::channelProducerInterface_t>> &producers)
{
std::map<HiCR::GlobalMemorySlot::tag_t, std::vector<HiCR::CommunicationManager::globalKeyMemorySlotPair_t>> memorySlotsToExchange;
std::map<HiCR::GlobalMemorySlot::tag_t, std::shared_ptr<HiCR::LocalMemorySlot>> coordinationBufferSizesSlots;
Expand Down Expand Up @@ -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
7 changes: 5 additions & 2 deletions include/hllm/engine.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<void()> RPCListeningService = [this]() {
std::function<void()> RPCListeningServiceFc = [this]() {
if (_rpcEngine->hasPendingRPCs()) _rpcEngine->listen();
};
_taskr->addService(&RPCListeningService);
_rpcListeningService = std::make_unique<taskr::Service>(RPCListeningServiceFc, 50);
_taskr->addService(_rpcListeningService.get());

// Running TaskR
_taskr->run();
Expand Down Expand Up @@ -626,6 +627,8 @@ class Engine final
HiCR::Instance::instanceId_t _deployerInstanceId;

std::map<partitionId_t, deployr::Runner::runnerId_t> _partitionRunnerIdMap;

std::unique_ptr<taskr::Service> _rpcListeningService;
}; // class Engine

} // namespace hLLM
Expand Down
4 changes: 2 additions & 2 deletions include/hllm/parseConfigImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ __INLINE__ std::unordered_map<std::string, nlohmann::json> Engine::parseDependen
{
if (dependenciesMap.contains(output) == false)
{
HICR_THROW_RUNTIME("Producer %s defined in partition %s has no consumers defined", output.get<std::string>(), partition["Name"]);
HICR_THROW_RUNTIME("Producer %s defined in partition %s has no consumers defined", output.get<std::string>().c_str(), partition["Name"].get<std::string>().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<std::string>().c_str(),
hicr::json::getNumber<partitionId_t>(dependenciesMap[output], "Producer"),
hicr::json::getString(partition, "Name").c_str());
}
Expand Down
Loading