v0.6.7

DATASET_PATH -> data_dir

Author: bartzbeielstein

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spotPython"
-version = "0.6.6"
+version = "0.6.7"
 authors = [
   { name="T. Bartz-Beielstein", email="tbb@bartzundbartz.de" }
 ]

src/spotPython/light/crossvalidationdatamodule.py

@@ -15,7 +15,7 @@ class CrossValidationDataModule(L.LightningDataModule):
         k (int): The fold number. Defaults to 1.
         split_seed (int): The random seed for splitting the data. Defaults to 42.
         num_splits (int): The number of splits for cross-validation. Defaults to 10.
-        DATASET_PATH (str): The path to the dataset. Defaults to "./data".
+        data_dir (str): The path to the dataset. Defaults to "./data".
         num_workers (int): The number of workers for data loading. Defaults to 0.
         pin_memory (bool): Whether to pin memory for data loading. Defaults to False.
 
@@ -40,13 +40,13 @@ def __init__(
         k: int = 1,
         split_seed: int = 42,
         num_splits: int = 10,
-        DATASET_PATH: str = "./data",
+        data_dir: str = "./data",
         num_workers: int = 0,
         pin_memory: bool = False,
     ):
         super().__init__()
         self.batch_size = batch_size
-        self.DATASET_PATH = DATASET_PATH
+        self.data_dir = data_dir
         self.num_workers = num_workers
         self.k = k
         self.split_seed = split_seed

src/spotPython/light/csvdatamodule.py

@@ -10,7 +10,7 @@ class CSVDataModule(L.LightningDataModule):
 
     Args:
         batch_size (int): The size of the batch.
-        DATASET_PATH (str): The path to the dataset. Defaults to "./data".
+        data_dir (str): The path to the dataset. Defaults to "./data".
         num_workers (int): The number of workers for data loading. Defaults to 0.
 
     Attributes:
@@ -19,7 +19,7 @@ class CSVDataModule(L.LightningDataModule):
         data_test (Dataset): The test dataset.
     """
 
-    def __init__(self, batch_size: int, DATASET_PATH: str = "./data", num_workers: int = 0):
+    def __init__(self, batch_size: int, data_dir: str = "./data", num_workers: int = 0):
         super().__init__()
         self.batch_size = batch_size
         self.num_workers = num_workers

src/spotPython/light/traintest.py

@@ -62,7 +62,7 @@ def train_model(config: dict, fun_control: dict) -> float:
     dm = CSVDataModule(
         batch_size=config["batch_size"],
         num_workers=fun_control["num_workers"],
-        DATASET_PATH=fun_control["DATASET_PATH"],
+        data_dir=fun_control["DATASET_PATH"],
     )
 
     # Init trainer
@@ -130,7 +130,7 @@ def test_model(config: dict, fun_control: dict) -> Tuple[float, float]:
     dm = CSVDataModule(
         batch_size=config["batch_size"],
         num_workers=fun_control["num_workers"],
-        DATASET_PATH=fun_control["DATASET_PATH"],
+        data_dir=fun_control["DATASET_PATH"],
     )
     # Init model from datamodule's attributes
     model = fun_control["core_model"](**config, _L_in=_L_in, _L_out=_L_out)
@@ -224,7 +224,7 @@ def cv_model(config: dict, fun_control: dict) -> float:
             num_splits=num_folds,
             split_seed=split_seed,
             batch_size=config["batch_size"],
-            DATASET_PATH=fun_control["DATASET_PATH"],
+            data_dir=fun_control["DATASET_PATH"],
         )
         dm.prepare_data()
         dm.setup()