Skip to content

Commit 3fa3fe8

Browse files
authored
Add support for ONNXRuntime 1.22.00 (#14419)
1 parent c978bd4 commit 3fa3fe8

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

Common/ML/include/ML/OrtInterface.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ struct MemoryInfo;
3434
struct Env;
3535
} // namespace Ort
3636

37-
namespace o2
38-
{
39-
40-
namespace ml
37+
namespace o2::ml
4138
{
4239

4340
class OrtModel
@@ -127,8 +124,6 @@ class OrtModel
127124
std::string printShape(const std::vector<std::vector<int64_t>>&, std::vector<std::string>&);
128125
};
129126

130-
} // namespace ml
131-
132-
} // namespace o2
127+
} // namespace o2::ml
133128

134129
#endif // O2_ML_ORTINTERFACE_H

Common/ML/src/OrtInterface.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,9 @@ std::vector<O> OrtModel::inference(std::vector<I>& input)
287287
return outputValuesVec;
288288
}
289289

290-
template std::vector<float> OrtModel::inference<float, float>(std::vector<float>&);
291-
template std::vector<float> OrtModel::inference<OrtDataType::Float16_t, float>(std::vector<OrtDataType::Float16_t>&);
292-
template std::vector<OrtDataType::Float16_t> OrtModel::inference<OrtDataType::Float16_t, OrtDataType::Float16_t>(std::vector<OrtDataType::Float16_t>&);
290+
template std::vector<float> o2::ml::OrtModel::inference<float, float>(std::vector<float>&);
291+
template std::vector<float> o2::ml::OrtModel::inference<OrtDataType::Float16_t, float>(std::vector<OrtDataType::Float16_t>&);
292+
template std::vector<OrtDataType::Float16_t> o2::ml::OrtModel::inference<OrtDataType::Float16_t, OrtDataType::Float16_t>(std::vector<OrtDataType::Float16_t>&);
293293

294294
template <class I, class O>
295295
void OrtModel::inference(I* input, int64_t input_size, O* output)

GPU/GPUTracking/TPCClusterFinder/GPUTPCNNClusterizerHost.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include <vector>
2121
#include "ML/OrtInterface.h"
2222

23-
using namespace o2::ml;
24-
2523
class OrtMemoryInfo;
2624
class OrtAllocator;
2725
struct MockedOrtAllocator;

0 commit comments

Comments
 (0)