Skip to content
This repository was archived by the owner on Jun 19, 2025. It is now read-only.

Commit 7024451

Browse files
reubenreuben
authored
Merge pull request #3050 from mozilla/update-r0.8
Update r0.8
2 parents 29ec97b + c6efdc6 commit 7024451

36 files changed

+234
-98
lines changed

‎Dockerfile‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,16 +194,17 @@ WORKDIR /DeepSpeech/
194194
RUN pip3 install tensorflow-gpu==1.15.0
195195

196196

197-
# Make DeepSpeech and install Python bindings
197+
# Build client.cc and install Python client and decoder bindings
198198
ENV TFDIR /tensorflow
199199
WORKDIR /DeepSpeech/native_client
200200
RUN make deepspeech
201-
WORKDIR /DeepSpeech/native_client/python
202-
RUN make bindings
203-
RUN pip3 install --upgrade dist/deepspeech*
204-
WORKDIR /DeepSpeech/native_client/ctcdecode
205-
RUN make bindings
206-
RUN pip3 install --upgrade dist/*.whl
201+
202+
WORKDIR /DeepSpeech
203+
RUN cd native_client/python && make bindings
204+
RUN pip3 install --upgrade native_client/python/dist/*.whl
205+
206+
RUN cd native_client/ctcdecode && make bindings
207+
RUN pip3 install --upgrade native_client/ctcdecode/dist/*.whl
207208

208209

209210
# << END Build and bind

‎GRAPH_VERSION‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎GRAPH_VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
training/deepspeech_training/GRAPH_VERSION

‎VERSION‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
training/deepspeech_training/VERSION

‎bin/import_cv.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def _maybe_convert_set(extracted_dir, source_csv, target_csv):
127127
pool.join()
128128

129129
print('Writing "%s"...' % target_csv)
130-
with open(target_csv, "w") as target_csv_file:
130+
with open(target_csv, "w", encoding="utf-8", newline="") as target_csv_file:
131131
writer = csv.DictWriter(target_csv_file, fieldnames=FIELDNAMES)
132132
writer.writeheader()
133133
bar = progressbar.ProgressBar(max_value=len(rows), widgets=SIMPLE_BAR)

‎bin/import_cv2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def _maybe_convert_set(dataset, tsv_dir, audio_dir, filter_obj, space_after_ever
127127

128128
output_csv = os.path.join(os.path.abspath(audio_dir), dataset + ".csv")
129129
print("Saving new DeepSpeech-formatted CSV file to: ", output_csv)
130-
with open(output_csv, "w", encoding="utf-8") as output_csv_file:
130+
with open(output_csv, "w", encoding="utf-8", newline="") as output_csv_file:
131131
print("Writing CSV file for DeepSpeech.py as: ", output_csv)
132132
writer = csv.DictWriter(output_csv_file, fieldnames=FIELDNAMES)
133133
writer.writeheader()

‎bin/import_lingua_libre.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ def _maybe_convert_sets(target_dir, extracted_data):
136136
pool.close()
137137
pool.join()
138138

139-
with open(target_csv_template.format("train"), "w") as train_csv_file: # 80%
140-
with open(target_csv_template.format("dev"), "w") as dev_csv_file: # 10%
141-
with open(target_csv_template.format("test"), "w") as test_csv_file: # 10%
139+
with open(target_csv_template.format("train"), "w", encoding="utf-8", newline="") as train_csv_file: # 80%
140+
with open(target_csv_template.format("dev"), "w", encoding="utf-8", newline="") as dev_csv_file: # 10%
141+
with open(target_csv_template.format("test"), "w", encoding="utf-8", newline="") as test_csv_file: # 10%
142142
train_writer = csv.DictWriter(train_csv_file, fieldnames=FIELDNAMES)
143143
train_writer.writeheader()
144144
dev_writer = csv.DictWriter(dev_csv_file, fieldnames=FIELDNAMES)

‎bin/import_m-ailabs.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ def _maybe_convert_sets(target_dir, extracted_data):
137137
pool.close()
138138
pool.join()
139139

140-
with open(target_csv_template.format("train"), "w") as train_csv_file: # 80%
141-
with open(target_csv_template.format("dev"), "w") as dev_csv_file: # 10%
142-
with open(target_csv_template.format("test"), "w") as test_csv_file: # 10%
140+
with open(target_csv_template.format("train"), "w", encoding="utf-8", newline="") as train_csv_file: # 80%
141+
with open(target_csv_template.format("dev"), "w", encoding="utf-8", newline="") as dev_csv_file: # 10%
142+
with open(target_csv_template.format("test"), "w", encoding="utf-8", newline="") as test_csv_file: # 10%
143143
train_writer = csv.DictWriter(train_csv_file, fieldnames=FIELDNAMES)
144144
train_writer.writeheader()
145145
dev_writer = csv.DictWriter(dev_csv_file, fieldnames=FIELDNAMES)

‎bin/import_slr57.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ def _maybe_convert_sets(target_dir, extracted_data):
159159
pool.close()
160160
pool.join()
161161

162-
with open(target_csv_template.format("train"), "w") as train_csv_file: # 80%
163-
with open(target_csv_template.format("dev"), "w") as dev_csv_file: # 10%
164-
with open(target_csv_template.format("test"), "w") as test_csv_file: # 10%
162+
with open(target_csv_template.format("train"), "w", encoding="utf-8", newline="") as train_csv_file: # 80%
163+
with open(target_csv_template.format("dev"), "w", encoding="utf-8", newline="") as dev_csv_file: # 10%
164+
with open(target_csv_template.format("test"), "w", encoding="utf-8", newline="") as test_csv_file: # 10%
165165
train_writer = csv.DictWriter(train_csv_file, fieldnames=FIELDNAMES)
166166
train_writer.writeheader()
167167
dev_writer = csv.DictWriter(dev_csv_file, fieldnames=FIELDNAMES)

0 commit comments

Comments
 (0)