quality-of-life changes

Author: calad0i

hls4ml/converters/keras_v3_to_hls.py

@@ -100,7 +100,8 @@ class UniqueName:
     '''Helper class to generate unique names for layers, if one being used multiple times.'''
 
     def __init__(self):
-        self.used_names: set[str] = set()
+        self.used_names: set[str] = set('input')
+        # input is reserved in hls4ml, avoid conflict with it
 
     def next_name(self, name: str):
         i = 0

hls4ml/model/graph.py

@@ -867,6 +867,12 @@ def _compute_n_samples(self, x):
         return int(n_sample)
 
     def predict(self, x):
+        if isinstance(x, np.ndarray) and not x.flags['C_CONTIGUOUS']:
+            x = np.ascontiguousarray(x)
+
+        # Compile the model if it wasn't compiled yet
+        if self._top_function_lib is None:
+            self.compile()
         top_function, ctype = self._get_top_function(x)
         n_samples = self._compute_n_samples(x)
         n_inputs = len(self.get_input_variables())
@@ -882,10 +888,9 @@ def predict(self, x):
                 inp = [np.asarray(x[i])]
             else:
                 inp = [np.asarray(xj[i]) for xj in x]
-            argtuple = inp
-            argtuple += predictions
-            argtuple = tuple(argtuple)
-            top_function(*argtuple)
+            inp = [_inp if _inp.flags['C_CONTIGUOUS'] else np.ascontiguousarray(_inp) for _inp in inp]
+
+            top_function(*inp, *predictions)
             output.append(predictions)
 
         # Convert to list of numpy arrays (one for each output)