Skip to content

[onert] Refactor header guard and namespace formatting in BulkPipeline #16342

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
hseok-oh merged 1 commit into from
Jan 13, 2026
Merged

[onert] Refactor header guard and namespace formatting in BulkPipeline #16342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 2 additions & 11 deletions runtime/onert/backend/trix/ops/BulkPipelineBuffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,7 @@
#include <cstring>
#include <iostream>

namespace onert
{
namespace backend
{
namespace trix
{
namespace ops
namespace onert::backend::trix::ops
{

// FIXME: Using higher level API instead of raw API
Expand Down Expand Up @@ -170,7 +164,4 @@ size_t BulkPipelineBuffer::getAlignedSize(size_t size) const
return (size + _4KB_M_1) & ~_4KB_M_1;
}

} // namespace ops
} // namespace trix
} // namespace backend
} // namespace onert
} // namespace onert::backend::trix::ops
19 changes: 5 additions & 14 deletions runtime/onert/backend/trix/ops/BulkPipelineBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,15 @@
* limitations under the License.
*/

#ifndef __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEBUFFER_H__
#define __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEBUFFER_H__
#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_BUFFER_H__
#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_BUFFER_H__

#include <memory>
#include <cstdio>
#include <stdexcept>
#include <libnpuhost.h>

namespace onert
{
namespace backend
{
namespace trix
{
namespace ops
namespace onert::backend::trix::ops
{

class BulkPipelineBuffer
Expand Down Expand Up @@ -70,9 +64,6 @@ class BulkPipelineBuffer
generic_buffer *_buffer{nullptr};
};

} // namespace ops
} // namespace trix
} // namespace backend
} // namespace onert
} // namespace onert::backend::trix::ops

#endif // __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEBUFFER_H__
#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_BUFFER_H__
13 changes: 2 additions & 11 deletions runtime/onert/backend/trix/ops/BulkPipelineManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,7 @@
#include <thread>
#include <chrono>

namespace onert
{
namespace backend
{
namespace trix
{
namespace ops
namespace onert::backend::trix::ops
{

BulkPipelineManager::BulkPipelineManager(const PipelineConfig &config) : _config(config)
Expand Down Expand Up @@ -169,7 +163,4 @@ void BulkPipelineManager::prepareModels()
}
}

} // namespace ops
} // namespace trix
} // namespace backend
} // namespace onert
} // namespace onert::backend::trix::ops
19 changes: 5 additions & 14 deletions runtime/onert/backend/trix/ops/BulkPipelineManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPE_LINE_MANAGER_H__
#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPE_LINE_MANAGER_H__
#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MANAGER_H__
#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MANAGER_H__

#include <memory>
#include <vector>
Expand All @@ -27,13 +27,7 @@
#include <backend/IPortableTensor.h>
#include "BulkPipelineModel.h"

namespace onert
{
namespace backend
{
namespace trix
{
namespace ops
namespace onert::backend::trix::ops
{

class BulkPipelineManager
Expand Down Expand Up @@ -72,9 +66,6 @@ class BulkPipelineManager
std::vector<std::shared_ptr<BulkPipelineModel>> _models;
};

} // namespace ops
} // namespace trix
} // namespace backend
} // namespace onert
} // namespace onert::backend::trix::ops

#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPE_LINE_MANAGER_H__
#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MANAGER_H__
13 changes: 2 additions & 11 deletions runtime/onert/backend/trix/ops/BulkPipelineModel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@
#include <cstring>
#include <algorithm>

namespace onert
{
namespace backend
{
namespace trix
{
namespace ops
namespace onert::backend::trix::ops
{

BulkPipelineModel::BulkPipelineModel(const std::string &model_path, int device_id)
Expand Down Expand Up @@ -275,7 +269,4 @@ void BulkPipelineModel::closeDevice()
}
}

} // namespace ops
} // namespace trix
} // namespace backend
} // namespace onert
} // namespace onert::backend::trix::ops
19 changes: 5 additions & 14 deletions runtime/onert/backend/trix/ops/BulkPipelineModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#ifndef __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__
#define __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__
#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MODEL_H__
#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MODEL_H__

#include <memory>
#include <string>
Expand All @@ -29,13 +29,7 @@

#include "BulkPipelineBuffer.h"

namespace onert
{
namespace backend
{
namespace trix
{
namespace ops
namespace onert::backend::trix::ops
{

class BulkPipelineModel
Expand Down Expand Up @@ -96,9 +90,6 @@ class BulkPipelineModel
std::atomic<bool> _buffer_ready{false};
};

} // namespace ops
} // namespace trix
} // namespace backend
} // namespace onert
} // namespace onert::backend::trix::ops

#endif // __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__
#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MODEL_H__