molcraft 0.1.0a13__py3-none-any.whl → 0.1.0a14__py3-none-any.whl

molcraft/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.0a13'
+__version__ = '0.1.0a14'
 
 import os
 os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3"

molcraft/datasets.py

@@ -1,123 +1,131 @@
 import numpy as np
 import pandas as pd
+import typing
 
 
 def split(
     data: pd.DataFrame | np.ndarray,
+    *,
     train_size: float | None = None,
     validation_size: float | None = None, 
-    test_size: float = 0.1,
+    test_size: float | None = None,
+    groups: str | np.ndarray = None,
     shuffle: bool = False, 
     random_state: int | None = None,
-) -> pd.DataFrame | np.ndarray:
-    """Splits dataset into subsets.
+) -> tuple[np.ndarray | pd.DataFrame, ...]:
+    """Splits the dataset into subsets.
 
     Args:
         data: 
             A pd.DataFrame or np.ndarray object.
         train_size:
-            Optional train size, as a fraction (`float`) or size (`int`).
+            The size of the train set.
         validation_size:
-            Optional validation size, as a fraction (`float`) or size (`int`).
+            The size of the validation set.
         test_size:
-            Required test size, as a fraction (`float`) or size (`int`).
+            The size of the test set.
+        groups:
+            The groups to perform the splitting on.
         shuffle:
             Whether the dataset should be shuffled prior to splitting.
         random_state:
-            The random state (or seed). Only applicable if shuffling.
+            The random state/seed. Only applicable if shuffling.
     """
+    if not isinstance(data, (pd.DataFrame, np.ndarray)):
+        raise ValueError(f'Unsupported `data` type ({type(data)}).')
 
-    if not isinstance(data, (pd.DataFrame, np.ndarray, list)):
-        raise ValueError(
-            '`data` needs to be a pd.DataFrame, np.ndarray or a list. '
-            f'Found {type(data)}.'
-        )
-    
-    size = len(data)
+    if isinstance(groups, str):
+        groups = data[groups].values 
+    elif groups is None:
+        groups = np.arange(len(data))
     
-    if test_size is None:
-        raise ValueError('`test_size` is required.')
-    elif test_size <= 0:
-        raise ValueError(
-            f'Test size needs to be positive. Found: {test_size}. '
-            'Either specify a positive `float` (fraction) or '
-            'a positive `int` (size).'
-        )
-    if train_size is not None and train_size <= 0:
-        raise ValueError(
-            f'Train size needs to be None or positive. Found: {train_size}. '
-            'Either specify `None`, a positive `float` (fraction) or '
-            'a positive `int` (size).'
-        )
-    if validation_size is not None and validation_size <= 0:
+    indices = np.unique(groups)
+    size = len(indices)
+
+    if not train_size and not test_size:
         raise ValueError(
-            f'Validation size needs to be None or positive. Found: {validation_size}. '
-            'Either specify `None`, a positive `float` (fraction) or '
-            'a positive `int` (size).'
+            f'Found both `train_size` and `test_size` to be `None`, '
+            f'specify at least one of them.'
         )
-    
     if isinstance(test_size, float):
         test_size = int(size * test_size)
-    if validation_size and isinstance(validation_size, float):
+    if isinstance(train_size, float):
+        train_size = int(size * train_size)
+    if isinstance(validation_size, float):
         validation_size = int(size * validation_size)
     elif not validation_size:
         validation_size = 0
 
-    if train_size and isinstance(train_size, float):
-        train_size = int(size * train_size)
-    elif not train_size:
-        train_size = 0
-
     if not train_size:
-        train_size = size - test_size
-        if not validation_size:
-            train_size -= validation_size
-
+        train_size = (size - test_size - validation_size)
+    if not test_size:
+        test_size = (size - train_size - validation_size)
+    
     remainder = size - (train_size + validation_size + test_size)
-
     if remainder < 0:
         raise ValueError(
-            'Sizes of data subsets add up to more than the size of the original data set: '
-            f'{size} < ({train_size} + {validation_size} + {test_size})'
+            f'subset sizes added up to more than the data size.'
         )
-    if test_size <= 0:
-        raise ValueError(
-            f'Test size needs to be greater than 0. Found: {test_size}.'
-        )
-    if train_size <= 0:
-        raise ValueError(
-            f'Train size needs to be greater than 0. Found: {train_size}.'
-        )
-    
     train_size += remainder
 
-    if isinstance(data, pd.DataFrame):
-        if shuffle:
-            data = data.sample(
-                frac=1.0, replace=False, random_state=random_state
-            )
-        train_data = data.iloc[:train_size]
-        test_data = data.iloc[-test_size:]
-        if not validation_size:
-            return train_data, test_data 
-        validation_data = data.iloc[train_size:-test_size]
-        return train_data, validation_data, test_data
-    
-    if not isinstance(data, np.ndarray):
-        data = np.asarray(data)
-
-    np.random.seed(random_state)
-
-    random_indices = np.arange(size)
-    np.random.shuffle(random_indices)
-    data = data[random_indices]
+    if shuffle:
+        np.random.seed(random_state)
+        np.random.shuffle(indices)
 
-    train_data = data[:train_size]
-    test_data = data[-test_size:]
+    train_mask = np.isin(groups, indices[:train_size])
+    test_mask = np.isin(groups, indices[-test_size:])
     if not validation_size:
-        return train_data, test_data 
-    validation_data = data[train_size:-test_size]
-    return train_data, validation_data, test_data
+        return data[train_mask], data[test_mask]
+    validation_mask = np.isin(groups, indices[train_size:-test_size])
+    return data[train_mask], data[validation_mask], data[test_mask]
     
+def cv_split(
+    data: pd.DataFrame | np.ndarray,
+    num_splits: int = 10,
+    groups: str | np.ndarray = None,
+    shuffle: bool = False, 
+    random_state: int | None = None,
+) -> typing.Iterator[
+        tuple[np.ndarray | pd.DataFrame, np.ndarray | pd.DataFrame]
+    ]:
+    """Splits the dataset into cross-validation folds.
 
+    Args:
+        data: 
+            A pd.DataFrame or np.ndarray object.
+        num_splits:
+            The number of cross-validation folds.
+        groups:
+            The groups to perform the splitting on.
+        shuffle:
+            Whether the dataset should be shuffled prior to splitting.
+        random_state:
+            The random state/seed. Only applicable if shuffling.
+    """
+    if not isinstance(data, (pd.DataFrame, np.ndarray)):
+        raise ValueError(f'Unsupported `data` type ({type(data)}).')
+    
+    if isinstance(groups, str):
+        groups = data[groups].values
+    elif groups is None:
+        groups = np.arange(len(data))
+
+    indices = np.unique(groups)
+    size = len(indices)
     
+    if num_splits > size:
+        raise ValueError(
+            f'`num_splits` ({num_splits}) must not be greater than'
+            f'the data size or the number of groups ({size}).'
+        )
+    if shuffle:
+        np.random.seed(random_state)
+        np.random.shuffle(indices)
+
+    indices_splits = np.array_split(indices, num_splits)
+
+    for k in range(num_splits):
+        test_indices = indices_splits[k]
+        test_mask = np.isin(groups, test_indices)
+        train_mask = ~test_mask
+        yield data[train_mask], data[test_mask]

molcraft/models.py

@@ -250,7 +250,7 @@ class GraphModel(layers.GraphLayer, keras.models.Model):
                 val_size = int(val_split * x.num_subgraphs)
                 x_val = _make_dataset(x[-val_size:], batch_size)
                 x = x[:-val_size]
-            x = _make_dataset(x, batch_size)
+            x = _make_dataset(x, batch_size, shuffle=kwargs.get('shuffle', True))
         return super().fit(x, validation_data=x_val, **kwargs)
     
     def evaluate(self, x: tensors.GraphTensor | tf.data.Dataset, **kwargs):
@@ -561,9 +561,8 @@ def _functional_init_arguments(args, kwargs):
         or ("inputs" in kwargs and "outputs" in kwargs)
     )
 
-def _make_dataset(x: tensors.GraphTensor, batch_size: int):
-    return (
-        tf.data.Dataset.from_tensor_slices(x)
-        .batch(batch_size)
-        .prefetch(-1)
-    )
+def _make_dataset(x: tensors.GraphTensor, batch_size: int, shuffle: bool = False):
+    ds = tf.data.Dataset.from_tensor_slices(x)
+    if shuffle:
+        ds = ds.shuffle(buffer_size=ds.cardinality())
+    return ds.batch(batch_size).prefetch(-1)

{molcraft-0.1.0a13.dist-info → molcraft-0.1.0a14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: molcraft
-Version: 0.1.0a13
+Version: 0.1.0a14
 Summary: Graph Neural Networks for Molecular Machine Learning
 Author-email: Alexander Kensert <alexander.kensert@gmail.com>
 License: MIT License

{molcraft-0.1.0a13.dist-info → molcraft-0.1.0a14.dist-info}/RECORD

@@ -1,21 +1,21 @@
-molcraft/__init__.py,sha256=6LG3cDZ-ZBTO7wcF4A0dpNXWVwbs1l4NgSdgTr_-FmI,464
+molcraft/__init__.py,sha256=lReyUDRgBySoe9LPZzlwv1N_x9unwr6nHxIU70u3mLU,464
 molcraft/callbacks.py,sha256=x5HnkZhqcFRrW6xdApt_jZ4X08A-0fxcnFKfdmRKa0c,3571
 molcraft/chem.py,sha256=--4AdZV0TCj_cf5i-TRidNJGSFyab1ksUEMjmDi7zaM,21837
 molcraft/conformers.py,sha256=K6ZtiSUNDN_fwqGP9JrPcwALLFFvlMlF_XejEJH3Sr4,4205
-molcraft/datasets.py,sha256=rFgXTC1ZheLhfgQgcCspP_wEE54a33PIneH7OplbS-8,4047
+molcraft/datasets.py,sha256=QKHi9SUBKvJvdkRFmRQNowhrnu35pQqtujuLatOK8bE,4151
 molcraft/descriptors.py,sha256=jJpT0XWu3Tx_bxnwk1rENySRkaM8cMDMaDIjG8KKvtg,3097
 molcraft/features.py,sha256=GwOecLCNUIuGfbIVzsAJH4LikkzWMKj5IT7zSgGTttU,13846
 molcraft/featurizers.py,sha256=QiyNEFRJdMcKZM-gJGHU6Soy300RWDtLeYw0QEkFG20,27129
 molcraft/layers.py,sha256=cUpo9dqqNEnc7rNf-Dze8adFhOkTV5F9IhHOKs13OUI,60134
 molcraft/losses.py,sha256=qnS2yC5g-O3n_zVea9MR6TNiFraW2yqRgePOisoUP4A,1065
-molcraft/models.py,sha256=0x74B4WsaZgmUrHmpX9YNr9QXqd1rR3QF_ygyegHoXU,21770
+molcraft/models.py,sha256=h9cRAdCOU-_UAxROC9Utuz4AR4HfFE9QqJ4geLYlynE,21878
 molcraft/ops.py,sha256=TaAD26V-b7eSNKFKswWt9IExSgIBOmLqwlPPcdpt8wk,5496
 molcraft/records.py,sha256=MbvYkcCunbAmpy_MWXmQ9WBGi2WvwxFUlwQSPKPvSSk,5534
 molcraft/tensors.py,sha256=EOUKx496KUZsjA1zA2ABc7tU_TW3Jv7AXDsug_QsLbA,22407
 molcraft/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 molcraft/apps/peptides.py,sha256=N5wJDGDIDRbmOmxin_dTY-odLqb0avAX9FU22U6x6c0,14576
-molcraft-0.1.0a13.dist-info/licenses/LICENSE,sha256=sbVeqlrtZ0V63uYhZGL5dCxUm8rBAOqe2avyA1zIQNk,1074
-molcraft-0.1.0a13.dist-info/METADATA,sha256=E7OQ6Kz68t9qseciNosAkd8RqSn8U17tpitXVvFVx88,3893
-molcraft-0.1.0a13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-molcraft-0.1.0a13.dist-info/top_level.txt,sha256=dENV6MfOceshM6MQCgJlcN1ojZkiCL9B4F7XyUge3QM,9
-molcraft-0.1.0a13.dist-info/RECORD,,
+molcraft-0.1.0a14.dist-info/licenses/LICENSE,sha256=sbVeqlrtZ0V63uYhZGL5dCxUm8rBAOqe2avyA1zIQNk,1074
+molcraft-0.1.0a14.dist-info/METADATA,sha256=1Op3VxuV9hkciALrrOXx2KnGShFI5a9n_XbhT-oPpKI,3893
+molcraft-0.1.0a14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+molcraft-0.1.0a14.dist-info/top_level.txt,sha256=dENV6MfOceshM6MQCgJlcN1ojZkiCL9B4F7XyUge3QM,9
+molcraft-0.1.0a14.dist-info/RECORD,,