cgeorgiaw HF Staff commited on
Commit
e0db0f7
·
1 Parent(s): f15519e

trying yet again to make work for both streaming settings

Browse files
Files changed (1) hide show
  1. merfish.py +39 -18
merfish.py CHANGED
@@ -1,11 +1,13 @@
1
  import datasets
2
  import os
3
- import glob
4
  import pandas as pd
 
 
5
 
6
  class MERFISHConfig(datasets.BuilderConfig):
7
- def __init__(self, name, **kwargs):
8
- super().__init__(name=name, **kwargs)
 
9
 
10
  class MERFISH(datasets.GeneratorBasedBuilder):
11
  BUILDER_CONFIGS = [
@@ -25,36 +27,55 @@ class MERFISH(datasets.GeneratorBasedBuilder):
25
  )
26
 
27
  def _split_generators(self, dl_manager):
28
- data_files = {
29
- "expression": os.path.join(self.config.name, "expression", "*.parquet"),
30
- "gene_metadata": os.path.join(self.config.name, "gene_metadata.parquet"),
31
- "cell_metadata": os.path.join(self.config.name, "cell_metadata.parquet"),
32
- }
33
- downloaded = dl_manager.download(data_files)
 
 
 
 
 
 
 
 
 
34
  return [
35
  datasets.SplitGenerator(
36
  name=datasets.Split.TRAIN,
37
  gen_kwargs={
38
- "expression_files": sorted(glob.glob(downloaded["expression"])),
39
- "gene_metadata_path": downloaded["gene_metadata"],
40
- "cell_metadata_path": downloaded["cell_metadata"],
 
41
  },
42
  ),
43
  ]
44
 
45
- def _generate_examples(self, expression_files, gene_metadata_path, cell_metadata_path):
46
- gene_df = pd.read_parquet(gene_metadata_path)
 
 
 
 
 
 
47
  gene_names = gene_df["gene_id"].tolist() if "gene_id" in gene_df.columns else gene_df.index.tolist()
48
- cell_df = pd.read_parquet(cell_metadata_path)
49
 
50
  idx = 0
51
  for filepath in expression_files:
52
- df = pd.read_parquet(filepath)
 
 
 
 
 
53
  for cell_id, row in df.iterrows():
54
  yield idx, {
55
- "cell_id": cell_id,
56
  "expression": row.to_numpy(dtype="float32").tolist(),
57
  "gene_names": gene_names,
58
  }
59
  idx += 1
60
-
 
1
  import datasets
2
  import os
 
3
  import pandas as pd
4
+ import pyarrow.parquet as pq
5
+
6
 
7
  class MERFISHConfig(datasets.BuilderConfig):
8
+ def __init__(self, **kwargs):
9
+ self.gene_subset = kwargs.pop("gene_subset", None)
10
+ super().__init__(**kwargs)
11
 
12
  class MERFISH(datasets.GeneratorBasedBuilder):
13
  BUILDER_CONFIGS = [
 
27
  )
28
 
29
  def _split_generators(self, dl_manager):
30
+ base_path = os.path.join(self.config.name, "expression")
31
+
32
+ if dl_manager.is_streaming:
33
+ expression_files = list(dl_manager.iter_files(base_path))
34
+ else:
35
+ expression_dir = dl_manager.download_and_extract(base_path)
36
+ expression_files = sorted([
37
+ os.path.join(expression_dir, f)
38
+ for f in os.listdir(expression_dir)
39
+ if f.endswith(".parquet")
40
+ ])
41
+
42
+ gene_metadata = dl_manager.download(os.path.join(self.config.name, "gene_metadata.parquet"))
43
+ cell_metadata = dl_manager.download(os.path.join(self.config.name, "cell_metadata.parquet"))
44
+
45
  return [
46
  datasets.SplitGenerator(
47
  name=datasets.Split.TRAIN,
48
  gen_kwargs={
49
+ "expression_files": expression_files,
50
+ "gene_metadata_path": gene_metadata,
51
+ "cell_metadata_path": cell_metadata,
52
+ "fs": dl_manager.fs if dl_manager.is_streaming else None,
53
  },
54
  ),
55
  ]
56
 
57
+ def _generate_examples(self, expression_files, gene_metadata_path, cell_metadata_path, fs):
58
+ if fs is not None:
59
+ gene_df = pd.read_parquet(fs.open(gene_metadata_path))
60
+ cell_df = pd.read_parquet(fs.open(cell_metadata_path))
61
+ else:
62
+ gene_df = pd.read_parquet(gene_metadata_path)
63
+ cell_df = pd.read_parquet(cell_metadata_path)
64
+
65
  gene_names = gene_df["gene_id"].tolist() if "gene_id" in gene_df.columns else gene_df.index.tolist()
 
66
 
67
  idx = 0
68
  for filepath in expression_files:
69
+ if fs is not None:
70
+ f = fs.open(filepath, "rb")
71
+ df = pd.read_parquet(f)
72
+ else:
73
+ df = pd.read_parquet(filepath)
74
+
75
  for cell_id, row in df.iterrows():
76
  yield idx, {
77
+ "cell_id": str(cell_id),
78
  "expression": row.to_numpy(dtype="float32").tolist(),
79
  "gene_names": gene_names,
80
  }
81
  idx += 1