-
Notifications
You must be signed in to change notification settings - Fork 179
[onert] Implement BulkPipelineModel for Trix model execution #16332
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,281 @@ | ||
| /* | ||
| * Copyright (c) 2025 Samsung Electronics Co., Ltd. All Rights Reserved | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include "BulkPipelineModel.h" | ||
|
|
||
| #include <iostream> | ||
| #include <cstring> | ||
| #include <algorithm> | ||
|
|
||
| namespace onert | ||
| { | ||
| namespace backend | ||
| { | ||
| namespace trix | ||
| { | ||
| namespace ops | ||
| { | ||
|
|
||
| BulkPipelineModel::BulkPipelineModel(const std::string &model_path, int device_id) | ||
| : _model_path(model_path), _device_id(device_id) | ||
| { | ||
| // DO NOTHING | ||
| } | ||
|
|
||
| BulkPipelineModel::~BulkPipelineModel() { release(); } | ||
|
|
||
| bool BulkPipelineModel::initialize() | ||
| { | ||
| if (_initialized.load()) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| if (!loadMetadata()) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| _initialized = true; | ||
| return true; | ||
| } | ||
|
|
||
| bool BulkPipelineModel::prepare() | ||
| { | ||
| if (_prepared.load()) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| try | ||
| { | ||
| openDevice(); | ||
| allocateBuffers(); | ||
| fillBuffers(); | ||
| markBufferReady(); | ||
| registerModel(); | ||
|
|
||
| _prepared = true; | ||
| return true; | ||
| } | ||
| catch (const std::exception &e) | ||
| { | ||
| std::cerr << "Failed to prepare model " << _model_path << ": " << e.what() << std::endl; | ||
| release(); | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| void BulkPipelineModel::release() | ||
| { | ||
| if (!_prepared.load()) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| unregisterModel(); | ||
| closeDevice(); | ||
|
|
||
| if (_fp) | ||
| { | ||
| fclose(_fp); | ||
| _fp = nullptr; | ||
| } | ||
|
|
||
| _program_buffer.reset(); | ||
| _weight_buffer.reset(); | ||
| _meta.reset(); | ||
| _meta_size = 0; | ||
| _model_id = 0; | ||
|
|
||
| _prepared = false; | ||
| } | ||
|
|
||
| void BulkPipelineModel::run(const std::vector<const IPortableTensor *> &inputs, | ||
| std::vector<IPortableTensor *> &outputs) | ||
| { | ||
| if (!_prepared.load()) | ||
| { | ||
| throw std::runtime_error("Model is not prepared: " + _model_path); | ||
| } | ||
|
|
||
| if (!_meta) | ||
| { | ||
| throw std::runtime_error("Model metadata is not loaded: " + _model_path); | ||
| } | ||
|
|
||
| // Prepare input buffers | ||
| input_buffers input; | ||
| input.num_buffers = _meta->input_seg_num; | ||
| for (uint32_t i = 0; i < input.num_buffers; i++) | ||
| { | ||
| uint32_t idx = _meta->input_seg_idx[i]; | ||
| input.bufs[i].addr = inputs[i]->buffer(); | ||
| input.bufs[i].type = BUFFER_MAPPED; | ||
| input.bufs[i].size = _meta->segment_size[idx]; | ||
| } | ||
|
|
||
| // Prepare output buffers | ||
| output_buffers output; | ||
| output.num_buffers = _meta->output_seg_num; | ||
| for (uint32_t i = 0; i < output.num_buffers; i++) | ||
| { | ||
| uint32_t idx = _meta->output_seg_idx[i]; | ||
| output.bufs[i].addr = outputs[i]->buffer(); | ||
| output.bufs[i].type = BUFFER_MAPPED; | ||
| output.bufs[i].size = _meta->segment_size[idx]; | ||
| } | ||
|
|
||
| // Execute the model | ||
| int ret = runNPU_model(_dev, _model_id, NPU_INFER_BLOCKING, &input, &output, nullptr, nullptr); | ||
| if (ret < 0) | ||
| { | ||
| throw std::runtime_error("runNPU_model() failed for " + _model_path + | ||
| ", ret: " + std::to_string(ret)); | ||
| } | ||
| } | ||
|
|
||
| void BulkPipelineModel::waitForBufferReady() | ||
| { | ||
| std::unique_lock<std::mutex> lock(_buffer_mutex); | ||
| _buffer_cv.wait(lock, [this] { return _buffer_ready.load(); }); | ||
| } | ||
|
|
||
| void BulkPipelineModel::markBufferReady() | ||
| { | ||
| { | ||
| std::lock_guard<std::mutex> lock(_buffer_mutex); | ||
| _buffer_ready = true; | ||
| } | ||
| _buffer_cv.notify_all(); | ||
| } | ||
|
|
||
| bool BulkPipelineModel::loadMetadata() | ||
| { | ||
| _fp = fopen(_model_path.c_str(), "rb"); | ||
| if (!_fp) | ||
| { | ||
| throw std::runtime_error("Failed to open model file: " + _model_path); | ||
| } | ||
|
|
||
| _meta = std::make_unique<npubin_meta>(); | ||
| if (fread(_meta.get(), NPUBIN_META_SIZE, 1, _fp) != 1) | ||
| { | ||
| throw std::runtime_error("Failed to read metadata from: " + _model_path); | ||
| } | ||
|
|
||
| _meta_size = _meta->extended_metasize ? sizeof(npubin_meta) + _meta->extended_metasize | ||
| : NPUBIN_META_TOTAL_SIZE(_meta->magiccode); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| void BulkPipelineModel::allocateBuffers() | ||
| { | ||
| if (!_meta) | ||
| { | ||
| throw std::runtime_error("Metadata not loaded for: " + _model_path); | ||
| } | ||
|
|
||
| _program_buffer = | ||
| std::make_shared<BulkPipelineBuffer>(BulkPipelineBuffer::BufferType::DMABUF_CONT, | ||
| static_cast<size_t>(_meta->program_size), _device_id); | ||
|
|
||
| _weight_buffer = | ||
| std::make_shared<BulkPipelineBuffer>(BulkPipelineBuffer::BufferType::DMABUF_IOMMU, | ||
| static_cast<size_t>(_meta->weight_size), _device_id); | ||
|
|
||
| _program_buffer->allocate(); | ||
| if (_meta->weight_size > 0) | ||
| { | ||
| _weight_buffer->allocate(); | ||
| } | ||
| } | ||
|
|
||
| void BulkPipelineModel::fillBuffers() | ||
| { | ||
| if (!_fp || !_program_buffer || !_weight_buffer) | ||
| { | ||
| throw std::runtime_error("Buffers not properly initialized for: " + _model_path); | ||
| } | ||
|
|
||
| // Fill program buffer | ||
| _program_buffer->fillFromFile(_fp, _meta_size); | ||
|
|
||
| // Fill weight buffer | ||
| if (_weight_buffer->size() > 0) | ||
| { | ||
| _weight_buffer->fillFromFile(_fp, _meta_size + _meta->program_size); | ||
| } | ||
| } | ||
|
|
||
| void BulkPipelineModel::registerModel() | ||
| { | ||
| if (!_dev || !_program_buffer || !_weight_buffer) | ||
| { | ||
| throw std::runtime_error("Device or buffers not ready for: " + _model_path); | ||
| } | ||
|
|
||
| generic_buffer modelfile; | ||
| modelfile.type = BUFFER_FILE; | ||
| modelfile.filepath = _model_path.c_str(); | ||
| modelfile.size = _meta->size; | ||
|
|
||
| int ret = registerNPUmodel_ext(_dev, &modelfile, _program_buffer->getGenericBuffer(), | ||
| _weight_buffer->getGenericBuffer(), &_model_id); | ||
| if (ret < 0) | ||
| { | ||
| throw std::runtime_error("Failed to register model: " + _model_path + | ||
| ", ret: " + std::to_string(ret)); | ||
| } | ||
| } | ||
|
|
||
| void BulkPipelineModel::unregisterModel() | ||
| { | ||
| if (_dev && _model_id > 0) | ||
| { | ||
| int ret = unregisterNPUmodel(_dev, _model_id); | ||
| if (ret < 0) | ||
| { | ||
| std::cerr << "Failed to unregister model: " << _model_path << ", ret: " << ret << std::endl; | ||
| } | ||
| _model_id = 0; | ||
| } | ||
| } | ||
|
|
||
| void BulkPipelineModel::openDevice() | ||
| { | ||
| int ret = getNPUdeviceByType(&_dev, NPUCOND_TRIV24_CONN_SOCIP, _device_id); | ||
| if (ret < 0) | ||
| { | ||
| throw std::runtime_error("Failed to open NPU device for: " + _model_path + | ||
| ", ret: " + std::to_string(ret)); | ||
| } | ||
| } | ||
|
|
||
| void BulkPipelineModel::closeDevice() | ||
| { | ||
| if (_dev) | ||
| { | ||
| putNPUdevice(_dev); | ||
| _dev = nullptr; | ||
| } | ||
| } | ||
|
|
||
| } // namespace ops | ||
| } // namespace trix | ||
| } // namespace backend | ||
| } // namespace onert |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,104 @@ | ||||||
| /* | ||||||
| * Copyright (c) 2025 Samsung Electronics Co., Ltd. All Rights Reserved | ||||||
| * | ||||||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||||||
| * you may not use this file except in compliance with the License. | ||||||
| * You may obtain a copy of the License at | ||||||
| * | ||||||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||||||
| * | ||||||
| * Unless required by applicable law or agreed to in writing, software | ||||||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||||||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||
| * See the License for the specific language governing permissions and | ||||||
| * limitations under the License. | ||||||
| */ | ||||||
|
|
||||||
| #ifndef __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__ | ||||||
| #define __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__ | ||||||
|
|
||||||
| #include <memory> | ||||||
| #include <string> | ||||||
| #include <vector> | ||||||
| #include <mutex> | ||||||
| #include <condition_variable> | ||||||
| #include <future> | ||||||
| #include <atomic> | ||||||
| #include <backend/IPortableTensor.h> | ||||||
| #include <libnpuhost.h> | ||||||
|
|
||||||
| #include "BulkPipelineBuffer.h" | ||||||
|
|
||||||
| namespace onert | ||||||
| { | ||||||
| namespace backend | ||||||
| { | ||||||
| namespace trix | ||||||
| { | ||||||
| namespace ops | ||||||
| { | ||||||
|
|
||||||
| class BulkPipelineModel | ||||||
| { | ||||||
| public: | ||||||
| BulkPipelineModel(const std::string &model_path, int device_id); | ||||||
| ~BulkPipelineModel(); | ||||||
|
|
||||||
| // Disallow copying | ||||||
| BulkPipelineModel(const BulkPipelineModel &) = delete; | ||||||
| BulkPipelineModel &operator=(const BulkPipelineModel &) = delete; | ||||||
|
|
||||||
| bool initialize(); | ||||||
| bool prepare(); | ||||||
| void release(); | ||||||
| bool isPrepared() const { return _prepared; } | ||||||
|
|
||||||
| void run(const std::vector<const IPortableTensor *> &inputs, | ||||||
| std::vector<IPortableTensor *> &outputs); | ||||||
|
|
||||||
| void waitForBufferReady(); | ||||||
| void markBufferReady(); | ||||||
|
|
||||||
| const npubin_meta *metadata() const { return _meta.get(); } | ||||||
| uint64_t programSize() const { return _meta->program_size; } | ||||||
| uint64_t weightSize() const { return _meta->weight_size; } | ||||||
| uint32_t modelId() const { return _model_id; } | ||||||
| npudev_h device() const { return _dev; } | ||||||
| const std::string &modelPath() const { return _model_path; } | ||||||
|
|
||||||
| private: | ||||||
| bool loadMetadata(); | ||||||
| void allocateBuffers(); | ||||||
| void fillBuffers(); | ||||||
| void registerModel(); | ||||||
| void unregisterModel(); | ||||||
| void openDevice(); | ||||||
| void closeDevice(); | ||||||
|
|
||||||
| private: | ||||||
| std::string _model_path; | ||||||
| int _device_id; | ||||||
| std::atomic<bool> _initialized{false}; | ||||||
| std::atomic<bool> _prepared{false}; | ||||||
|
|
||||||
| npudev_h _dev; | ||||||
| uint32_t _model_id{0}; | ||||||
|
|
||||||
| std::unique_ptr<npubin_meta> _meta; | ||||||
| size_t _meta_size{0}; | ||||||
| FILE *_fp{nullptr}; | ||||||
|
|
||||||
| std::shared_ptr<BulkPipelineBuffer> _program_buffer; | ||||||
| std::shared_ptr<BulkPipelineBuffer> _weight_buffer; | ||||||
|
|
||||||
| std::mutex _buffer_mutex; | ||||||
| std::condition_variable _buffer_cv; | ||||||
| std::atomic<bool> _buffer_ready{false}; | ||||||
| }; | ||||||
|
|
||||||
| } // namespace ops | ||||||
| } // namespace trix | ||||||
| } // namespace backend | ||||||
| } // namespace onert | ||||||
|
|
||||||
| #endif // __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__ | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please put a few
_between CamelStyle words?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found that I already did same typo errors in over previous commits ;(
Can I revise them all in other PR?