nkululeko 0.77.5__tar.gz → 0.77.6__tar.gz

{nkululeko-0.77.5 → nkululeko-0.77.6}/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+Version 0.77.6
+--------------
+* added functions to call modules with config file path directly
+
 Version 0.77.5
 --------------
 * fixed augmentation bug for python version 10

{nkululeko-0.77.5/nkululeko.egg-info → nkululeko-0.77.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.77.5
+Version: 0.77.6
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -312,6 +312,10 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.77.6
+--------------
+* added functions to call modules with config file path directly
+
 Version 0.77.5
 --------------
 * fixed augmentation bug for python version 10

{nkululeko-0.77.5 → nkululeko-0.77.6}/nkululeko/aug_train.py

@@ -11,15 +11,7 @@ import nkululeko.glob_conf as glob_conf
 from nkululeko.augment import doit as augment
 
 
-def main(src_dir):
-    parser = argparse.ArgumentParser(description="Call the nkululeko framework.")
-    parser.add_argument("--config", default="exp.ini", help="The base configuration")
-    args = parser.parse_args()
-    if args.config is not None:
-        config_file = args.config
-    else:
-        config_file = f"{src_dir}/exp.ini"
-
+def doit(config_file):
     # test if the configuration file exists
     if not os.path.isfile(config_file):
         print(f"ERROR: no such file: {config_file}")
@@ -87,6 +79,17 @@ def main(src_dir):
     print("DONE")
 
 
+def main(src_dir):
+    parser = argparse.ArgumentParser(description="Call the nkululeko framework.")
+    parser.add_argument("--config", default="exp.ini", help="The base configuration")
+    args = parser.parse_args()
+    if args.config is not None:
+        config_file = args.config
+    else:
+        config_file = f"{src_dir}/exp.ini"
+    doit(config_file)
+
+
 if __name__ == "__main__":
     cwd = os.path.dirname(os.path.abspath(__file__))
     main(cwd)  # use this if you want to state the config file path on command line

{nkululeko-0.77.5 → nkululeko-0.77.6}/nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.77.5"
+VERSION="0.77.6"
 SAMPLING_RATE = 16000

{nkululeko-0.77.5 → nkululeko-0.77.6}/nkululeko/feat_extract/feats_analyser.py

@@ -7,7 +7,6 @@ from sklearn.tree import DecisionTreeClassifier
 from sklearn.linear_model import LinearRegression
 from sklearn.tree import DecisionTreeRegressor
 import matplotlib.pyplot as plt
-from xgboost import XGBClassifier, XGBRegressor
 from nkululeko.utils.util import Util
 from nkululeko.utils.stats import normalize
 from nkululeko.plots import Plots
@@ -126,6 +125,8 @@ class FeatureAnalyser:
                         plots = Plots()
                         plots.plot_tree(model, self.features)
                 elif model_s == "xgb":
+                    from xgboost import XGBClassifier
+
                     model = XGBClassifier(enable_categorical=True, tree_method="hist")
                     self.labels = self.labels.astype("category")
                     result_importances[model_s] = self._get_importance(
@@ -171,6 +172,8 @@ class FeatureAnalyser:
                         model, permutation
                     )
                 elif model_s == "xgr":
+                    from xgboost import XGBClassifier
+
                     model = XGBRegressor()
                     result_importances[model_s] = self._get_importance(
                         model, permutation

{nkululeko-0.77.5 → nkululeko-0.77.6}/nkululeko/nkululeko.py

@@ -9,15 +9,7 @@ from nkululeko.utils.util import Util
 from nkululeko.constants import VERSION
 
 
-def main(src_dir):
-    parser = argparse.ArgumentParser(description="Call the nkululeko framework.")
-    parser.add_argument("--config", default="exp.ini", help="The base configuration")
-    args = parser.parse_args()
-    if args.config is not None:
-        config_file = args.config
-    else:
-        config_file = f"{src_dir}/exp.ini"
-
+def doit(config_file):
     # test if the configuration file exists
     if not os.path.isfile(config_file):
         print(f"ERROR: no such file: {config_file}")
@@ -54,11 +46,22 @@ def main(src_dir):
     expr.init_runmanager()
 
     # run the experiment
-    expr.run()
-
+    reports = expr.run()
+    result = reports[-1].result.test
     expr.store_report()
-
     print("DONE")
+    return result
+
+
+def main(src_dir):
+    parser = argparse.ArgumentParser(description="Call the nkululeko framework.")
+    parser.add_argument("--config", default="exp.ini", help="The base configuration")
+    args = parser.parse_args()
+    if args.config is not None:
+        config_file = args.config
+    else:
+        config_file = f"{src_dir}/exp.ini"
+    doit(config_file)
 
 
 if __name__ == "__main__":

{nkululeko-0.77.5 → nkululeko-0.77.6}/nkululeko/utils/util.py

@@ -25,6 +25,10 @@ class Util:
     ]
 
     def __init__(self, caller=None, has_config=True):
+        if caller is not None:
+            self.caller = caller
+        else:
+            self.caller = ""
         if has_config:
             import nkululeko.glob_conf as glob_conf
 
@@ -36,10 +40,7 @@ class Util:
                     self.error(f"no such file: {self.got_data_roots}")
                 self.data_roots = configparser.ConfigParser()
                 self.data_roots.read(self.got_data_roots)
-        if caller is not None:
-            self.caller = caller
-        else:
-            self.caller = ""
+                self.debug(f"getting data roots from {self.got_data_roots}")
 
     def get_path(self, entry):
         """

{nkululeko-0.77.5 → nkululeko-0.77.6/nkululeko.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.77.5
+Version: 0.77.6
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -312,6 +312,10 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.77.6
+--------------
+* added functions to call modules with config file path directly
+
 Version 0.77.5
 --------------
 * fixed augmentation bug for python version 10