fixup! generated and integrated new set files

alrevuelta · Aug 13, 2020 · 89d557b · 89d557b
1 parent 1c2878c
commit 89d557b
Show file tree

Hide file tree

Showing 21 changed files with 84 additions and 88 deletions.
diff --git a/include/operators/set_operator.h b/include/operators/set_operator.h
@@ -5,7 +5,6 @@
 #include "tracing.h"
 #include <stddef.h>
 #include <string.h>
-#include <stdio.h>
 
 typedef struct set_operator_version set_operator_version;
 typedef struct set_operator         set_operator;
@@ -51,16 +50,13 @@ find_operator(
     size_t opset
 ) {
     set_operator_version *tmp = NULL;
-    for( size_t i_domain = 0; i_domain < all_operator_sets.length; i_domain++ ) {
-        set_domain *domain = all_operator_sets.domains[i_domain];
-        for (size_t i_op = 0; i_op < domain->length; i_op++) {
-            set_operator *op = domain->operators[i_op];
-            if (strcmp(op->name,name) == 0) {
-                for (size_t i_version = 0; i_version < op->length; i_version++) {
-                    set_operator_version *op_version = op->versions[i_version];
-                    if (op_version->version <= opset) {
-                        if (!tmp || op_version->version >= tmp->version) {
-                            tmp = op_version;
+    for( set_domain **domain = all_operator_sets.domains; *domain; domain++ ) {
+        for (set_operator **op = (*domain)->operators; *op; op++) {
+            if (strcmp((*op)->name,name) == 0) {
+                for (set_operator_version **op_version = (*op)->versions; *op_version; op_version++) {
+                    if ((*op_version)->version <= opset) {
+                        if (!tmp || (*op_version)->version >= tmp->version) {
+                            tmp = *op_version;
                         }
                     }
                 }

diff --git a/src/operators/ai.onnx/Add/set_operator__ai_onnx__add.c b/src/operators/ai.onnx/Add/set_operator__ai_onnx__add.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__add = {
     .name = "Add",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__add__7
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__add__7,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/ArgMax/set_operator__ai_onnx__argmax.c b/src/operators/ai.onnx/ArgMax/set_operator__ai_onnx__argmax.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__argmax = {
     .name = "ArgMax",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__argmax__12
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__argmax__12,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/BatchNormalization/set_operator__ai_onnx__batchnormalization.c b/src/operators/ai.onnx/BatchNormalization/set_operator__ai_onnx__batchnormalization.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__batchnormalization = {
     .name = "BatchNormalization",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__batchnormalization__9
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__batchnormalization__9,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Clip/set_operator__ai_onnx__clip.c b/src/operators/ai.onnx/Clip/set_operator__ai_onnx__clip.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__clip = {
     .name = "Clip",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__clip__12
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__clip__12,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Constant/set_operator__ai_onnx__constant.c b/src/operators/ai.onnx/Constant/set_operator__ai_onnx__constant.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__constant = {
     .name = "Constant",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__constant__12
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__constant__12,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Conv/set_operator__ai_onnx__conv.c b/src/operators/ai.onnx/Conv/set_operator__ai_onnx__conv.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__conv = {
     .name = "Conv",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__conv__11
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__conv__11,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Elu/set_operator__ai_onnx__elu.c b/src/operators/ai.onnx/Elu/set_operator__ai_onnx__elu.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__elu = {
     .name = "Elu",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__elu__6
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__elu__6,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/GlobalAveragePool/set_operator__ai_onnx__globalaveragepool.c b/src/operators/ai.onnx/GlobalAveragePool/set_operator__ai_onnx__globalaveragepool.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__globalaveragepool = {
     .name = "GlobalAveragePool",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__globalaveragepool__1
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__globalaveragepool__1,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Identity/set_operator__ai_onnx__identity.c b/src/operators/ai.onnx/Identity/set_operator__ai_onnx__identity.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__identity = {
     .name = "Identity",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__identity__1
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__identity__1,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/LeakyRelu/set_operator__ai_onnx__leakyrelu.c b/src/operators/ai.onnx/LeakyRelu/set_operator__ai_onnx__leakyrelu.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__leakyrelu = {
     .name = "LeakyRelu",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__leakyrelu__6
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__leakyrelu__6,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/MatMul/set_operator__ai_onnx__matmul.c b/src/operators/ai.onnx/MatMul/set_operator__ai_onnx__matmul.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__matmul = {
     .name = "MatMul",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__matmul__9
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__matmul__9,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/MaxPool/set_operator__ai_onnx__maxpool.c b/src/operators/ai.onnx/MaxPool/set_operator__ai_onnx__maxpool.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__maxpool = {
     .name = "MaxPool",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__maxpool__12
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__maxpool__12,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Mul/set_operator__ai_onnx__mul.c b/src/operators/ai.onnx/Mul/set_operator__ai_onnx__mul.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__mul = {
     .name = "Mul",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__mul__7
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__mul__7,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Relu/set_operator__ai_onnx__relu.c b/src/operators/ai.onnx/Relu/set_operator__ai_onnx__relu.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__relu = {
     .name = "Relu",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__relu__6
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__relu__6,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Reshape/set_operator__ai_onnx__reshape.c b/src/operators/ai.onnx/Reshape/set_operator__ai_onnx__reshape.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__reshape = {
     .name = "Reshape",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__reshape__5
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__reshape__5,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Sigmoid/set_operator__ai_onnx__sigmoid.c b/src/operators/ai.onnx/Sigmoid/set_operator__ai_onnx__sigmoid.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__sigmoid = {
     .name = "Sigmoid",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__sigmoid__6
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__sigmoid__6,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Softmax/set_operator__ai_onnx__softmax.c b/src/operators/ai.onnx/Softmax/set_operator__ai_onnx__softmax.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__softmax = {
     .name = "Softmax",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__softmax__11
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__softmax__11,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/Transpose/set_operator__ai_onnx__transpose.c b/src/operators/ai.onnx/Transpose/set_operator__ai_onnx__transpose.c
@@ -6,7 +6,7 @@
 set_operator set_operator__ai_onnx__transpose = {
     .name = "Transpose",
     .versions = {
-        [__COUNTER__]=&set_operator__ai_onnx__transpose__1
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__transpose__1,
+        NULL
+    }
 };
diff --git a/src/operators/ai.onnx/set_operator__ai_onnx.c b/src/operators/ai.onnx/set_operator__ai_onnx.c
@@ -23,24 +23,24 @@
 set_domain set_operator__ai_onnx = {
     .name = "ai.onnx",
     .operators = {
-        [__COUNTER__]=&set_operator__ai_onnx__matmul,
-        [__COUNTER__]=&set_operator__ai_onnx__identity,
-        [__COUNTER__]=&set_operator__ai_onnx__maxpool,
-        [__COUNTER__]=&set_operator__ai_onnx__transpose,
-        [__COUNTER__]=&set_operator__ai_onnx__clip,
-        [__COUNTER__]=&set_operator__ai_onnx__elu,
-        [__COUNTER__]=&set_operator__ai_onnx__relu,
-        [__COUNTER__]=&set_operator__ai_onnx__conv,
-        [__COUNTER__]=&set_operator__ai_onnx__argmax,
-        [__COUNTER__]=&set_operator__ai_onnx__add,
-        [__COUNTER__]=&set_operator__ai_onnx__leakyrelu,
-        [__COUNTER__]=&set_operator__ai_onnx__reshape,
-        [__COUNTER__]=&set_operator__ai_onnx__globalaveragepool,
-        [__COUNTER__]=&set_operator__ai_onnx__mul,
-        [__COUNTER__]=&set_operator__ai_onnx__constant,
-        [__COUNTER__]=&set_operator__ai_onnx__batchnormalization,
-        [__COUNTER__]=&set_operator__ai_onnx__sigmoid,
-        [__COUNTER__]=&set_operator__ai_onnx__softmax
-    },
-    .length = __COUNTER__
+        &set_operator__ai_onnx__matmul,
+        &set_operator__ai_onnx__identity,
+        &set_operator__ai_onnx__maxpool,
+        &set_operator__ai_onnx__transpose,
+        &set_operator__ai_onnx__clip,
+        &set_operator__ai_onnx__elu,
+        &set_operator__ai_onnx__relu,
+        &set_operator__ai_onnx__conv,
+        &set_operator__ai_onnx__argmax,
+        &set_operator__ai_onnx__add,
+        &set_operator__ai_onnx__leakyrelu,
+        &set_operator__ai_onnx__reshape,
+        &set_operator__ai_onnx__globalaveragepool,
+        &set_operator__ai_onnx__mul,
+        &set_operator__ai_onnx__constant,
+        &set_operator__ai_onnx__batchnormalization,
+        &set_operator__ai_onnx__sigmoid,
+        &set_operator__ai_onnx__softmax,
+        NULL
+    }
 };
diff --git a/src/operators/set_operator.c b/src/operators/set_operator.c
@@ -5,7 +5,7 @@
 
 set_opset all_operator_sets = {
     .domains = {
-        [__COUNTER__]=&set_operator__ai_onnx
-    },
-    .length  = __COUNTER__
+        &set_operator__ai_onnx,
+        NULL
+    }
 };