radnn 0.1.5__tar.gz → 0.1.6__tar.gz

{radnn-0.1.5/src/radnn.egg-info → radnn-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radnn
-Version: 0.1.5
+Version: 0.1.6
 Summary: Rapid Deep Neural Networks
 Author-email: "Pantelis I. Kaplanoglou" <pikaplanoglou@ihu.gr>
 License-Expression: MIT

{radnn-0.1.5 → radnn-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "radnn"
-version = "0.1.5"
+version = "0.1.6"
 description = "Rapid Deep Neural Networks"
 readme = "README.md"
 authors = [

{radnn-0.1.5 → radnn-0.1.6}/src/radnn/__init__.py

@@ -9,7 +9,8 @@
 # Version 0.1.1    [2025-01-08]
 # Version 0.1.4    [2025-01-26]
 # Version 0.1.5    [2025-02-02]
-__version__ = "0.1.5"
+# Version 0.1.6    [2025-02-03]
+__version__ = "0.1.6"
 
 from .system import FileStore, FileSystem
 from .ml_system import MLSystem

{radnn-0.1.5 → radnn-0.1.6}/src/radnn/data/custom_data_set.py

@@ -23,7 +23,7 @@
 
 # ......................................................................................
 
-from sklearn.model_selection import train_test_split  # import a standalone procedure function from the pacakge
+from sklearn.model_selection import train_test_split  # import a standalone procedure toyfunction from the pacakge
 from sklearn.preprocessing import StandardScaler, MinMaxScaler
 from radnn import mlsys
 from radnn.data.sample_set_simple import SampleSet

{radnn-0.1.5 → radnn-0.1.6}/src/radnn/data/dataset_base.py

@@ -26,12 +26,15 @@ import os
 import numpy as np
 import pandas as pd
 from abc import ABC, abstractmethod
-from .sample_set import SampleSet
+from .sample_set_simple import SampleSet
 from .sample_set_kind import SampleSetKind
 from .sample_preprocessor import SamplePreprocessor, VoidPreprocessor
 from .errors import *
 from radnn import FileStore
 from radnn import mlsys
+from .constants import DataPreprocessingKind
+from sklearn.model_selection import train_test_split
+from sklearn.preprocessing import MinMaxScaler, StandardScaler
 
 # ======================================================================================================================
 class DataSetCallbacks(object):
@@ -73,7 +76,7 @@ class DataSetBase(ABC):
     self.feature_count = None
     self.class_count = None
     self.sample_count = None
-    
+
     self.callbacks: DataSetCallbacks = callbacks
     
     self.hprm: dict | None = None
@@ -81,8 +84,39 @@ class DataSetBase(ABC):
     self.vs: SampleSet | None = None
     self.us: SampleSet | None = None
     self.preprocessor: SamplePreprocessor = VoidPreprocessor(self)
+    
+    self.is_split = False
     # ................................................................
 
+  # --------------------------------------------------------------------------------------
+  def split(self, validation_samples_pc=0.10,
+            preprocessing: DataPreprocessingKind | None = DataPreprocessingKind.STANDARDIZE,
+            random_seed: int=2021):
+    
+    nTS_Samples, nVS_Samples, nTS_Labels, nVS_Labels = train_test_split(self.all_samples, self.all_labels,
+                                                                        test_size=validation_samples_pc,
+                                                                        random_state=random_seed)
+    if preprocessing == DataPreprocessingKind.MIN_MAX_NORMALIZE:
+      self.preprocessor = MinMaxScaler().fit(nTS_Samples)
+    elif preprocessing == DataPreprocessingKind.STANDARDIZE:
+      self.preprocessor = StandardScaler().fit(nTS_Samples)
+    else:
+      self.preprocessor = None
+
+    if self.preprocessor is not None:
+      nTS_Samples = self.preprocessor.transform(nTS_Samples)
+      nVS_Samples = self.preprocessor.transform(nVS_Samples)
+
+    # (Re)creating the subsets of the dataset after the splits have been created
+    self.ts = SampleSet(self, nTS_Samples, nTS_Labels, kind=SampleSetKind.TRAINING_SET)
+    if preprocessing == DataPreprocessingKind.STANDARDIZE:
+      self.ts.mean = self.preprocessor.mean_
+      self.ts.std = self.preprocessor.scale_
+
+    self.vs = SampleSet(self, nVS_Samples, nVS_Labels, kind=SampleSetKind.VALIDATION_SET)
+    
+    self.is_split = True
+    return self
   # --------------------------------------------------------------------------------------------------------------------
   @property
   def dataset_code(self):
@@ -115,11 +149,32 @@ class DataSetBase(ABC):
   def load_data(self):
     pass # Must implement
   # --------------------------------------------------------------------------------------------------------------------
-  def load_cache(self):
-    pass # Optionally override
+  def load_cache(self, is_vector_samples=True, is_last_axis_features=True):
+    nSuffix = ""
+    if is_vector_samples:
+      nSuffix = "-vec"
+    elif not is_last_axis_features:
+      nSuffix = "-torch"
+
+    nTSSamples = self.fs.obj.load(f"{self.dataset_code}-TS-Samples{nSuffix}.pkl")
+    nVSSamples = self.fs.obj.load(f"{self.dataset_code}-VS-Samples{nSuffix}.pkl")
+
+    nTSLabels = self.fs.obj.load(f"{self.dataset_code}-TS-Labels{nSuffix}.pkl")
+    nVSLabels = self.fs.obj.load(f"{self.dataset_code}-VS-Labels{nSuffix}.pkl")
+
+    return nTSSamples, nVSSamples, nTSLabels, nVSLabels
   # --------------------------------------------------------------------------------------------------------------------
-  def save_cache(self):
-    pass # Optionally override
+  def save_cache(self, ts_samples, vs_samples, ts_labels, vs_labels, is_vector_samples=True, is_last_axis_features=True):
+    nSuffix = ""
+    if is_vector_samples:
+      nSuffix = "-vec"
+    elif not is_last_axis_features:
+      nSuffix = "-torch"
+    self.fs.obj.save(ts_samples, f"{self.dataset_code}-TS-Samples{nSuffix}.pkl")
+    self.fs.obj.save(vs_samples, f"{self.dataset_code}-VS-Samples{nSuffix}.pkl")
+
+    self.fs.obj.save(ts_labels, f"{self.dataset_code}-TS-Labels{nSuffix}.pkl")
+    self.fs.obj.save(vs_labels, f"{self.dataset_code}-VS-Labels{nSuffix}.pkl")
   # --------------------------------------------------------------------------------------------------------------------
   def prepare(self, hyperparams: dict | None = None):
     self.hprm = hyperparams
@@ -134,23 +189,29 @@ class DataSetBase(ABC):
         self.callbacks.lazy_download(self.fs)
     
     if (self.random_seed is not None):
-      assert self.callbacks is not None, ERR_NO_CALLBACKS
-      assert self.callbacks._random_seed is not None, ERR_DS_NO_RANDOM_SEED_INITIALIZER_CALLBACK
-      self.callbacks.random_seed(self.random_seed)
-    
+      bIsInitRandomSeed = False
+      if self.callbacks is not None:
+        if self.callbacks._random_seed is not None:
+          self.callbacks.random_seed(self.random_seed)
+          bIsInitRandomSeed = True
+      if not bIsInitRandomSeed:
+        mlsys.random_seed_all(self.random_seed)
+
     self.ts = None
     self.vs = None
     self.us = None
-    # VIRTUAL CALL:  Imports the data from the source local/remote filestore to the local cache.
+
+    # VIRTUAL CALL:  Imports the dataset from the source local/remote filestore to the local cache.
     self.load_data()
     
-    assert self.ts is not None, ERR_DS_SUBSET_MUST_HAVE_TS
-    assert self.ts.kind == SampleSetKind.TRAINING_SET, ERR_DS_SUBSET_INVALID_SETUP
-    if self.vs is not None:
+    if self.is_split:
+      assert self.ts is not None, ERR_DS_SUBSET_MUST_HAVE_TS
       assert self.ts.kind == SampleSetKind.TRAINING_SET, ERR_DS_SUBSET_INVALID_SETUP
+      if self.vs is not None:
+        assert self.vs.kind == SampleSetKind.VALIDATION_SET, ERR_DS_SUBSET_INVALID_SETUP
+        
     if self.us is not None:
-      assert self.ts.kind == SampleSetKind.TRAINING_SET, ERR_DS_SUBSET_INVALID_SETUP
-
+      assert self.us.kind == SampleSetKind.UNKNOWN_TEST_SET, ERR_DS_SUBSET_INVALID_SETUP
       
     return self
   # --------------------------------------------------------------------------------------------------------------------

{radnn-0.1.5 → radnn-0.1.6}/src/radnn/data/dataset_base_legacy.py

@@ -25,7 +25,7 @@
 
 
 import numpy as np
-from sklearn.model_selection import train_test_split  # import a standalone procedure function from the pacakge
+from sklearn.model_selection import train_test_split  # import a standalone procedure toyfunction from the pacakge
 
 
 # =========================================================================================================================

{radnn-0.1.5 → radnn-0.1.6}/src/radnn/data/errors.py

@@ -28,7 +28,7 @@ ERR_MLSYS_FILESYS_NOT_INITIALIZED = "The filesystem for the Machine Learning hos
 
 ERR_NO_CALLBACKS = "You should assign callbacks to the dataset perform proper random seed initialization for your framework."
 ERR_DS_NO_RANDOM_SEED_INITIALIZER_CALLBACK = "Callback method for random seed initialization has not been defined."
-ERR_DS_CALLBACKS_NO_LAZY_DOWNLOADER = "Callback method for downloading the data has not been defined."
+ERR_DS_CALLBACKS_NO_LAZY_DOWNLOADER = "Callback method for downloading the dataset has not been defined."
 
 ERR_DS_SUBSET_MUST_HAVE_TS = "A dataset must have at least a training subset."
 ERR_DS_SUBSET_INVALID_SETUP = "Invalid sample subset setup. Please use one of the valid kinds: 'training/train/ts', 'validation/val/vs', 'testing/test/us'."

{radnn-0.1.5 → radnn-0.1.6}/src/radnn/data/sample_preprocessor.py

@@ -47,6 +47,9 @@ class SamplePreprocessor(ABC):
     pass
   # --------------------------------------------------------------------------------------------------------------------
 
+
+
+
 # ======================================================================================================================
 class VoidPreprocessor(SamplePreprocessor):
   # --------------------------------------------------------------------------------------------------------------------

{radnn-0.1.5 → radnn-0.1.6}/src/radnn/data/sample_set_simple.py

@@ -11,7 +11,10 @@ class SampleSet(object):
     if self.ids is None:
       self.ids = np.arange(len(self.samples)) + 1
     self.kind: SampleSetKind = kind
-    
+
+    self.mean = None
+    self.std = None
+
     self.loader = None
     self._sample_count = None
     self._minibatch_count = None

{radnn-0.1.5 → radnn-0.1.6}/src/radnn/experiment/ml_experiment.py

@@ -49,7 +49,7 @@ from .ml_experiment_store import MLExperimentStore
 
 
 # --------------------------------------------------------------------------------------------------------------------
-# Define a custom sorting function
+# Define a custom sorting toyfunction
 def _sort_by_last_path_element(folder):
   # Split the path into its components
   components = folder.split(os.pathsep)
@@ -226,7 +226,7 @@ class MLExperiment:
       self.model_fs.log_fs.json.save(dTiming, f"timing_info_{self._end_train_time.strftime('%Y-%m-%dT%H%M%S')}.json",
                              is_sorted_keys=False)
 
-    # //TODO: Keep cost function names and other learning parameters for evaluation
+    # //TODO: Keep cost toyfunction names and other learning parameters for evaluation
   # --------------------------------------------------------------------------------------------------------------------
   def load(self, use_last_checkpoint=False, model_root_folder=None):
     self._currentModelFolder = self.model_fs.base_folder

{radnn-0.1.5 → radnn-0.1.6}/src/radnn/experiment/ml_experiment_log.py

@@ -1,49 +1,55 @@
 import numpy as np
 from radnn.system.filesystem import FileStore
+
+
 class MLExperimentLog:
   # --------------------------------------------------------------------------------------------------------------------
-  def __init__(self, filename: str, experiment_info: dict | None = None):
+  def __init__(self, filename: str, experiment_info: dict | None = None, is_autoinit: bool = False):
     self.filename = filename
     if experiment_info is None:
       experiment_info = {}
     self.experiment_info = experiment_info
-    self.logs = { "experiment": experiment_info,
-                  "epoch": [],
-                  "epoch_time": [],
-                  "train_step_loss": [],
-                  "train_step_accuracy": [],
-                  "train_loss": [],
-                  "train_accuracy": [],
-                  "val_loss": [],
-                  "val_accuracy": [],
-                  "learning_rate": []
-            }
+    self.is_autoinit = is_autoinit
+    if self.is_autoinit:
+      self.logs = {"experiment": experiment_info, "epoch": [], "epoch_time": []}
+    else:
+      self.logs = {"experiment": experiment_info, "epoch": [], "epoch_time": [],
+                   "train_step_loss": [],
+                   "train_step_accuracy": [],
+                   "train_loss": [],
+                   "train_accuracy": [],
+                   "val_loss": [],
+                   "val_accuracy": [],
+                   "learning_rate": []}
+  
   # --------------------------------------------------------------------------------------------------------------------
-  def assign_series(self, is_autoinit=False, **kwargs):
-    if is_autoinit:
+  def assign_series(self, **kwargs):
+    if self.is_autoinit:
       for key, value in kwargs.items():
         if key not in self.logs:
           self.logs[key] = []
-      
+    
     for key, value in kwargs.items():
       self.logs[key] = value
+  
   # --------------------------------------------------------------------------------------------------------------------
-  def append(self, is_autoinit=False, **kwargs):
-    if is_autoinit:
+  def append(self, **kwargs):
+    if self.is_autoinit:
       for key, value in kwargs.items():
         if key not in self.logs:
           self.logs[key] = []
-
+    
     for key, value in kwargs.items():
       self.logs[key].append(value)
     return self
+  
   # --------------------------------------------------------------------------------------------------------------------
   def load(self, experiment_fs: FileStore):
     self.logs = experiment_fs.json.load(self.filename)
     return self
+  
   # --------------------------------------------------------------------------------------------------------------------
   def save(self, experiment_fs: FileStore):
     experiment_fs.json.save(self.logs, self.filename)
     return self
   # --------------------------------------------------------------------------------------------------------------------
-    

{radnn-0.1.5 → radnn-0.1.6}/src/radnn/system/hosts/windows_host.py

@@ -72,7 +72,7 @@ class WindowsHost(object):
   def set_windows_sleep_resolution(cls, msecs=1):
     """
     Requests a minimum resolution for periodic timers. This increases accuracy
-    for the waiting interval of the time.sleep function
+    for the waiting interval of the time.sleep toyfunction
     """
     oWinMM = ctypes.WinDLL('oWinMM')
     oWinMM.timeBeginPeriod(msecs)

{radnn-0.1.5 → radnn-0.1.6/src/radnn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radnn
-Version: 0.1.5
+Version: 0.1.6
 Summary: Rapid Deep Neural Networks
 Author-email: "Pantelis I. Kaplanoglou" <pikaplanoglou@ihu.gr>
 License-Expression: MIT