nkululeko 0.77.4__tar.gz → 0.77.6__tar.gz

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

@@ -1,6 +1,14 @@
 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
+
 Version 0.77.4
 --------------
 * made traditional augmentations (audiomentation module) configurable

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.77.4
+Version: 0.77.6
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -19,6 +19,7 @@ Requires-Dist: audinterface
 Requires-Dist: audiofile
 Requires-Dist: audiomentations
 Requires-Dist: audonnx
+Requires-Dist: cylimiter
 Requires-Dist: datasets
 Requires-Dist: imageio
 Requires-Dist: imbalanced-learn
@@ -189,6 +190,7 @@ Here is an overview of the interfaces:
 * **nkululeko.test**: predict a series of files with the current best model
 * **nkululeko.explore**: perform data exploration
 * **nkululeko.augment**: augment the current training data
+* **nkululeko.aug_train**: augment the current training data and do a training including this data
 * **nkululeko.predict**: predict features like SNR, MOS, arousal/valence, age/gender, with DNN models
 * **nkululeko.segment**: segment a database based on VAD (voice activity detection)
 * **nkululeko.resample**: check on all sampling rates and change to 16kHz 
@@ -310,6 +312,14 @@ 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
+
 Version 0.77.4
 --------------
 * made traditional augmentations (audiomentation module) configurable

{nkululeko-0.77.4 → nkululeko-0.77.6}/README.md

@@ -144,6 +144,7 @@ Here is an overview of the interfaces:
 * **nkululeko.test**: predict a series of files with the current best model
 * **nkululeko.explore**: perform data exploration
 * **nkululeko.augment**: augment the current training data
+* **nkululeko.aug_train**: augment the current training data and do a training including this data
 * **nkululeko.predict**: predict features like SNR, MOS, arousal/valence, age/gender, with DNN models
 * **nkululeko.segment**: segment a database based on VAD (voice activity detection)
 * **nkululeko.resample**: check on all sampling rates and change to 16kHz 

{nkululeko-0.77.4 → 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.4 → nkululeko-0.77.6}/nkululeko/augmenting/augmenter.py

@@ -60,7 +60,15 @@ class Augmenter:
             audiofile.write(new_full_name, signal=sig_aug, sampling_rate=sr)
             index_map[f] = new_full_name
         df_ret = self.df.copy()
-        file_index = df_ret.index.levels[0].map(lambda x: index_map[x]).values
-        df_ret = df_ret.set_index(df_ret.index.set_levels(file_index, level="file"))
+
+        file_index = df_ret.index.to_series().map(lambda x: index_map[x[0]]).values
+        # workaround because i just couldn't get this easier...
+        arrays = [
+            file_index,
+            list(df_ret.index.get_level_values(1)),
+            list(df_ret.index.get_level_values(2)),
+        ]
+        new_index = pd.MultiIndex.from_arrays(arrays, names=("file", "start", "end"))
+        df_ret = df_ret.set_index(new_index)
 
         return df_ret

{nkululeko-0.77.4 → nkululeko-0.77.6}/nkululeko/augmenting/randomsplicer.py

@@ -68,6 +68,15 @@ class Randomsplicer:
             index_map[f] = new_full_name
 
         df_ret = self.df.copy()
-        file_index = df_ret.index.levels[0].map(lambda x: index_map[x]).values
-        df_ret = df_ret.set_index(df_ret.index.set_levels(file_index, level="file"))
+
+        file_index = df_ret.index.to_series().map(lambda x: index_map[x[0]]).values
+        # workaround because i just couldn't get this easier...
+        arrays = [
+            file_index,
+            list(df_ret.index.get_level_values(1)),
+            list(df_ret.index.get_level_values(2)),
+        ]
+        new_index = pd.MultiIndex.from_arrays(arrays, names=("file", "start", "end"))
+        df_ret = df_ret.set_index(new_index)
+
         return df_ret

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

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

{nkululeko-0.77.4 → nkululeko-0.77.6}/nkululeko/experiment.py

@@ -261,11 +261,11 @@ class Experiment:
                 if type(test_cats) == np.ndarray:
                     self.util.debug(f"Categories test (nd.array): {test_cats}")
                 else:
-                    self.util.debug(f"Categories test (list): {test_cats.to_list()}")
+                    self.util.debug(f"Categories test (list): {list(test_cats)}")
             if type(train_cats) == np.ndarray:
                 self.util.debug(f"Categories train (nd.array): {train_cats}")
             else:
-                self.util.debug(f"Categories train (list): {train_cats.to_list()}")
+                self.util.debug(f"Categories train (list): {list(train_cats)}")
 
             # encode the labels as numbers
             self.label_encoder = LabelEncoder()

{nkululeko-0.77.4 → 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.4 → nkululeko-0.77.6}/nkululeko/models/model.py

@@ -137,11 +137,11 @@ class Model:
             groups=annos["fold"],
         ):
             train_x = feats.iloc[train_index].to_numpy()
-            train_y = targets[train_index]
+            train_y = targets.iloc[train_index]
             self.clf.fit(train_x, train_y)
 
             truth_x = feats.iloc[test_index].to_numpy()
-            truth_y = targets[test_index]
+            truth_y = targets.iloc[test_index]
             predict_y = self.clf.predict(truth_x)
             report = Reporter(truth_y.astype(float), predict_y, self.run, self.epoch)
             result = report.get_result().get_test_result()

{nkululeko-0.77.4 → nkululeko-0.77.6}/nkululeko/models/model_cnn.py

@@ -113,7 +113,7 @@ class CNN_model(Model):
             img_path = self.df_feats.iloc[idx, 0]
             image = Image.open(img_path)
             # Get emotion label
-            label = self.df_labels[self.target][idx]
+            label = self.df_labels[self.target].iloc[idx]
             if self.transform:
                 image = self.transform(image)
             return image, label

{nkululeko-0.77.4 → nkululeko-0.77.6}/nkululeko/models/model_mlp.py

@@ -115,7 +115,7 @@ class MLP_model(Model):
     def get_loader(self, df_x, df_y, shuffle):
         data = []
         for i in range(len(df_x)):
-            data.append([df_x.values[i], df_y[self.target][i]])
+            data.append([df_x.values[i], df_y[self.target].iloc[i]])
         return torch.utils.data.DataLoader(
             data, shuffle=shuffle, batch_size=self.batch_size
         )

{nkululeko-0.77.4 → 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.4 → nkululeko-0.77.6}/nkululeko/plots.py

@@ -279,7 +279,7 @@ class Plots:
         res_pval = int(res_pval[1] * 1000) / 1000
         caption = f"{ylab} {df.shape[0]}. P-val chi2: {res_pval}"
         ax = (
-            df.groupby(col1)[col2]
+            df.groupby(col1, observed=False)[col2]
             .value_counts()
             .unstack()
             .plot(kind="bar", stacked=True, title=caption, rot=0)

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

@@ -11,9 +11,24 @@ import audformat
 
 class Util:
     # a list of words that need not to be warned upon if default values are used
-    stopvals = [False, "False", "classification", "png", "audio_path"]
+    stopvals = [
+        "all",
+        False,
+        "False",
+        "classification",
+        "png",
+        "audio_path",
+        "kde",
+        "pkl",
+        "eGeMAPSv02",
+        "functionals",
+    ]
 
     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
 
@@ -25,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.4 → nkululeko-0.77.6/nkululeko.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.77.4
+Version: 0.77.6
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -19,6 +19,7 @@ Requires-Dist: audinterface
 Requires-Dist: audiofile
 Requires-Dist: audiomentations
 Requires-Dist: audonnx
+Requires-Dist: cylimiter
 Requires-Dist: datasets
 Requires-Dist: imageio
 Requires-Dist: imbalanced-learn
@@ -189,6 +190,7 @@ Here is an overview of the interfaces:
 * **nkululeko.test**: predict a series of files with the current best model
 * **nkululeko.explore**: perform data exploration
 * **nkululeko.augment**: augment the current training data
+* **nkululeko.aug_train**: augment the current training data and do a training including this data
 * **nkululeko.predict**: predict features like SNR, MOS, arousal/valence, age/gender, with DNN models
 * **nkululeko.segment**: segment a database based on VAD (voice activity detection)
 * **nkululeko.resample**: check on all sampling rates and change to 16kHz 
@@ -310,6 +312,14 @@ 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
+
 Version 0.77.4
 --------------
 * made traditional augmentations (audiomentation module) configurable

{nkululeko-0.77.4 → nkululeko-0.77.6}/nkululeko.egg-info/SOURCES.txt

@@ -160,21 +160,4 @@ nkululeko/utils/__init__.py
 nkululeko/utils/files.py
 nkululeko/utils/stats.py
 nkululeko/utils/util.py
-venv/bin/activate_this.py
-venv/bin/ina_speech_segmenter.py
-venv/bin/ina_speech_segmenter_pyro_client.py
-venv/bin/ina_speech_segmenter_pyro_client_setjobs.py
-venv/bin/ina_speech_segmenter_pyro_server.py
-venv/bin/pyannote_hmm.py
-venv/bin/rst2html.py
-venv/bin/rst2html4.py
-venv/bin/rst2html5.py
-venv/bin/rst2latex.py
-venv/bin/rst2man.py
-venv/bin/rst2odt.py
-venv/bin/rst2odt_prepstyles.py
-venv/bin/rst2pseudoxml.py
-venv/bin/rst2s5.py
-venv/bin/rst2xetex.py
-venv/bin/rst2xml.py
-venv/bin/rstpep2html.py
+venv/bin/activate_this.py

{nkululeko-0.77.4 → nkululeko-0.77.6}/nkululeko.egg-info/requires.txt

@@ -4,6 +4,7 @@ audinterface
 audiofile
 audiomentations
 audonnx
+cylimiter
 datasets
 imageio
 imbalanced-learn

{nkululeko-0.77.4 → nkululeko-0.77.6}/setup.cfg

@@ -23,6 +23,7 @@ install_requires =
 	audiofile
 	audiomentations
 	audonnx
+	cylimiter
 	datasets
 	imageio
 	imbalanced-learn

{nkululeko-0.77.4 → nkululeko-0.77.6}/venv/bin/activate_this.py

@@ -23,7 +23,7 @@ os.environ["VIRTUAL_ENV"] = base  # virtual env is right above bin directory
 
 # add the virtual environments libraries to the host python import mechanism
 prev_length = len(sys.path)
-for lib in "../lib/python3.8/site-packages".split(os.pathsep):
+for lib in "../lib/python3.10/site-packages".split(os.pathsep):
     path = os.path.realpath(os.path.join(bin_dir, lib))
     site.addsitedir(path.decode("utf-8") if "" else path)
 sys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]

nkululeko-0.77.4/venv/bin/ina_speech_segmenter.py

@@ -1,81 +0,0 @@
-#!/home/audeering.local/fburkhardt/research/nkululeko/venv/bin/python
-# encoding: utf-8
-
-# The MIT License
-
-# Copyright (c) 2018 Ina (David Doukhan, Eliott Lechapt - http://www.ina.fr/)
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-import argparse
-import glob
-import os
-import distutils.util
-import warnings
-
-# TODO
-# * allow to use external activity or speech music segmentations
-# * describe URL management in help and interference with glob
-
-description = """Do Speech/Music(/Noise) and Male/Female segmentation and store segmentations into CSV files. Segments labelled 'noEnergy' are discarded from music, noise, speech and gender analysis. 'speech', 'male' and 'female' labels include speech over music and speech over noise. 'music' and 'noise' labels are pure segments that are not supposed to contain speech.
-"""
-epilog="""
-Detailled description of this framework is presented in the following study:
-Doukhan, D., Carrive, J., Vallet, F., Larcher, A., & Meignier, S. (2018, April). An open-source speaker gender detection framework for monitoring gender equality. In 2018 IEEE International Conference on Acoustics, Speech and Signal Processing (ICASSP) (pp. 5214-5218). IEEE.
-"""
-
-
-# Configure command line parsing
-parser = argparse.ArgumentParser(description=description, epilog=epilog)
-parser.add_argument('-i', '--input', nargs='+', help='Input media to analyse. May be a full path to a media (/home/david/test.mp3), a list of full paths (/home/david/test.mp3 /tmp/mymedia.avi), a regex input pattern ("/home/david/myaudiobooks/*.mp3"), an url with http protocol (http://url_of_the_file)', required=True)
-parser.add_argument('-o', '--output_directory', help='Directory used to store segmentations. Resulting segmentations have same base name as the corresponding input media, with csv extension. Ex: mymedia.MPG will result in mymedia.csv', required=True)
-parser.add_argument('-s', '--batch_size', type=int, default=32, help="(default: 32 - we recommend 1024). Size of batches to be sent to the GPU. Larger values allow faster processings, but require GPU with more memories. Default 32 size is fine even with a baseline laptop GPU.")
-parser.add_argument('-d', '--vad_engine', choices=['sm', 'smn'], default='smn', help="Voice activity detection (VAD) engine to be used (default: 'smn'). 'smn' split signal into 'speech', 'music' and 'noise' (better). 'sm' split signal into 'speech' and 'music' and do not take noise into account, which is either classified as music or speech. Results presented in ICASSP were obtained using 'sm' option")
-parser.add_argument('-g', '--detect_gender', choices = ['true', 'false'], default='True', help="(default: 'true'). If set to 'true', segments detected as speech will be splitted into 'male' and 'female' segments. If set to 'false', segments corresponding to speech will be labelled as 'speech' (faster)")
-parser.add_argument('-b', '--ffmpeg_binary', default='ffmpeg', help='Your custom binary of ffmpeg', required=False)
-parser.add_argument('-e', '--export_format', choices = ['csv', 'textgrid'], default='csv', help="(default: 'csv'). If set to 'csv', result will be exported in csv. If set to 'textgrid', results will be exported to praat Textgrid")
-parser.add_argument('-r', '--energy_ratio', default=0.03, type=float, help="(default: 0.03). Energetic threshold used to detect activity (percentage of mean energy of the signal)")
-
-args = parser.parse_args()
-
-# Preprocess arguments and check their consistency
-input_files = []
-for e in args.input:
-    if e.startswith("http"):
-        input_files += [e]
-    else:
-        input_files += glob.glob(e)
-assert len(input_files) > 0, 'No existing media selected for analysis! Bad values provided to -i (%s)' % args.input
-
-odir = args.output_directory.strip(" \t\n\r").rstrip('/')
-assert os.access(odir, os.W_OK), 'Directory %s is not writable!' % odir
-
-# Do processings
-from inaSpeechSegmenter import Segmenter, seg2csv
-
-# load neural network into memory, may last few seconds
-detect_gender = bool(distutils.util.strtobool(args.detect_gender))
-seg = Segmenter(vad_engine=args.vad_engine, detect_gender=detect_gender, ffmpeg=args.ffmpeg_binary, energy_ratio=args.energy_ratio, batch_size=args.batch_size)
-
-with warnings.catch_warnings():
-    warnings.simplefilter("ignore")
-    base = [os.path.splitext(os.path.basename(e))[0] for e in input_files]
-    output_files = [os.path.join(odir, e + '.' + args.export_format) for e in base]
-    seg.batch_process(input_files, output_files, verbose=True, output_format=args.export_format)
-

nkululeko-0.77.4/venv/bin/ina_speech_segmenter_pyro_client.py

@@ -1,57 +0,0 @@
-#!/home/audeering.local/fburkhardt/research/nkululeko/venv/bin/python
-# encoding: utf-8
-
-# The MIT License
-
-# Copyright (c) 2018 Ina (David Doukhan - http://www.ina.fr/)
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-
-import Pyro4
-import sys
-import os
-import socket
-
-from inaSpeechSegmenter import Segmenter
-
-
-if __name__ == '__main__':
-    dname = os.path.dirname(os.path.realpath(__file__))
-
-    hostname = socket.gethostname()
-
-    uri = sys.argv[1]
-    jobserver = Pyro4.Proxy(uri)
-
-    ret = -1
-    outname = 'init'
-    
-    # batch size set at 1024. Use lower values with small gpus
-    g = Segmenter(batch_size=1024)
-    
-    while True:
-        lsrc, ldst = jobserver.get_njobs('%s %s' % (hostname, ret))
-            
-        print(lsrc, ldst)
-        if len(lsrc) == 0:
-            print('job list finished')
-            break
-        
-        ret =  g.batch_process(lsrc, ldst, skipifexist=True, nbtry=3)

nkululeko-0.77.4/venv/bin/ina_speech_segmenter_pyro_client_setjobs.py

@@ -1,37 +0,0 @@
-#!/home/audeering.local/fburkhardt/research/nkululeko/venv/bin/python
-# encoding: utf-8
-
-# The MIT License
-
-# Copyright (c) 2018 Ina (David Doukhan - http://www.ina.fr/)
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-
-import Pyro4
-import sys
-
-if __name__ == '__main__':
-    uri = sys.argv[1]
-    csvfname = sys.argv[2]
-
-    jobserver = Pyro4.Proxy(uri)
-
-    ret = jobserver.set_jobs(csvfname)
-    print(ret)

nkululeko-0.77.4/venv/bin/ina_speech_segmenter_pyro_server.py

@@ -1,76 +0,0 @@
-#!/home/audeering.local/fburkhardt/research/nkululeko/venv/bin/python
-# encoding: utf-8
-
-# The MIT License
-
-# Copyright (c) 2018 Ina (David Doukhan - http://www.ina.fr/)
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-import sys
-import Pyro4
-import numpy as np
-import pandas as pd
-
-
-@Pyro4.expose
-class GenderJobServer(object):
-    def __init__(self, csvjobs):
-        self.set_jobs(csvjobs)
-
-    def set_jobs(self, csvjobs):
-        # csv configuration file with 2 columns: source_path, dest_path
-        df = pd.read_csv(csvjobs)
-        df.source_path = df.source_path.str.strip()
-        df.dest_path = df.dest_path.str.strip()
-        df = df.drop_duplicates().sample(frac=1).reset_index(drop=True)
-        print('setting jobs')
-        print('random source & dest path:', df.source_path[0], ' ',df.dest_path[0])
-        print('number of files to process:', len(df))
-        self.lsource = list(df.source_path)
-        self.ldest = list(df.dest_path)
-        self.i = 0
-        return '%s jobs have been set' % csvjobs
-        
-    def get_job(self, msg):
-        print('job %d: %s' % (self.i, msg))
-        self.i += 1
-        return (self.lsource.pop(0), self.ldest.pop(0))
-
-    def get_njobs(self, msg, nbjobs=20):
-        print('jobs %d-%d: %s' % (self.i, self.i + nbjobs, msg))
-        ret = (self.lsource[:nbjobs], self.ldest[:nbjobs])
-        if len(ret[0]) == 0:
-            print('All jobs dispatched')
-        self.lsource = self.lsource[nbjobs:]
-        self.ldest = self.ldest[nbjobs:]
-        self.i += nbjobs
-        return ret
-
-
-
-if __name__ == '__main__':
-    # full name of the host to be used by remote clients
-    Pyro4.config.HOST = sys.argv[1]    
-    
-    daemon = Pyro4.Daemon()                # make a Pyro daemon\n",
-    uri = daemon.register(GenderJobServer(sys.argv[2]))   # register the greeting maker as a Pyro object\n",
-    print("Ready. Object uri =", uri)
-    daemon.requestLoop()
-