Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions aspect/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,17 +399,17 @@ def _featurize(

@staticmethod
def _unsqueeze(
x: Mapping[str, ArrayLike]
x: Mapping[str, ArrayLike],
columns: Optional[Iterable[str]] = None
) -> Dict[str, np.ndarray]:
def _unsqueeze(x, columns=None):
columns = columns or x.keys()
for key in columns:
vals = x[key]
if not isinstance(vals, dict):
vals = np.asarray(x[key])
if vals.ndim == 1 and np.issubdtype(vals.dtype, np.number):
x[key] = vals[:, None]
return x
columns = columns or x.keys()
for key in columns:
vals = x[key]
if not isinstance(vals, dict):
vals = np.asarray(x[key])
if vals.ndim == 1 and np.issubdtype(vals.dtype, np.number):
x[key] = vals[:, None]
return x

def __call__(
self,
Expand Down Expand Up @@ -477,6 +477,7 @@ def __call__(
.select_columns(all_output_columns)
.map(
self._unsqueeze,
fn_kwargs={"columns": output_columns},
batched=True,
batch_size=batch_size,
desc="Unsqueezing",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "aspect-data"
version = "0.0.3"
version = "0.0.3.post1"
authors = [
{ name="Eachan Johnson", email="eachan.johnson@crick.ac.uk" },
]
Expand Down
Loading