Sync from GitHub via hub-sync
Browse files- consolidate-shards.py +25 -14
- generate-embeddings.py +6 -2
consolidate-shards.py
CHANGED
|
@@ -38,31 +38,42 @@ logging.basicConfig(level=logging.INFO, format="%(asctime)s %(levelname)s %(mess
|
|
| 38 |
logger = logging.getLogger("consolidate-shards")
|
| 39 |
|
| 40 |
|
|
|
|
|
|
|
|
|
|
| 41 |
def normalize_embeddings_column(local, out_col):
|
| 42 |
-
"""Rewrite the file in place if its embeddings column isn't fixed_size_list<float32>
|
|
|
|
| 43 |
|
| 44 |
Shards written by different script versions can disagree (old: list<double>, new:
|
| 45 |
-
fixed_size_list<float32>)
|
| 46 |
-
|
|
|
|
| 47 |
import pyarrow as pa
|
| 48 |
import pyarrow.compute as pc
|
| 49 |
import pyarrow.parquet as pq
|
| 50 |
pf = pq.ParquetFile(local)
|
|
|
|
| 51 |
schema = pf.schema_arrow
|
| 52 |
if out_col not in schema.names:
|
| 53 |
-
return
|
| 54 |
field = schema.field(out_col)
|
| 55 |
-
|
| 56 |
-
|
|
|
|
|
|
|
|
|
|
| 57 |
t = pq.read_table(local)
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
| 62 |
-
|
| 63 |
-
|
| 64 |
-
|
| 65 |
-
|
|
|
|
|
|
|
| 66 |
return t.num_rows
|
| 67 |
|
| 68 |
|
|
|
|
| 38 |
logger = logging.getLogger("consolidate-shards")
|
| 39 |
|
| 40 |
|
| 41 |
+
ROW_GROUP_ROWS = 25_000 # ~100MB groups with an embeddings column; viewer needs random access
|
| 42 |
+
|
| 43 |
+
|
| 44 |
def normalize_embeddings_column(local, out_col):
|
| 45 |
+
"""Rewrite the file in place if its embeddings column isn't fixed_size_list<float32>
|
| 46 |
+
OR its row groups are too big for the dataset viewer.
|
| 47 |
|
| 48 |
Shards written by different script versions can disagree (old: list<double>, new:
|
| 49 |
+
fixed_size_list<float32>) — mixed schemas break load_dataset. And pyarrow-default
|
| 50 |
+
~1M-row groups are multi-GB with embeddings, which the viewer rejects with
|
| 51 |
+
"Scan size limit exceeded". Returns the file's row count."""
|
| 52 |
import pyarrow as pa
|
| 53 |
import pyarrow.compute as pc
|
| 54 |
import pyarrow.parquet as pq
|
| 55 |
pf = pq.ParquetFile(local)
|
| 56 |
+
meta = pf.metadata
|
| 57 |
schema = pf.schema_arrow
|
| 58 |
if out_col not in schema.names:
|
| 59 |
+
return meta.num_rows # nothing to normalize (unexpected, but not fatal here)
|
| 60 |
field = schema.field(out_col)
|
| 61 |
+
schema_ok = pa.types.is_fixed_size_list(field.type) and field.type.value_type == pa.float32()
|
| 62 |
+
groups_ok = meta.num_row_groups > 0 and all(
|
| 63 |
+
meta.row_group(i).num_rows <= 4 * ROW_GROUP_ROWS for i in range(meta.num_row_groups))
|
| 64 |
+
if schema_ok and groups_ok:
|
| 65 |
+
return meta.num_rows
|
| 66 |
t = pq.read_table(local)
|
| 67 |
+
if not schema_ok:
|
| 68 |
+
col = t[out_col].combine_chunks()
|
| 69 |
+
dim = len(col[0].as_py())
|
| 70 |
+
values = pc.cast(pc.list_flatten(col), pa.float32())
|
| 71 |
+
fixed = pa.FixedSizeListArray.from_arrays(values, dim)
|
| 72 |
+
idx = t.schema.get_field_index(out_col)
|
| 73 |
+
t = t.set_column(idx, pa.field(out_col, fixed.type), fixed)
|
| 74 |
+
logger.info(f" normalized {Path(local).name}: schema_ok={schema_ok} groups_ok={groups_ok} "
|
| 75 |
+
f"→ {t.schema.field(out_col).type}, {ROW_GROUP_ROWS}-row groups + page index")
|
| 76 |
+
pq.write_table(t, local, row_group_size=ROW_GROUP_ROWS, write_page_index=True)
|
| 77 |
return t.num_rows
|
| 78 |
|
| 79 |
|
generate-embeddings.py
CHANGED
|
@@ -323,7 +323,8 @@ def run_streaming_shard(ds, model, prompt_str, args):
|
|
| 323 |
if not part_buf:
|
| 324 |
return
|
| 325 |
path = f"/tmp/part-{args.shard_index:05d}-{prog['part_idx']:04d}.parquet"
|
| 326 |
-
pq.write_table(pa.Table.from_pylist(part_buf), path
|
|
|
|
| 327 |
dest = f"runs/{args.run_id}/data/{args.shard_index:05d}.part{prog['part_idx']:04d}.parquet"
|
| 328 |
logger.info(f"Uploading {len(part_buf):,}-row part → {args.output_bucket}/{dest}")
|
| 329 |
put_bucket_files(args.output_bucket, [(path, dest)])
|
|
@@ -591,7 +592,10 @@ def main():
|
|
| 591 |
table = ds.with_format("arrow")[:].append_column(args.output_column, emb_col)
|
| 592 |
out_path = f"/tmp/shard-{args.shard_index:05d}.parquet"
|
| 593 |
dest = f"runs/{args.run_id}/data/{args.shard_index:05d}.parquet"
|
| 594 |
-
|
|
|
|
|
|
|
|
|
|
| 595 |
logger.info(f"Uploading shard parquet → {args.output_bucket}/{dest}")
|
| 596 |
put_bucket_files(args.output_bucket, [(out_path, dest)])
|
| 597 |
except Exception:
|
|
|
|
| 323 |
if not part_buf:
|
| 324 |
return
|
| 325 |
path = f"/tmp/part-{args.shard_index:05d}-{prog['part_idx']:04d}.parquet"
|
| 326 |
+
pq.write_table(pa.Table.from_pylist(part_buf), path,
|
| 327 |
+
row_group_size=25_000, write_page_index=True)
|
| 328 |
dest = f"runs/{args.run_id}/data/{args.shard_index:05d}.part{prog['part_idx']:04d}.parquet"
|
| 329 |
logger.info(f"Uploading {len(part_buf):,}-row part → {args.output_bucket}/{dest}")
|
| 330 |
put_bucket_files(args.output_bucket, [(path, dest)])
|
|
|
|
| 592 |
table = ds.with_format("arrow")[:].append_column(args.output_column, emb_col)
|
| 593 |
out_path = f"/tmp/shard-{args.shard_index:05d}.parquet"
|
| 594 |
dest = f"runs/{args.run_id}/data/{args.shard_index:05d}.parquet"
|
| 595 |
+
# Small row groups + page index or the dataset viewer can't random-access:
|
| 596 |
+
# pyarrow's default ~1M-row groups ≈ multi-GB with an embeddings column
|
| 597 |
+
# ("Scan size limit exceeded"). ~25k rows ≈ ~100MB here.
|
| 598 |
+
pq.write_table(table, out_path, row_group_size=25_000, write_page_index=True)
|
| 599 |
logger.info(f"Uploading shard parquet → {args.output_bucket}/{dest}")
|
| 600 |
put_bucket_files(args.output_bucket, [(out_path, dest)])
|
| 601 |
except Exception:
|