nkululeko 0.80.0__py3-none-any.whl → 0.80.1__py3-none-any.whl

nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.80.0"
+VERSION="0.80.1"
 SAMPLING_RATE = 16000

nkululeko/feat_extract/feats_import.py

@@ -18,11 +18,18 @@ class Importset(Featureset):
         """Import the features."""
         self.util.debug(f"importing features for {self.name}")
         try:
-            feat_import_files = ast.literal_eval(
-                self.util.config_val("FEATS", "import_file", False)
-            )
+            feat_import_files = self.util.config_val("FEATS", "import_file", False)
+            feat_import_files = ast.literal_eval(feat_import_files)
         except ValueError as e:
-            self.util.error("feature type == import needs import_file = [file1, filex]")
+            self.util.error(
+                "feature type == import needs import_file = ['file1', 'filex']"
+            )
+        except SyntaxError as se:
+            if type(feat_import_files) == str:
+                feat_import_files = [feat_import_files]
+            else:
+                self.util.error(f"import_file is wrong: {feat_import_files}")
+
         feat_df = pd.DataFrame()
         for feat_import_file in feat_import_files:
             if not os.path.isfile(feat_import_file):

nkululeko/multidb.py

@@ -42,7 +42,7 @@ def main(src_dir):
     try:
         extra_trains = config["CROSSDB"]["train_extra"]
     except KeyError:
-        extra_train = False
+        extra_trains = False
 
     for i in range(dim):
         for j in range(dim):

{nkululeko-0.80.0.dist-info → nkululeko-0.80.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.80.0
+Version: 0.80.1
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -322,6 +322,11 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.80.1
+--------------
+* added support for string value in import_features
++ added support for multiple extra training databases when doing multi-db experiments
+
 Version 0.80.0
 --------------
 * fixed bug no feature import

{nkululeko-0.80.0.dist-info → nkululeko-0.80.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ nkululeko/__init__.py,sha256=62f8HiEzJ8rG2QlTFJXUCMpvuH3fKI33DoJSj33mscc,63
 nkululeko/aug_train.py,sha256=YhuZnS_WVWnun9G-M6g5n6rbRxoVREz6Zh7k6qprFNQ,3194
 nkululeko/augment.py,sha256=4MG0apTAG5RgkuJrYEjGgDdbodZWi_HweSPNI1JJ5QA,3051
 nkululeko/cacheddataset.py,sha256=lIJ6hUo5LoxSrzXtWV8mzwO7wRtUETWnOQ4ws2XfL1E,969
-nkululeko/constants.py,sha256=RCi8PtLKi2lahLtUtKDTwu8KO-XzLICD9odQb5W0nJ8,39
+nkululeko/constants.py,sha256=PjrmxRyljCQ53PzG5WIALMzgVNR8dJ4k70ZhEHPpQ98,39
 nkululeko/demo.py,sha256=l_rxmDCaVO3hchWSQYzh3dJ5U-6CHE0umbfxIsES5s0,2196
 nkululeko/demo_feats.py,sha256=sAeGFojhEj9WEDFtG3SzPBmyYJWLF2rkbpp65m8Ujo4,2025
 nkululeko/demo_predictor.py,sha256=o8bXdH2r_7K-9N033iL9i7vYJXS2baPxi8rYqFlhodk,3751
@@ -14,7 +14,7 @@ nkululeko/file_checker.py,sha256=LoLnL8aHpW-axMQ46qbqrManTs5otG9ShpEZuz9iRSk,347
 nkululeko/filter_data.py,sha256=w-X2mhKdYr5DxDIz50E5yzO6Jmzk4jjDBoXsgOOVtcA,7222
 nkululeko/glob_conf.py,sha256=iHiVSxDYgmYwdx6z0HuGUMSWrfZfufPHxHb60q2dLRY,453
 nkululeko/modelrunner.py,sha256=cU6FHbpI2mrG0BY7pn5UgFFpYh3u-v_GH7q73Kknhug,9337
-nkululeko/multidb.py,sha256=9Dd8x1l5CI5TRb0QzzmLUYHCGqYAi6TGtwpfM4ga0AU,5731
+nkululeko/multidb.py,sha256=4ceCu9LFrMGlrcgtz4pWuOQb2KA3jR5uo3FjZgAEBD4,5732
 nkululeko/nkululeko.py,sha256=Ty8cdusXUec9BHml8Gsp1r7DXuvIBMFXUckMpzILBnQ,1966
 nkululeko/plots.py,sha256=K88ZRPFGX_r03BT742H06Dde20xZYdltv7dxjgUiAFA,23025
 nkululeko/predict.py,sha256=dRXX-sQVESa7cNi_56S6UkUOa_pV1g_K4xYtYVM1SJs,1876
@@ -55,7 +55,7 @@ nkululeko/feat_extract/feats_audmodel.py,sha256=ifXo4ItOGiSD8QUA64Ha-lf_4-_0MQuJ
 nkululeko/feat_extract/feats_audmodel_dim.py,sha256=HZtQc7_4lIbReUz41Ks-EewcKOmkMc0V98pHTCCIMto,2849
 nkululeko/feat_extract/feats_clap.py,sha256=v82mbjdjGDSKUUBggttw7jW0oka22fWAmfUf-4VmaDU,3379
 nkululeko/feat_extract/feats_hubert.py,sha256=uL-9mgQHuGPQi1nuUaw6aNU9DscsO89uJAmBdmnCegM,5205
-nkululeko/feat_extract/feats_import.py,sha256=V07TTNxq6poIjjELeNHniEc6dVGGWTFHAP0K_Ed38UY,1310
+nkululeko/feat_extract/feats_import.py,sha256=m7Yh1sj7C1yrDDbZAqS75oMMF5rAtO7XC_sdWdQN5Iw,1598
 nkululeko/feat_extract/feats_mld.py,sha256=Vvu7GZOkn7Vda8eIOXqHjg78zegkFe3vTUaCXyVM0eA,2021
 nkululeko/feat_extract/feats_mos.py,sha256=XZI7U99QcSuzd1v5pVAo0JwdcrXrRICUNt_K5G6eRPU,4149
 nkululeko/feat_extract/feats_opensmile.py,sha256=yDRGSiUQV3K3oLxVqq8Cxj5bkc-RiLzDYbAGKC9I5vc,4140
@@ -101,8 +101,8 @@ 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=Hn27x0f2rjSR-iae2h9_70J4SdXKJTduLFIH13w3db0,12363
-nkululeko-0.80.0.dist-info/LICENSE,sha256=0zGP5B_W35yAcGfHPS18Q2B8UhvLRY3dQq1MhpsJU_U,1076
-nkululeko-0.80.0.dist-info/METADATA,sha256=TQRcOUZP5TrGpcp2YkaVKBblroabq1KiUxjpqlIZmTA,33687
-nkululeko-0.80.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-nkululeko-0.80.0.dist-info/top_level.txt,sha256=DPFNNSHPjUeVKj44dVANAjuVGRCC3MusJ08lc2a8xFA,10
-nkululeko-0.80.0.dist-info/RECORD,,
+nkululeko-0.80.1.dist-info/LICENSE,sha256=0zGP5B_W35yAcGfHPS18Q2B8UhvLRY3dQq1MhpsJU_U,1076
+nkululeko-0.80.1.dist-info/METADATA,sha256=_kjligQaChrCbn5le4rfDAJrRKOZcAGiPNwNjrbSqA0,33856
+nkululeko-0.80.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+nkululeko-0.80.1.dist-info/top_level.txt,sha256=DPFNNSHPjUeVKj44dVANAjuVGRCC3MusJ08lc2a8xFA,10
+nkululeko-0.80.1.dist-info/RECORD,,