nkululeko 0.77.5__py3-none-any.whl → 0.77.6__py3-none-any.whl

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/constants.py

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

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/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/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.dist-info → nkululeko-0.77.6.dist-info}/METADATA

@@ -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
@@ -311,6 +311,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.dist-info → nkululeko-0.77.6.dist-info}/RECORD

@@ -1,8 +1,8 @@
 nkululeko/__init__.py,sha256=62f8HiEzJ8rG2QlTFJXUCMpvuH3fKI33DoJSj33mscc,63
-nkululeko/aug_train.py,sha256=zlaGdWFyaFCpHZ8h_mqPVFcdaOPyK0iXgEkr6eIBqMQ,2976
+nkululeko/aug_train.py,sha256=Z8AYr1E-zjRVrB7uRF_eKTvc0vYXVYGuy3BtzjSIL64,3022
 nkululeko/augment.py,sha256=sHWG4Jmb4BjnaaXXnRYMP7Jkk0qlaZ2ohsArP8uW_d8,3003
 nkululeko/cacheddataset.py,sha256=lIJ6hUo5LoxSrzXtWV8mzwO7wRtUETWnOQ4ws2XfL1E,969
-nkululeko/constants.py,sha256=Lptv4d1FjzAxTL1xBRCb9wbAoMfBLUe-jlDoieF1Fqk,39
+nkululeko/constants.py,sha256=p_G6aEcoN8S7E9aX4sOtHKmywY_uhLXbm6h0iJqfjuY,39
 nkululeko/demo.py,sha256=FFR8qHMCY8kKKRWDTa8xA7A8mWeYalRKYNtV5rjGg44,1915
 nkululeko/demo_predictor.py,sha256=j4ySWWcIxW7ZAIBH86m9BfRFokzrUNkRD6fpsvAQGTw,2629
 nkululeko/experiment.py,sha256=natQpQ_lETWoSea8rTM77g2G_xO_1KXNkES5eYU6GdM,28649
@@ -13,7 +13,7 @@ nkululeko/file_checker.py,sha256=LoLnL8aHpW-axMQ46qbqrManTs5otG9ShpEZuz9iRSk,347
 nkululeko/filter_data.py,sha256=w-X2mhKdYr5DxDIz50E5yzO6Jmzk4jjDBoXsgOOVtcA,7222
 nkululeko/glob_conf.py,sha256=6MZe83QCgHD_zB79Sl9m6UJQASwfqJlyb-1nqrQ_6Iw,381
 nkululeko/modelrunner.py,sha256=TQW08f72-GjBEIFTE3_8B8qMCWvTJUqJ1fveygmYnXI,9278
-nkululeko/nkululeko.py,sha256=MyjjbCg8qgLHHpvwJOEHBGNCDKf0GTv7gnXX27L56R4,1724
+nkululeko/nkululeko.py,sha256=5EfguOjCMt3xDttBJOw-B9upwOHcrN4z3yGKZH5OtoU,1833
 nkululeko/plots.py,sha256=Ci8brbxGXsCp1lnJdGkPUXoyWA6qUqUUwuxKOYEaqR8,21278
 nkululeko/predict.py,sha256=dRXX-sQVESa7cNi_56S6UkUOa_pV1g_K4xYtYVM1SJs,1876
 nkululeko/reporter.py,sha256=wrtWbU_UKDwhKQNMi7Q_Ix5N_UTzTagRwZikgUGk1c8,11606
@@ -48,7 +48,7 @@ nkululeko/data/dataset_csv.py,sha256=9ysujWHQnOHLWtJxGtvdpHE3c_sM_l9svFYWYCpamVs
 nkululeko/feat_extract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nkululeko/feat_extract/feats_agender.py,sha256=sDfsvSC2zt1JLn5rmB7bdck1JmXIIol3oIwN90TossM,2867
 nkululeko/feat_extract/feats_agender_agender.py,sha256=UYATYWE-zCt9F1qA4xQbYZ2qM7DT2nwGxk7vSiyhit4,2953
-nkululeko/feat_extract/feats_analyser.py,sha256=82CCFTViP3XCEUS5Mku_0P358jEsm2-AIt5lAvlQQmY,11335
+nkululeko/feat_extract/feats_analyser.py,sha256=nD2-7K4c0hFJvVCfmpsoU-SnePyb4m_JIPsf0uTzE0M,11397
 nkululeko/feat_extract/feats_audmodel.py,sha256=sZD8NBC3qId4ygzBvW5RvKVgCC1zxvO_cyFazYOEwCk,2901
 nkululeko/feat_extract/feats_audmodel_dim.py,sha256=z48s-FXokREnir_dNMl8fNI5PLCXzOhvmjgfCjTDjh8,2817
 nkululeko/feat_extract/feats_clap.py,sha256=v82mbjdjGDSKUUBggttw7jW0oka22fWAmfUf-4VmaDU,3379
@@ -98,9 +98,9 @@ nkululeko/segmenting/seg_silero.py,sha256=lLytS38KzARS17omwv8VBw-zz60RVSXGSvZ5Ev
 nkululeko/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nkululeko/utils/files.py,sha256=UiGAtZRWYjHSvlmPaTMtzyNNGE6qaLaxQkybctS7iRM,4021
 nkululeko/utils/stats.py,sha256=29otJpUp1VqbtDKmlLkPPzBmVfTFiHZ70rUdR4860rM,2788
-nkululeko/utils/util.py,sha256=KwBS6-hcLN3I3oV1jMxC4hiSBvEXW4PVuu-uZhmbO9w,11548
-nkululeko-0.77.5.dist-info/LICENSE,sha256=0zGP5B_W35yAcGfHPS18Q2B8UhvLRY3dQq1MhpsJU_U,1076
-nkululeko-0.77.5.dist-info/METADATA,sha256=rHmJ4JrNbloUkYo5UIINVyYuvliyX4D9jcFAfoV9eVk,30566
-nkululeko-0.77.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-nkululeko-0.77.5.dist-info/top_level.txt,sha256=DPFNNSHPjUeVKj44dVANAjuVGRCC3MusJ08lc2a8xFA,10
-nkululeko-0.77.5.dist-info/RECORD,,
+nkululeko/utils/util.py,sha256=lpaM7_KnLjquFFtMPH6swdisF1kqSHBLpHh3CzgGtLw,11625
+nkululeko-0.77.6.dist-info/LICENSE,sha256=0zGP5B_W35yAcGfHPS18Q2B8UhvLRY3dQq1MhpsJU_U,1076
+nkululeko-0.77.6.dist-info/METADATA,sha256=jVeWsnVWyiRsVCYFxbyK_UYgqyLsDNNKTXg_XaQIK7A,30662
+nkululeko-0.77.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+nkululeko-0.77.6.dist-info/top_level.txt,sha256=DPFNNSHPjUeVKj44dVANAjuVGRCC3MusJ08lc2a8xFA,10
+nkululeko-0.77.6.dist-info/RECORD,,