nkululeko 0.66.9__tar.gz → 0.66.12__tar.gz

{nkululeko-0.66.9 → nkululeko-0.66.12}/CHANGELOG.md

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+Version 0.66.12
+---------------
+* fixed bug that prevented Praat features to be selected 
+  
+Version 0.66.11
+---------------
+* removed torch from automatic install. depends on cpu/gpu machine
+
+Version 0.66.10
+---------------
+* Removed print statements from feats_wav2vec2
+
 Version 0.66.9
 --------------
 * Version that should install without requiring opensmile which seems not to be supported by all Apple processors (arm CPU (Apple M1))

{nkululeko-0.66.9/nkululeko.egg-info → nkululeko-0.66.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.66.9
+Version: 0.66.12
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -24,6 +24,7 @@ Requires-Dist: imageio
 Requires-Dist: laion-clap
 Requires-Dist: matplotlib
 Requires-Dist: numpy
+Requires-Dist: opensmile
 Requires-Dist: pandas
 Requires-Dist: praat-parselmouth
 Requires-Dist: pylatex
@@ -33,8 +34,6 @@ Requires-Dist: seaborn
 Requires-Dist: sounddevice
 Requires-Dist: tensorflow
 Requires-Dist: tensorflow_hub
-Requires-Dist: torch
-Requires-Dist: torchvision
 Requires-Dist: transformers
 Requires-Dist: umap-learn
 Requires-Dist: xgboost
@@ -107,6 +106,23 @@ Create and activate a virtual Python environment and simply run
 ```
 pip install nkululeko
 ```
+We excluded some packages from the automatic installation because they might depend on your computer and some of them are only needed in special cases. So if the error
+```
+module x not found
+```
+appears, please try
+```
+pip install x
+```
+For many packages you will need the missing torch package.
+If you don't have a GPU (which is probably true if you don't know what that is), please use
+```
+pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
+```
+else, you can use the default:
+```
+pip install torch torchvision torchaudio
+```
 
 Some examples for *ini*-files (which you use to control nkululeko) are in the [tests folder](https://github.com/felixbur/nkululeko/tree/main/tests).
 
@@ -184,7 +200,8 @@ There's my [blog](http://blog.syntheticspeech.de/?s=nkululeko) with tutorials:
 * [Predict new labels for your data from public models and check bias](http://blog.syntheticspeech.de/2023/08/16/nkululeko-how-to-predict-labels-for-your-data-from-existing-models-and-check-them/)
 * [Resample](http://blog.syntheticspeech.de/2023/08/31/how-to-fix-different-sampling-rates-in-a-dataset-with-nkululeko/)
 * [Get some statistics on correlation and effect-size](http://blog.syntheticspeech.de/2023/09/05/nkululeko-get-some-statistics-on-correlation-and-effect-size/)
-
+* [Generate a latex / pdf report](http://blog.syntheticspeech.de/2023/09/26/nkululeko-generate-a-latex-pdf-report/) 
+  
 The framework is targeted at the speech domain and supports experiments where different classifiers are combined with different feature extractors.
 
 Here's a rough UML-like sketch of the framework (and [here's the real one done with pyreverse](meta/images/classes.png)).
@@ -256,6 +273,18 @@ Nkululeko can be used under the [MIT license](https://choosealicense.com/license
 Changelog
 =========
 
+Version 0.66.12
+---------------
+* fixed bug that prevented Praat features to be selected 
+  
+Version 0.66.11
+---------------
+* removed torch from automatic install. depends on cpu/gpu machine
+
+Version 0.66.10
+---------------
+* Removed print statements from feats_wav2vec2
+
 Version 0.66.9
 --------------
 * Version that should install without requiring opensmile which seems not to be supported by all Apple processors (arm CPU (Apple M1))

{nkululeko-0.66.9 → nkululeko-0.66.12}/README.md

@@ -66,6 +66,23 @@ Create and activate a virtual Python environment and simply run
 ```
 pip install nkululeko
 ```
+We excluded some packages from the automatic installation because they might depend on your computer and some of them are only needed in special cases. So if the error
+```
+module x not found
+```
+appears, please try
+```
+pip install x
+```
+For many packages you will need the missing torch package.
+If you don't have a GPU (which is probably true if you don't know what that is), please use
+```
+pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
+```
+else, you can use the default:
+```
+pip install torch torchvision torchaudio
+```
 
 Some examples for *ini*-files (which you use to control nkululeko) are in the [tests folder](https://github.com/felixbur/nkululeko/tree/main/tests).
 
@@ -143,7 +160,8 @@ There's my [blog](http://blog.syntheticspeech.de/?s=nkululeko) with tutorials:
 * [Predict new labels for your data from public models and check bias](http://blog.syntheticspeech.de/2023/08/16/nkululeko-how-to-predict-labels-for-your-data-from-existing-models-and-check-them/)
 * [Resample](http://blog.syntheticspeech.de/2023/08/31/how-to-fix-different-sampling-rates-in-a-dataset-with-nkululeko/)
 * [Get some statistics on correlation and effect-size](http://blog.syntheticspeech.de/2023/09/05/nkululeko-get-some-statistics-on-correlation-and-effect-size/)
-
+* [Generate a latex / pdf report](http://blog.syntheticspeech.de/2023/09/26/nkululeko-generate-a-latex-pdf-report/) 
+  
 The framework is targeted at the speech domain and supports experiments where different classifiers are combined with different feature extractors.
 
 Here's a rough UML-like sketch of the framework (and [here's the real one done with pyreverse](meta/images/classes.png)).

nkululeko-0.66.12/nkululeko/constants.py

@@ -0,0 +1,2 @@
+VERSION="0.66.12"
+SAMPLING_RATE = 16000

{nkululeko-0.66.9 → nkululeko-0.66.12}/nkululeko/feat_extract/feats_praat.py

@@ -59,30 +59,30 @@ class Praatset(Featureset):
         feats = None
         return feats
 
-    def filter(self):
-        # use only the features that are indexed in the target dataframes
-        self.df = self.df[self.df.index.isin(self.data_df.index)]
-        try:
-            # use only some features
-            selected_features = ast.literal_eval(
-                glob_conf.config["FEATS"]["praat.features"]
-            )
-            self.util.debug(
-                f"selecting features from Praat: {selected_features}"
-            )
-            sel_feats_df = pd.DataFrame()
-            hit = False
-            for feat in selected_features:
-                try:
-                    sel_feats_df[feat] = self.df[feat]
-                    hit = True
-                except KeyError:
-                    pass
-            if hit:
-                self.df = sel_feats_df
-                self.util.debug(
-                    "new feats shape after selecting Praat features:"
-                    f" {self.df.shape}"
-                )
-        except KeyError:
-            pass
+    # def filter(self):
+    #     # use only the features that are indexed in the target dataframes
+    #     self.df = self.df[self.df.index.isin(self.data_df.index)]
+    #     try:
+    #         # use only some features
+    #         selected_features = ast.literal_eval(
+    #             glob_conf.config["FEATS"]["praat.features"]
+    #         )
+    #         self.util.debug(
+    #             f"selecting features from Praat: {selected_features}"
+    #         )
+    #         sel_feats_df = pd.DataFrame()
+    #         hit = False
+    #         for feat in selected_features:
+    #             try:
+    #                 sel_feats_df[feat] = self.df[feat]
+    #                 hit = True
+    #             except KeyError:
+    #                 pass
+    #         if hit:
+    #             self.df = sel_feats_df
+    #             self.util.debug(
+    #                 "new feats shape after selecting Praat features:"
+    #                 f" {self.df.shape}"
+    #             )
+    #     except KeyError:
+    #         pass

{nkululeko-0.66.9 → nkululeko-0.66.12}/nkululeko/feat_extract/feats_wav2vec2.py

@@ -62,11 +62,11 @@ class Wav2vec2(Featureset):
                 ), f"got {sampling_rate} instead of 16000"
                 emb = self.get_embeddings(signal, sampling_rate, file)
                 emb_series[idx] = emb
-            print(f"emb_series shape: {emb_series.shape}")
+            # print(f"emb_series shape: {emb_series.shape}")
             self.df = pd.DataFrame(
                 emb_series.values.tolist(), index=self.data_df.index
             )
-            print(f"df shape: {self.df.shape}")
+            # print(f"df shape: {self.df.shape}")
             self.df.to_pickle(storage)
             try:
                 glob_conf.config["DATA"]["needs_feature_extraction"] = "false"
@@ -77,7 +77,7 @@ class Wav2vec2(Featureset):
             self.df = pd.read_pickle(storage)
             if self.df.isnull().values.any():
                 nanrows = self.df.columns[self.df.isna().any()].tolist()
-                print(nanrows)
+                # print(nanrows)
                 self.util.error(
                     f"got nan: {self.df.shape} {self.df.isnull().sum().sum()}"
                 )
@@ -103,7 +103,7 @@ class Wav2vec2(Featureset):
         except RuntimeError as re:
             print(str(re))
             self.util.error(f"couldn't extract file: {file}")
-        print(f"y flattened shape: {y.ravel().shape}")
+        # print(f"y flattened shape: {y.ravel().shape}")
         return y.ravel()
 
     def extract_sample(self, signal, sr):

{nkululeko-0.66.9 → nkululeko-0.66.12/nkululeko.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.66.9
+Version: 0.66.12
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -24,6 +24,7 @@ Requires-Dist: imageio
 Requires-Dist: laion-clap
 Requires-Dist: matplotlib
 Requires-Dist: numpy
+Requires-Dist: opensmile
 Requires-Dist: pandas
 Requires-Dist: praat-parselmouth
 Requires-Dist: pylatex
@@ -33,8 +34,6 @@ Requires-Dist: seaborn
 Requires-Dist: sounddevice
 Requires-Dist: tensorflow
 Requires-Dist: tensorflow_hub
-Requires-Dist: torch
-Requires-Dist: torchvision
 Requires-Dist: transformers
 Requires-Dist: umap-learn
 Requires-Dist: xgboost
@@ -107,6 +106,23 @@ Create and activate a virtual Python environment and simply run
 ```
 pip install nkululeko
 ```
+We excluded some packages from the automatic installation because they might depend on your computer and some of them are only needed in special cases. So if the error
+```
+module x not found
+```
+appears, please try
+```
+pip install x
+```
+For many packages you will need the missing torch package.
+If you don't have a GPU (which is probably true if you don't know what that is), please use
+```
+pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
+```
+else, you can use the default:
+```
+pip install torch torchvision torchaudio
+```
 
 Some examples for *ini*-files (which you use to control nkululeko) are in the [tests folder](https://github.com/felixbur/nkululeko/tree/main/tests).
 
@@ -184,7 +200,8 @@ There's my [blog](http://blog.syntheticspeech.de/?s=nkululeko) with tutorials:
 * [Predict new labels for your data from public models and check bias](http://blog.syntheticspeech.de/2023/08/16/nkululeko-how-to-predict-labels-for-your-data-from-existing-models-and-check-them/)
 * [Resample](http://blog.syntheticspeech.de/2023/08/31/how-to-fix-different-sampling-rates-in-a-dataset-with-nkululeko/)
 * [Get some statistics on correlation and effect-size](http://blog.syntheticspeech.de/2023/09/05/nkululeko-get-some-statistics-on-correlation-and-effect-size/)
-
+* [Generate a latex / pdf report](http://blog.syntheticspeech.de/2023/09/26/nkululeko-generate-a-latex-pdf-report/) 
+  
 The framework is targeted at the speech domain and supports experiments where different classifiers are combined with different feature extractors.
 
 Here's a rough UML-like sketch of the framework (and [here's the real one done with pyreverse](meta/images/classes.png)).
@@ -256,6 +273,18 @@ Nkululeko can be used under the [MIT license](https://choosealicense.com/license
 Changelog
 =========
 
+Version 0.66.12
+---------------
+* fixed bug that prevented Praat features to be selected 
+  
+Version 0.66.11
+---------------
+* removed torch from automatic install. depends on cpu/gpu machine
+
+Version 0.66.10
+---------------
+* Removed print statements from feats_wav2vec2
+
 Version 0.66.9
 --------------
 * Version that should install without requiring opensmile which seems not to be supported by all Apple processors (arm CPU (Apple M1))

{nkululeko-0.66.9 → nkululeko-0.66.12}/nkululeko.egg-info/requires.txt

@@ -9,6 +9,7 @@ imageio
 laion-clap
 matplotlib
 numpy
+opensmile
 pandas
 praat-parselmouth
 pylatex
@@ -18,8 +19,6 @@ seaborn
 sounddevice
 tensorflow
 tensorflow_hub
-torch
-torchvision
 transformers
 umap-learn
 xgboost

{nkululeko-0.66.9 → nkululeko-0.66.12}/nkululeko.egg-info/top_level.txt

@@ -7,7 +7,6 @@ docs
 experiments
 meta
 nkululeko
-results
 test_wavs
 tests
 tests_old

{nkululeko-0.66.9 → nkululeko-0.66.12}/setup.cfg

@@ -28,6 +28,7 @@ install_requires =
 	laion-clap
 	matplotlib
 	numpy
+	opensmile
 	pandas
 	praat-parselmouth
 	pylatex
@@ -37,8 +38,6 @@ install_requires =
 	sounddevice
 	tensorflow
 	tensorflow_hub
-	torch
-	torchvision
 	transformers
 	umap-learn
 	xgboost

nkululeko-0.66.9/nkululeko/constants.py

@@ -1,2 +0,0 @@
-VERSION="0.66.9"
-SAMPLING_RATE = 16000