heavyedge-dataset 1.0.0.post0__tar.gz → 1.1.0__tar.gz

{heavyedge_dataset-1.0.0.post0/src/heavyedge_dataset.egg-info → heavyedge_dataset-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: heavyedge-dataset
-Version: 1.0.0.post0
+Version: 1.1.0
 Summary: PyTorch-compatible edge profile dataset API
 Author-email: Jisoo Song <jeesoo9595@snu.ac.kr>
 License-Expression: MIT
@@ -28,6 +28,7 @@ Provides-Extra: doc
 Requires-Dist: sphinx; extra == "doc"
 Requires-Dist: numpydoc; extra == "doc"
 Requires-Dist: pydata_sphinx_theme; extra == "doc"
+Requires-Dist: matplotlib; extra == "doc"
 Provides-Extra: dev
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -48,7 +49,7 @@ Package to load edge profile data as PyTorch dataset.
 
 ## Usage
 
-HeavyEdge-Dataset provides `ProfileDataset` which wraps profile data file.
+HeavyEdge-Dataset provides dataset classes profile data file.
 
 A simple use case to load two-dimensional coordinates of profiles and their lengths:
 

{heavyedge_dataset-1.0.0.post0 → heavyedge_dataset-1.1.0}/README.md

@@ -11,7 +11,7 @@ Package to load edge profile data as PyTorch dataset.
 
 ## Usage
 
-HeavyEdge-Dataset provides `ProfileDataset` which wraps profile data file.
+HeavyEdge-Dataset provides dataset classes profile data file.
 
 A simple use case to load two-dimensional coordinates of profiles and their lengths:
 

{heavyedge_dataset-1.0.0.post0 → heavyedge_dataset-1.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "heavyedge-dataset"
-version = "1.0.0.post0"
+version = "1.1.0"
 authors = [
     {name = "Jisoo Song", email = "jeesoo9595@snu.ac.kr"}
 ]
@@ -45,6 +45,7 @@ doc = [
     "sphinx",
     "numpydoc",
     "pydata_sphinx_theme",
+    "matplotlib",
 ]
 dev = [
     "flake8",

heavyedge_dataset-1.1.0/src/heavyedge_dataset/__init__.py

@@ -0,0 +1,272 @@
+"""Package to load edge profile data using PyTorch dataset.
+
+Refer to `PyTorch tutorial <tutorial>`_ for information about custom dataset.
+
+.. _tutorial: https://docs.pytorch.org/tutorials/beginner/data_loading_tutorial.html
+"""
+
+import numbers
+from collections.abc import Sequence
+
+import numpy as np
+from heavyedge.api import landmarks_type3
+from torch.utils.data import Dataset
+
+__all__ = [
+    "ProfileDataset",
+    "PseudoLandmarkDataset",
+    "MathematicalLandmarkDataset",
+]
+
+
+class ProfileDataset(Dataset):
+    """Edge profile dataset.
+
+    Loads data as a tuple of two numpy arrays:
+
+    1. Profile data, shape: (N, m, L).
+    2. Length of each profile, shape: (N,).
+
+    N is the number of loaded data, m is dimension of coordinates, and
+    L is the maximum length of profiles.
+
+    Parameters
+    ----------
+    file : heavyedge.ProfileData
+        Open hdf5 file.
+    m : {1, 2}
+        Profile data dimension.
+        1 means only y coordinates, and 2 means both x and y coordinates.
+    transform : callable, optional
+        Optional transformation to be applied on samples.
+
+    Examples
+    --------
+    >>> from heavyedge import get_sample_path, ProfileData
+    >>> from heavyedge_dataset import ProfileDataset
+    >>> with ProfileData(get_sample_path("Prep-Type2.h5")) as file:
+    ...     profiles, lengths = ProfileDataset(file, m=2)[:]
+    >>> profiles.shape
+    (22, 2, 3200)
+    >>> lengths.shape
+    (22,)
+    >>> import matplotlib.pyplot as plt  # doctest: +SKIP
+    ... plt.plot(*profiles.transpose(1, 2, 0))
+
+    Should the dataset be used for :class:`torch.utils.data.DataLoader`,
+    ``collate_fn`` argument should be passed to the data loader.
+
+    >>> from torch.utils.data import DataLoader
+    >>> with ProfileData(get_sample_path("Prep-Type2.h5")) as file:
+    ...     dataset = ProfileDataset(file, m=2)
+    ...     loader = DataLoader(dataset, collate_fn=lambda x: x)
+    ...     profiles, lengths = next(iter(loader))
+    >>> profiles.shape
+    (1, 2, 3200)
+    >>> lengths.shape
+    (1,)
+
+    If data should be loaded as :class:`torch.Tensor`, pass ``transform`` argument.
+
+    >>> import torch
+    >>> def to_tensor(sample):
+    ...     return (torch.from_numpy(sample[0]), torch.from_numpy(sample[1]))
+    >>> with ProfileData(get_sample_path("Prep-Type2.h5")) as file:
+    ...     dataset = ProfileDataset(file, m=2, transform=to_tensor)
+    ...     loader = DataLoader(dataset, collate_fn=lambda x: x)
+    ...     profiles, lengths = next(iter(loader))
+    >>> type(profiles)
+    <class 'torch.Tensor'>
+    """
+
+    def __init__(self, file, m=1, transform=None):
+        self.file = file
+        self.m = m
+        self.transform = transform
+        self.x = file.x()
+
+    def __len__(self):
+        return len(self.file)
+
+    def __getitem__(self, idx):
+        if isinstance(idx, numbers.Integral):
+            Y, L, _ = self.file[idx]
+            Y = Y[np.newaxis, :]
+        else:
+            # Support multi-indexing
+            idxs = idx
+            needs_sort = isinstance(idx, (Sequence, np.ndarray))
+            if needs_sort:
+                # idxs must be sorted for h5py
+                idxs = np.array(idxs)
+                sort_idx = np.argsort(idxs)
+                idxs = idxs[sort_idx]
+            Y, L, _ = self.file[idxs]
+            if needs_sort:
+                reverse_idx = np.argsort(sort_idx)
+                Y = Y[reverse_idx]
+                L = L[reverse_idx]
+            Y = Y[:, np.newaxis, :]
+        if self.m == 1:
+            pass
+        elif self.m == 2:
+            x = np.tile(self.x, Y.shape[:-1] + (1,))
+            Y = np.concatenate([x, Y], axis=-2)
+        else:
+            raise ValueError(f"Unsupported dimension: {self.m} (Must be 1 or 2).")
+        ret = (Y, L)
+        if self.transform is not None:
+            ret = self.transform(ret)
+        return ret
+
+    def __getitems__(self, idxs):
+        # PyTorch API
+        return self.__getitem__(idxs)
+
+
+class PseudoLandmarkDataset(Dataset):
+    """Dataset for pseudo-landmarks of edge profiles
+
+    Parameters
+    ----------
+    file : heavyedge.ProfileData
+        Open hdf5 file.
+    m : {1, 2}
+        Dimension of landmark coordinates.
+    k : int
+        Number of landmarks to sample.
+    transform : callable, optional
+        Optional transformation to be applied on samples.
+
+    Examples
+    --------
+    >>> from heavyedge import ProfileData, get_sample_path
+    >>> from heavyedge_dataset import PseudoLandmarkDataset
+    >>> with ProfileData(get_sample_path("Prep-Type1.h5")) as file:
+    ...     dataset = PseudoLandmarkDataset(file, 1, 10)
+    ...     data = dataset[:]
+    >>> data.shape
+    (18, 1, 10)
+    >>> import matplotlib.pyplot as plt  # doctest: +SKIP
+    ... plt.plot(*data.transpose(1, 2, 0))
+
+    Because sampling pseudo-landmark requires loading full profile data,
+    loading large dataset can cause memory failure even if the output data is managable.
+    This can be avoided by batched loading with :class:`torch.utils.data.DataLoader`.
+
+    >>> import numpy as np
+    >>> from torch.utils.data import DataLoader
+    >>> with ProfileData(get_sample_path("Prep-Type1.h5")) as file:
+    ...     dataset = PseudoLandmarkDataset(file, 1, 10)
+    ...     loader = DataLoader(dataset, batch_size=10)
+    ...     data = np.concatenate(list(loader))
+    >>> data.shape
+    (18, 1, 10)
+    """
+
+    def __init__(self, file, m, k, transform=None):
+        self.profiles = ProfileDataset(file, m=m)
+        self.k = k
+        self.transform = transform
+
+    def __len__(self):
+        return len(self.profiles)
+
+    def __getitem__(self, idx):
+        if isinstance(idx, numbers.Integral):
+            Y, L = self.profiles[idx]
+            Ys, Ls = [Y], [L]
+        else:
+            Ys, Ls = self.profiles[idx]
+
+        X = []
+        for Y, L in zip(Ys, Ls):
+            idxs = np.linspace(0, L - 1, self.k, dtype=int)
+            X.append(Y[:, idxs])
+        ret = np.array(X)
+        if self.transform is not None:
+            ret = self.transform(ret)
+        return ret
+
+    def __getitems__(self, idxs):
+        # PyTorch API
+        return self.__getitem__(idxs)
+
+
+class MathematicalLandmarkDataset(Dataset):
+    """Dataset for mathematical landmarks of edge profiles.
+
+    Loads data as a tuple of two numpy arrays:
+
+    1. Landmark coordinates, shape: (N, m, 4).
+    2. Average plateau height, shape: (N,).
+
+    N is the number of loaded data and m is dimension of coordinates.
+
+    Parameters
+    ----------
+    file : heavyedge.ProfileData
+        Open hdf5 file.
+    m : {1, 2}
+        Dimension of landmark coordinates.
+    sigma : scalar
+        Standard deviation of Gaussian kernel for landmark detection.
+    transform : callable, optional
+        Optional transformation to be applied on samples.
+
+    Examples
+    --------
+    >>> from heavyedge import ProfileData, get_sample_path
+    >>> from heavyedge_dataset import MathematicalLandmarkDataset
+    >>> with ProfileData(get_sample_path("Prep-Type3.h5")) as file:
+    ...     dataset = MathematicalLandmarkDataset(file, 2, 32)
+    ...     landmarks, height = dataset[:]
+    >>> landmarks.shape
+    (35, 2, 4)
+    >>> height.shape
+    (35,)
+
+    Because sampling mathematical landmark requires loading full profile data,
+    loading large dataset can cause memory failure even if the output data is managable.
+    This can be avoided by batched loading with :class:`torch.utils.data.DataLoader`.
+    Note that ``collate_fn`` argument should be passed to the data loader.
+
+    >>> import numpy as np
+    >>> from torch.utils.data import DataLoader
+    >>> with ProfileData(get_sample_path("Prep-Type3.h5")) as file:
+    ...     dataset = MathematicalLandmarkDataset(file, 2, 32)
+    ...     loader = DataLoader(dataset, batch_size=10, collate_fn=lambda x: x)
+    ...     landmarks = np.concatenate([lm for lm, _ in loader])
+    >>> landmarks.shape
+    (35, 2, 4)
+    """
+
+    def __init__(self, file, m, sigma, transform=None):
+        self.profiles = ProfileDataset(file, m=m)
+        self.sigma = sigma
+        self.transform = transform
+
+    def __len__(self):
+        return len(self.profiles)
+
+    def __getitem__(self, idx):
+        if isinstance(idx, numbers.Integral):
+            Y, L = self.profiles[idx]
+            Ys, Ls = [Y], [L]
+        else:
+            Ys, Ls = self.profiles[idx]
+
+        X, H = [], []
+        for Y, L in zip(Ys, Ls):
+            idxs = np.flip(landmarks_type3(Y[-1, :L], self.sigma))
+            X.append(Y[:, idxs])
+            H.append(np.mean(Y[-1, : idxs[0]]))
+
+        ret = np.array(X), np.array(H)
+        if self.transform is not None:
+            ret = self.transform(ret)
+        return ret
+
+    def __getitems__(self, idxs):
+        # PyTorch API
+        return self.__getitem__(idxs)

{heavyedge_dataset-1.0.0.post0 → heavyedge_dataset-1.1.0/src/heavyedge_dataset.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: heavyedge-dataset
-Version: 1.0.0.post0
+Version: 1.1.0
 Summary: PyTorch-compatible edge profile dataset API
 Author-email: Jisoo Song <jeesoo9595@snu.ac.kr>
 License-Expression: MIT
@@ -28,6 +28,7 @@ Provides-Extra: doc
 Requires-Dist: sphinx; extra == "doc"
 Requires-Dist: numpydoc; extra == "doc"
 Requires-Dist: pydata_sphinx_theme; extra == "doc"
+Requires-Dist: matplotlib; extra == "doc"
 Provides-Extra: dev
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -48,7 +49,7 @@ Package to load edge profile data as PyTorch dataset.
 
 ## Usage
 
-HeavyEdge-Dataset provides `ProfileDataset` which wraps profile data file.
+HeavyEdge-Dataset provides dataset classes profile data file.
 
 A simple use case to load two-dimensional coordinates of profiles and their lengths:
 

{heavyedge_dataset-1.0.0.post0 → heavyedge_dataset-1.1.0}/src/heavyedge_dataset.egg-info/requires.txt

@@ -11,6 +11,7 @@ heavyedge-dataset[doc,test]
 sphinx
 numpydoc
 pydata_sphinx_theme
+matplotlib
 
 [test]
 pytest

heavyedge_dataset-1.0.0.post0/src/heavyedge_dataset/__init__.py

@@ -1,119 +0,0 @@
-"""Package to load edge profile data using PyTorch dataset.
-
-Refer to `PyTorch tutorial <tutorial>`_ for information about custom dataset.
-
-.. _tutorial: https://docs.pytorch.org/tutorials/beginner/data_loading_tutorial.html
-"""
-
-import numbers
-from collections.abc import Sequence
-
-import numpy as np
-from torch.utils.data import Dataset
-
-__all__ = [
-    "ProfileDataset",
-]
-
-
-class ProfileDataset(Dataset):
-    """Edge profile dataset.
-
-    Loads data as a tuple of two numpy arrays:
-
-    1. Profile data, shape: (N, m, L).
-    2. Length of each profile, shape: (N,).
-
-    N is the number of loaded data, m is dimension of coordinates, and
-    L is the maximum length of profiles.
-
-    Parameters
-    ----------
-    file : heavyedge.ProfileData
-        Open hdf5 file.
-    m : {1, 2}
-        Profile data dimension.
-        1 means only y coordinates, and 2 means both x and y coordinates.
-    transform : callable, optional
-        Optional transformation to be applied on samples.
-
-    Examples
-    --------
-    >>> from heavyedge import get_sample_path, ProfileData
-    >>> from heavyedge_dataset import ProfileDataset
-    >>> with ProfileData(get_sample_path("Prep-Type2.h5")) as file:
-    ...     profiles, lengths = ProfileDataset(file, m=2)[:]
-    >>> profiles.shape
-    (22, 2, 3200)
-    >>> lengths.shape
-    (22,)
-
-    Should this dataset be used for :class:`torch.utils.data.DataLoader`,
-    ``collate_fn`` argument should be passed to the data loader.
-
-    >>> from torch.utils.data import DataLoader
-    >>> with ProfileData(get_sample_path("Prep-Type2.h5")) as file:
-    ...     dataset = ProfileDataset(file, m=2)
-    ...     loader = DataLoader(dataset, collate_fn=lambda x: x)
-    ...     profiles, lengths = next(iter(loader))
-    >>> profiles.shape
-    (1, 2, 3200)
-    >>> lengths.shape
-    (1,)
-
-    If data should be loaded as :class:`torch.Tensor`, pass ``transform`` argument.
-
-    >>> import torch
-    >>> def to_tensor(sample):
-    ...     return (torch.from_numpy(sample[0]), torch.from_numpy(sample[1]))
-    >>> with ProfileData(get_sample_path("Prep-Type2.h5")) as file:
-    ...     dataset = ProfileDataset(file, m=2, transform=to_tensor)
-    ...     loader = DataLoader(dataset, collate_fn=lambda x: x)
-    ...     profiles, lengths = next(iter(loader))
-    >>> type(profiles)
-    <class 'torch.Tensor'>
-    """
-
-    def __init__(self, file, m=1, transform=None):
-        self.file = file
-        self.m = m
-        self.transform = transform
-        self.x = file.x()
-
-    def __len__(self):
-        return len(self.file)
-
-    def __getitem__(self, idx):
-        if isinstance(idx, numbers.Integral):
-            Y, L, _ = self.file[idx]
-            Y = Y[np.newaxis, :]
-        else:
-            # Support multi-indexing
-            idxs = idx
-            needs_sort = isinstance(idx, (Sequence, np.ndarray))
-            if needs_sort:
-                # idxs must be sorted for h5py
-                idxs = np.array(idxs)
-                sort_idx = np.argsort(idxs)
-                idxs = idxs[sort_idx]
-            Y, L, _ = self.file[idxs]
-            if needs_sort:
-                reverse_idx = np.argsort(sort_idx)
-                Y = Y[reverse_idx]
-                L = L[reverse_idx]
-            Y = Y[:, np.newaxis, :]
-        if self.m == 1:
-            pass
-        elif self.m == 2:
-            x = np.tile(self.x, Y.shape[:-1] + (1,))
-            Y = np.concatenate([x, Y], axis=-2)
-        else:
-            raise ValueError(f"Unsupported dimension: {self.m} (Must be 1 or 2).")
-        ret = (Y, L)
-        if self.transform is not None:
-            ret = self.transform(ret)
-        return ret
-
-    def __getitems__(self, idxs):
-        # PyTorch API
-        return self.__getitem__(idxs)