Skip to content

Commit e37d6e7

Browse files
authored
[onert] Refactor header guard and namespace formatting in BulkPipeline (#16342)
This commit updates header guard names and nested namespace declarations in bulk pipeline headers. This improves code consistency and readability. ONE-DCO-1.0-Signed-off-by: Jonghwa Lee <[email protected]>
1 parent dae2d8a commit e37d6e7

6 files changed

Lines changed: 21 additions & 75 deletions

File tree

runtime/onert/backend/trix/ops/BulkPipelineBuffer.cc

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,7 @@
2323
#include <cstring>
2424
#include <iostream>
2525

26-
namespace onert
27-
{
28-
namespace backend
29-
{
30-
namespace trix
31-
{
32-
namespace ops
26+
namespace onert::backend::trix::ops
3327
{
3428

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

173-
} // namespace ops
174-
} // namespace trix
175-
} // namespace backend
176-
} // namespace onert
167+
} // namespace onert::backend::trix::ops

runtime/onert/backend/trix/ops/BulkPipelineBuffer.h

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEBUFFER_H__
18-
#define __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEBUFFER_H__
17+
#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_BUFFER_H__
18+
#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_BUFFER_H__
1919

2020
#include <memory>
2121
#include <cstdio>
2222
#include <stdexcept>
2323
#include <libnpuhost.h>
2424

25-
namespace onert
26-
{
27-
namespace backend
28-
{
29-
namespace trix
30-
{
31-
namespace ops
25+
namespace onert::backend::trix::ops
3226
{
3327

3428
class BulkPipelineBuffer
@@ -70,9 +64,6 @@ class BulkPipelineBuffer
7064
generic_buffer *_buffer{nullptr};
7165
};
7266

73-
} // namespace ops
74-
} // namespace trix
75-
} // namespace backend
76-
} // namespace onert
67+
} // namespace onert::backend::trix::ops
7768

78-
#endif // __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEBUFFER_H__
69+
#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_BUFFER_H__

runtime/onert/backend/trix/ops/BulkPipelineManager.cc

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@
2222
#include <thread>
2323
#include <chrono>
2424

25-
namespace onert
26-
{
27-
namespace backend
28-
{
29-
namespace trix
30-
{
31-
namespace ops
25+
namespace onert::backend::trix::ops
3226
{
3327

3428
BulkPipelineManager::BulkPipelineManager(const PipelineConfig &config) : _config(config)
@@ -169,7 +163,4 @@ void BulkPipelineManager::prepareModels()
169163
}
170164
}
171165

172-
} // namespace ops
173-
} // namespace trix
174-
} // namespace backend
175-
} // namespace onert
166+
} // namespace onert::backend::trix::ops

runtime/onert/backend/trix/ops/BulkPipelineManager.h

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPE_LINE_MANAGER_H__
18-
#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPE_LINE_MANAGER_H__
17+
#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MANAGER_H__
18+
#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MANAGER_H__
1919

2020
#include <memory>
2121
#include <vector>
@@ -27,13 +27,7 @@
2727
#include <backend/IPortableTensor.h>
2828
#include "BulkPipelineModel.h"
2929

30-
namespace onert
31-
{
32-
namespace backend
33-
{
34-
namespace trix
35-
{
36-
namespace ops
30+
namespace onert::backend::trix::ops
3731
{
3832

3933
class BulkPipelineManager
@@ -72,9 +66,6 @@ class BulkPipelineManager
7266
std::vector<std::shared_ptr<BulkPipelineModel>> _models;
7367
};
7468

75-
} // namespace ops
76-
} // namespace trix
77-
} // namespace backend
78-
} // namespace onert
69+
} // namespace onert::backend::trix::ops
7970

80-
#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPE_LINE_MANAGER_H__
71+
#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MANAGER_H__

runtime/onert/backend/trix/ops/BulkPipelineModel.cc

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,7 @@
2020
#include <cstring>
2121
#include <algorithm>
2222

23-
namespace onert
24-
{
25-
namespace backend
26-
{
27-
namespace trix
28-
{
29-
namespace ops
23+
namespace onert::backend::trix::ops
3024
{
3125

3226
BulkPipelineModel::BulkPipelineModel(const std::string &model_path, int device_id)
@@ -275,7 +269,4 @@ void BulkPipelineModel::closeDevice()
275269
}
276270
}
277271

278-
} // namespace ops
279-
} // namespace trix
280-
} // namespace backend
281-
} // namespace onert
272+
} // namespace onert::backend::trix::ops

runtime/onert/backend/trix/ops/BulkPipelineModel.h

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__
18-
#define __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__
17+
#ifndef __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MODEL_H__
18+
#define __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MODEL_H__
1919

2020
#include <memory>
2121
#include <string>
@@ -29,13 +29,7 @@
2929

3030
#include "BulkPipelineBuffer.h"
3131

32-
namespace onert
33-
{
34-
namespace backend
35-
{
36-
namespace trix
37-
{
38-
namespace ops
32+
namespace onert::backend::trix::ops
3933
{
4034

4135
class BulkPipelineModel
@@ -96,9 +90,6 @@ class BulkPipelineModel
9690
std::atomic<bool> _buffer_ready{false};
9791
};
9892

99-
} // namespace ops
100-
} // namespace trix
101-
} // namespace backend
102-
} // namespace onert
93+
} // namespace onert::backend::trix::ops
10394

104-
#endif // __ONERT_BACKEND_TRIX_OPS_BULKPIPELINEMODEL_H__
95+
#endif // __ONERT_BACKEND_TRIX_OPS_BULK_PIPELINE_MODEL_H__

0 commit comments

Comments
 (0)