Skip to content

Rename cxx conflicts #41

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rename cxx conflicts #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8690474
rename new to nnew to avoid conflict on c++
charlesneimog Sep 20, 2025
102a178
rename operator to op to avoid conflict with c++
charlesneimog Sep 20, 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
4 changes: 2 additions & 2 deletions examples/benchmark/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static void onnx_run_benchmark(struct onnx_context_t * ctx, int count)
{
n = &ctx->g->nodes[i];
if(n->reshape(n))
n->operator(n);
n->op(n);
}
while(count-- > 0)
{
Expand All @@ -128,7 +128,7 @@ static void onnx_run_benchmark(struct onnx_context_t * ctx, int count)
p = profiler_search(m, name);
profiler_begin(p);
if(n->reshape(n))
n->operator(n);
n->op(n);
profiler_end(p);
}
}
Expand Down
52 changes: 26 additions & 26 deletions src/default/Abs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,73 +170,73 @@ void resolver_default_op_Abs(struct onnx_node_t * n)
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_int8;
n->op = Abs_int8;
break;
case ONNX_TENSOR_TYPE_INT16:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_int16;
n->op = Abs_int16;
break;
case ONNX_TENSOR_TYPE_INT32:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_int32;
n->op = Abs_int32;
break;
case ONNX_TENSOR_TYPE_INT64:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_int64;
n->op = Abs_int64;
break;
case ONNX_TENSOR_TYPE_UINT8:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_uint8;
n->op = Abs_uint8;
break;
case ONNX_TENSOR_TYPE_UINT16:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_uint16;
n->op = Abs_uint16;
break;
case ONNX_TENSOR_TYPE_UINT32:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_uint32;
n->op = Abs_uint32;
break;
case ONNX_TENSOR_TYPE_UINT64:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_uint64;
n->op = Abs_uint64;
break;
case ONNX_TENSOR_TYPE_BFLOAT16:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_bfloat16;
n->op = Abs_bfloat16;
break;
case ONNX_TENSOR_TYPE_FLOAT16:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_float16;
n->op = Abs_float16;
break;
case ONNX_TENSOR_TYPE_FLOAT32:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_float32;
n->op = Abs_float32;
break;
case ONNX_TENSOR_TYPE_FLOAT64:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_float64;
n->op = Abs_float64;
break;
default:
break;
Expand All @@ -250,67 +250,67 @@ void resolver_default_op_Abs(struct onnx_node_t * n)
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_int8;
n->op = Abs_int8;
break;
case ONNX_TENSOR_TYPE_INT16:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_int16;
n->op = Abs_int16;
break;
case ONNX_TENSOR_TYPE_INT32:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_int32;
n->op = Abs_int32;
break;
case ONNX_TENSOR_TYPE_INT64:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_int64;
n->op = Abs_int64;
break;
case ONNX_TENSOR_TYPE_UINT8:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_uint8;
n->op = Abs_uint8;
break;
case ONNX_TENSOR_TYPE_UINT16:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_uint16;
n->op = Abs_uint16;
break;
case ONNX_TENSOR_TYPE_UINT32:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_uint32;
n->op = Abs_uint32;
break;
case ONNX_TENSOR_TYPE_UINT64:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_uint64;
n->op = Abs_uint64;
break;
case ONNX_TENSOR_TYPE_FLOAT16:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_float16;
n->op = Abs_float16;
break;
case ONNX_TENSOR_TYPE_FLOAT32:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_float32;
n->op = Abs_float32;
break;
case ONNX_TENSOR_TYPE_FLOAT64:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_float64;
n->op = Abs_float64;
break;
default:
break;
Expand All @@ -324,19 +324,19 @@ void resolver_default_op_Abs(struct onnx_node_t * n)
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_float16;
n->op = Abs_float16;
break;
case ONNX_TENSOR_TYPE_FLOAT32:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_float32;
n->op = Abs_float32;
break;
case ONNX_TENSOR_TYPE_FLOAT64:
n->init = Abs_init;
n->exit = Abs_exit;
n->reshape = Abs_reshape;
n->operator = Abs_float64;
n->op = Abs_float64;
break;
default:
break;
Expand Down
14 changes: 7 additions & 7 deletions src/default/Acos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,25 +82,25 @@ void resolver_default_op_Acos(struct onnx_node_t * n)
n->init = Acos_init;
n->exit = Acos_exit;
n->reshape = Acos_reshape;
n->operator = Acos_bfloat16;
n->op = Acos_bfloat16;
break;
case ONNX_TENSOR_TYPE_FLOAT16:
n->init = Acos_init;
n->exit = Acos_exit;
n->reshape = Acos_reshape;
n->operator = Acos_float16;
n->op = Acos_float16;
break;
case ONNX_TENSOR_TYPE_FLOAT32:
n->init = Acos_init;
n->exit = Acos_exit;
n->reshape = Acos_reshape;
n->operator = Acos_float32;
n->op = Acos_float32;
break;
case ONNX_TENSOR_TYPE_FLOAT64:
n->init = Acos_init;
n->exit = Acos_exit;
n->reshape = Acos_reshape;
n->operator = Acos_float64;
n->op = Acos_float64;
break;
default:
break;
Expand All @@ -114,19 +114,19 @@ void resolver_default_op_Acos(struct onnx_node_t * n)
n->init = Acos_init;
n->exit = Acos_exit;
n->reshape = Acos_reshape;
n->operator = Acos_float16;
n->op = Acos_float16;
break;
case ONNX_TENSOR_TYPE_FLOAT32:
n->init = Acos_init;
n->exit = Acos_exit;
n->reshape = Acos_reshape;
n->operator = Acos_float32;
n->op = Acos_float32;
break;
case ONNX_TENSOR_TYPE_FLOAT64:
n->init = Acos_init;
n->exit = Acos_exit;
n->reshape = Acos_reshape;
n->operator = Acos_float64;
n->op = Acos_float64;
break;
default:
break;
Expand Down
14 changes: 7 additions & 7 deletions src/default/Acosh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,25 +86,25 @@ void resolver_default_op_Acosh(struct onnx_node_t * n)
n->init = Acosh_init;
n->exit = Acosh_exit;
n->reshape = Acosh_reshape;
n->operator = Acosh_bfloat16;
n->op = Acosh_bfloat16;
break;
case ONNX_TENSOR_TYPE_FLOAT16:
n->init = Acosh_init;
n->exit = Acosh_exit;
n->reshape = Acosh_reshape;
n->operator = Acosh_float16;
n->op = Acosh_float16;
break;
case ONNX_TENSOR_TYPE_FLOAT32:
n->init = Acosh_init;
n->exit = Acosh_exit;
n->reshape = Acosh_reshape;
n->operator = Acosh_float32;
n->op = Acosh_float32;
break;
case ONNX_TENSOR_TYPE_FLOAT64:
n->init = Acosh_init;
n->exit = Acosh_exit;
n->reshape = Acosh_reshape;
n->operator = Acosh_float64;
n->op = Acosh_float64;
break;
default:
break;
Expand All @@ -118,19 +118,19 @@ void resolver_default_op_Acosh(struct onnx_node_t * n)
n->init = Acosh_init;
n->exit = Acosh_exit;
n->reshape = Acosh_reshape;
n->operator = Acosh_float16;
n->op = Acosh_float16;
break;
case ONNX_TENSOR_TYPE_FLOAT32:
n->init = Acosh_init;
n->exit = Acosh_exit;
n->reshape = Acosh_reshape;
n->operator = Acosh_float32;
n->op = Acosh_float32;
break;
case ONNX_TENSOR_TYPE_FLOAT64:
n->init = Acosh_init;
n->exit = Acosh_exit;
n->reshape = Acosh_reshape;
n->operator = Acosh_float64;
n->op = Acosh_float64;
break;
default:
break;
Expand Down
Loading