Rename icy_dolma.py to zstd.py

icy_dolma.py → zstd.py

@@ -1,4 +1,4 @@
-"""IcyDolma dataset based on Common Crawl."""
+"""Zstd dataset based on Common Crawl."""
 
 
 import gzip
@@ -17,18 +17,6 @@ from tensorflow.io import gfile
 logger = datasets.logging.get_logger(__name__)
 
 
-_DESCRIPTION = """\
-"""
-
-_CITATION = """
-
-"""
-
-
-_VARIANTS = ["v3","v5"]
-
-
-
 @dataclasses.dataclass
 class State:
     file_index: int  
@@ -144,47 +132,48 @@ class MultiBytesIOReader:
             yield self.incomplete_line
 
 
-class IcyDolmaConfig(datasets.BuilderConfig):
-    """BuilderConfig for IcyDolma."""
+class ZstdConfig(datasets.BuilderConfig):
+    """BuilderConfig for Zstd."""
 
     def __init__(self,
-                 name="v3",
+                 data_url=None,
+                 cluster_layout=None,
                  worker_id=None,
                  n_workers=None,
                  filepaths=None,
                  file_loc=None,
                  buffer_size=65536,
-                 shard_spec=None,
+                 cluster_spec=None,
+                 features=None,
                  **kwargs):
-        """BuilderConfig for IcyDolma.
+        """BuilderConfig for Zstd.
         Args:
           **kwargs: keyword arguments forwarded to super.
         """
-        super(IcyDolmaConfig, self).__init__(name=name,**kwargs)
+        super(ZstdConfig, self).__init__(**kwargs)
+        self.cluster_layout = cluster_layout
+        self.data_url = data_url
         self.worker_id = worker_id
         self.n_workers = n_workers
         self.filepaths = filepaths
         self.file_loc = file_loc
         self.buffer_size = buffer_size
-        self.shard_spec = shard_spec
-        assert (self.shard_spec is None) or (self.filepaths is None ) #one of these must be None
+        self.cluster_spec = cluster_spec
+        self.features = features
+        assert (self.cluster_spec is None) or (self.filepaths is None ) #one of these must be None
 
-_DATA_URL = {"v3":"gs://meliad2_us2/datasets/dolma/clustered_v3/train/shard_{}/subshard_{}/phase{}.jsonl",
-             "v5":"gs://meliad2_us2/datasets/c4/c4_w_cluster_v2/train/subtagged/tag_{}/subtag_{}.jsonl.zst"
-             }
 
-DS_CLUSTER_LAYOUT = {"v3":(64,64,2),"v5":(128,256)}
 
 
 import numpy as np
 import itertools
-def get_cluster_tuples(cluster_layout, shard_spec):
-    if shard_spec is None:
-        shard_spec = (None,)*len(cluster_layout)
-    # if shard_spec is 2d and cluster_layout is 3d, we will pad shard_spec with Nones at the end.
-    shard_spec = shard_spec + (None,)*(len(cluster_layout)-len(shard_spec))
+def get_cluster_tuples(cluster_layout, cluster_spec):
+    if cluster_spec is None:
+        cluster_spec = (None,)*len(cluster_layout)
+    # if cluster_spec is 2d and cluster_layout is 3d, we will pad cluster_spec with Nones at the end.
+    cluster_spec = cluster_spec + (None,)*(len(cluster_layout)-len(cluster_spec))
     dim_list = []
-    for a,b in zip(cluster_layout,shard_spec):
+    for a,b in zip(cluster_layout,cluster_spec):
         if b is None:
             dim_list.append(range(a))
         else:
@@ -193,33 +182,30 @@ def get_cluster_tuples(cluster_layout, shard_spec):
     return list(itertools.product(*dim_list))
 
 def _get_filepaths(config):
-    cluster_layout = DS_CLUSTER_LAYOUT[config.name]
-    shard_spec = config.shard_spec
+    cluster_layout = config.cluster_layout[config.name]
+    cluster_spec = config.cluster_spec
     if config.filepaths is not None:
         filepaths = config.filepaths
     else:
-        tuples = get_cluster_tuples(cluster_layout, shard_spec)
-        filepaths = [_DATA_URL[config.name].format(*tup) for tup in tuples]
+        tuples = get_cluster_tuples(cluster_layout, cluster_spec)
+        filepaths = [config.data_url[config.name].format(*tup) for tup in tuples]
     return filepaths
         
 
-class IcyDolma(datasets.GeneratorBasedBuilder):
-    BUILDER_CONFIGS = [IcyDolmaConfig(name) for name in _VARIANTS]
+class Zstd(datasets.GeneratorBasedBuilder):
+    BUILDER_CONFIGS = [ZstdConfig()]
 
     def _info(self):
+        self.data_url = self.config.data_url
+        self.cluster_layout = self.config.cluster_layout
+        assert self.cluster_layout is not None
+        assert self.data_url is not None
         self.worker_id = self.config.worker_id
         self.n_workers = self.config.n_workers
         self.buffer_size = self.config.buffer_size
         self.filepaths = _get_filepaths(self.config)
-            
-        if self.config.file_loc is not None:
-            self.file_loc = self.config.file_loc
-        else:
-            self.file_loc = 0
-        
-        return datasets.DatasetInfo(
-            description=_DESCRIPTION,
-            features=datasets.Features(
+        if self.config.features is None:
+            self.features=datasets.Features(
                 {
                     "text": datasets.Value("string"),
                     "source": datasets.Value("string"),
@@ -227,9 +213,18 @@ class IcyDolma(datasets.GeneratorBasedBuilder):
                     "id": datasets.Value("int32"),
                     "file_loc": datasets.Value("int64"),
                 }
-            ),
+            )
+        else:
+            self.features = self.config.features
+            
+        if self.config.file_loc is not None:
+            self.file_loc = self.config.file_loc
+        else:
+            self.file_loc = 0
+        
+        return datasets.DatasetInfo(
+            features=self.features,
             supervised_keys=None,
-            citation=_CITATION,
         )
 
     def _split_generators(self, _):