Updated to match the format of Mergekit

Author: dnhkng

exllamav2/model.py

@@ -158,32 +158,24 @@ def __init__(self, config: ExLlamaV2Config, lazy_load = False):
 
         self.last_kv_layer_idx = layer_list
 
-
         if hasattr(config, 'repeats'):
-            self.layers_list = []
-
-            def listLeftIndex(alist, value):
-                if value == 0:
-                    return 0
-                return alist.index(str(value))
-
-            def listRightIndex(alist, value):
-                if value > len(alist):
-                    return -1
-                return len(alist) - alist[-1::-1].index(str(value)) -1
-
-            layer_list = [layer.key.split(".")[-1] for layer in self.modules]
-
-            for interval in config.repeats:
-                start_idx = listLeftIndex(layer_list, interval[0])
-                end_idx = listRightIndex(layer_list, interval[1])
-                self.layers_list.extend(list(range(start_idx, end_idx + 1)))
-            self.layers_list.extend(list(range(listRightIndex(layer_list, config.repeats[-1][1]), len(layer_list))))
-
-            # If we have create a Frankenmerge, lets print it to verify!
-            print("Frankenstein Layers list:")
-            for i, layer in enumerate(self.layers_list):
-                print(i, self.modules[layer].key)
+            embedTokenLayers = 1
+            transformerSublayers = 2
+            layer_arrangement = [list(range(*interval)) for interval in config.repeats]
+            layer_arrangement = [item for sublist in layer_arrangement for item in sublist] 
+            LayeredModules = self.modules
+
+
+            self.modules = LayeredModules[:embedTokenLayers]
+            for idx in layer_arrangement:
+                self.modules += LayeredModules[idx*transformerSublayers + embedTokenLayers : idx*transformerSublayers + transformerSublayers + embedTokenLayers]
+            self.modules += LayeredModules[-2:]
+            self.head_layer_idx = len(self.modules) -1
+            self.last_kv_layer_idx = len(self.modules) -4
+
+            for i, m in enumerate(self.modules):
+                print(i, m.key)
+
 
     def set_device_map(self, allocation, embed_cpu = True):
 

exllamav2/model_init.py

@@ -65,11 +65,17 @@ def parse_tuple_list(string):
     try:
         # Safely evaluate the string as a Python literal (list of tuples)
         tuple_list = ast.literal_eval(string)
+        
+        # Ensure all elements in the list are tuples
         if not all(isinstance(item, tuple) for item in tuple_list):
-            raise ValueError
-        return tuple_list
+            raise ValueError("All elements must be tuples")
+
+        # Convert tuple elements to integers
+        int_tuple_list = [tuple(int(x) for x in item) for item in tuple_list]
+        
+        return int_tuple_list
     except:
-        raise argparse.ArgumentTypeError("Input must be a list of tuples")
+        raise argparse.ArgumentTypeError("Input must be a valid list of tuples with integer elements")
 
 
 def init(args, quiet = False, allow_auto_split = False, skip_load = False):