opensourcemirror
/
adblockradio
mirror of https://github.com/adblockradio/adblockradio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mljs

This commit is contained in:
Alexandre Storelli 2019-03-21 20:47:34 +01:00 committed by GitHub
parent 2936a8909a 9f8162f37f
commit ebbe01994d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
predictor-ml/ml.js
View File

@ -196,7 +196,6 @@ class MlPredictor extends Writable {
predict(callback) { predict(callback) {
const self = this; const self = this;
if (this.JSPredictorMl && this.child && this.ready) { if (this.JSPredictorMl && this.child && this.ready) {
this.child.send(JSON.stringify({ this.child.send(JSON.stringify({
type: 'predict', type: 'predict',

8
predictor-ml/mlpredict.py
View File

@ -177,9 +177,9 @@ class MlPredictor(object):
logger.debug("ceps.shape " + str(ceps.shape) + " nnXLen " + str(nnXLen) + " nnXStep " + str(nnXStep) + " nwin " + str(nwin)) logger.debug("ceps.shape " + str(ceps.shape) + " nnXLen " + str(nnXLen) + " nnXStep " + str(nnXStep) + " nwin " + str(nwin))
X = np.empty([nwin, nnXLen, mfccNceps]) X = np.empty([nwin, nnXLen, mfccNceps])
#t3 = timer()
for i in range(nwin): for i in range(nwin):
X[i,:,:] = ceps[i*nnXStep:(i*nnXStep+nnXLen),:] X[i,:,:] = ceps[i*nnXStep:(i*nnXStep+nnXLen),:]
#t3 = timer()
predictions = self.model.predict(X, verbose=debug) predictions = self.model.predict(X, verbose=debug)
@ -195,6 +195,7 @@ class MlPredictor(object):
logger.debug("confidence " + str(confidence)) logger.debug("confidence " + str(confidence))
logger.debug("rms " + str(rms)) logger.debug("rms " + str(rms))
#t5 = timer()
result = json.dumps({ result = json.dumps({
'type': predclass, 'type': predclass,
'data': predictions.tolist(), 'data': predictions.tolist(),
@ -203,11 +204,12 @@ class MlPredictor(object):
'rms': rms, 'rms': rms,
'mem': process.memory_info().rss, 'mem': process.memory_info().rss,
'lenpcm': len(self.pcm), 'lenpcm': len(self.pcm),
#'timings': {'mfcc': str(t2-t1), 'inference': str(t4-t3)} #'timings': {'pre': str(t3-t0), 'tf': str(t4-t3), 'post': str(t5-t4), 'total': str(t5-t0)},
'nwin': nwin
}) })
logger.info("audio predicted probs=" + result) logger.info("audio predicted probs=" + result)
#logger.info("pre=%s ms tf=%s ms post=%s ms total=%s ms" % (t3-t0, t4-t3, t5-t4, t5-t0))
return result return result
def exit(self): def exit(self):