From 920c14c0d8de652bb79e29ab3d0a4b0f7d888812 Mon Sep 17 00:00:00 2001
From: Hui Zhang <zhtclz@foxmail.com>
Date: Sun, 7 Feb 2021 08:25:34 +0000
Subject: [PATCH] fix soundfile with flac support

---
 data_utils/dataset.py |  5 +++++
 model_utils/model.py  | 20 ++------------------
 setup.sh              |  9 +++++++++
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/data_utils/dataset.py b/data_utils/dataset.py
index 06ebc78fb..eaec0e401 100644
--- a/data_utils/dataset.py
+++ b/data_utils/dataset.py
@@ -15,3 +15,8 @@
 import paddle
 from paddle.io import Dataset
 from paddle.io import DataLoader
+
+
+class DeepSpeech2Dataset(Dataset):
+    def __init__(self):
+        super().__init__()
diff --git a/model_utils/model.py b/model_utils/model.py
index f4555bd69..16d8b0b96 100644
--- a/model_utils/model.py
+++ b/model_utils/model.py
@@ -25,6 +25,7 @@ import multiprocessing
 import numpy as np
 from distutils.dir_util import mkpath
 import paddle.fluid as fluid
+from paddle.io import DataLoader
 import paddle.fluid.compiler as compiler
 from decoders.swig_wrapper import Scorer
 from decoders.swig_wrapper import ctc_greedy_decoder
@@ -97,24 +98,7 @@ class DeepSpeech2Model(object):
         """
 
         if not is_infer:
-            input_fields = {
-                'names': ['audio_data', 'text_data', 'seq_len_data', 'masks'],
-                'shapes':
-                [[None, 161, None], [None, 1], [None, 1], [None, 32, 81, None]],
-                'dtypes': ['float32', 'int32', 'int64', 'float32'],
-                'lod_levels': [0, 1, 0, 0]
-            }
-
-            inputs = [
-                fluid.data(
-                    name=input_fields['names'][i],
-                    shape=input_fields['shapes'][i],
-                    dtype=input_fields['dtypes'][i],
-                    lod_level=input_fields['lod_levels'][i])
-                for i in range(len(input_fields['names']))
-            ]
-
-            reader = fluid.io.DataLoader.from_generator(
+            reader = DataLoader.from_generator(
                 feed_list=inputs,
                 capacity=64,
                 iterable=False,
diff --git a/setup.sh b/setup.sh
index 8d471cbf6..3827dc1b3 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,5 +1,11 @@
 #! /usr/bin/env  bash
 
+if [ `id -u ` == 0 ]; then
+  SUDO=
+else
+  SUDO='sudo'
+fi
+
 # install python dependencies
 if [ -f "requirements.txt" ]; then
     pip3 install -r requirements.txt
@@ -12,6 +18,9 @@ fi
 # install package libsndfile
 python3 -c "import soundfile"
 if [ $? != 0 ]; then
+    if [ -e /etc/lsb-release ];then
+        ${SUDO} apt-get install -y pkg-config libflac-dev libogg-dev libvorbis-dev libboost-dev swig python3-dev
+    fi
     echo "Install package libsndfile into default system path."
     wget "http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.28.tar.gz"
     if [ $? != 0 ]; then