Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

[MXNET-912] Refactoring ctc loss operator #12637

Merged
anirudh2290 merged 21 commits into from
Oct 9, 2018
Merged

[MXNET-912] Refactoring ctc loss operator #12637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7718982
Implement ctc_loss as a normal operator
apeforest Sep 18, 2018
3d7ca68
Update unit test
apeforest Sep 19, 2018
7e6f309
Merge remote-tracking branch 'upstream/master' into refactor/ctc_loss…
apeforest Sep 19, 2018
d4194c9
Update unit test and fix bug in backward
apeforest Sep 21, 2018
736ec1d
fix lint error
apeforest Sep 21, 2018
9622bbc
Merge remote-tracking branch 'upstream/master' into refactor/ctc_loss…
apeforest Sep 21, 2018
923a8c1
refactoring
apeforest Sep 21, 2018
de3e830
Fix compilation error in CUDA
apeforest Sep 24, 2018
c37a9b5
Fix CPU compilation error
apeforest Sep 24, 2018
c25424a
Merge remote-tracking branch 'upstream/master' into refactor/ctc_loss…
apeforest Sep 25, 2018
fe7b33a
Move ctc_include to nn folder and refactor
apeforest Sep 27, 2018
7a55262
temporarily disable lint on 3rd party includes
apeforest Sep 27, 2018
6fa4a13
move ctc_include to 3rdparty
apeforest Oct 1, 2018
c13197a
remove contrib ctc_loss operator
apeforest Oct 2, 2018
b4b45b2
revert a change by mistake
apeforest Oct 2, 2018
8b36f97
Fix a bug in kDevCPU
apeforest Oct 2, 2018
8555743
revert change by mistake
apeforest Oct 2, 2018
cf8c107
add alias to make it backward compatible
apeforest Oct 2, 2018
787ae3b
Merge remote-tracking branch 'upstream/master' into refactor/ctc_loss…
apeforest Oct 5, 2018
f53c390
add unit test for backward compatibility
apeforest Oct 5, 2018
1f09bf8
linting
apeforest Oct 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 src/operator/contrib/ctc_include/LICENSE → 3rdparty/ctc_include/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...rib/ctc_include/contrib/moderngpu/LICENSE → ...rty/ctc_include/contrib/moderngpu/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...derngpu/include/device/ctaloadbalance.cuh → ...derngpu/include/device/ctaloadbalance.cuh
View file
Open in desktop
File renamed without changes.
0 ...rib/moderngpu/include/device/ctamerge.cuh → ...rib/moderngpu/include/device/ctamerge.cuh
View file
Open in desktop
File renamed without changes.
0 ...trib/moderngpu/include/device/ctascan.cuh → ...trib/moderngpu/include/device/ctascan.cuh
View file
Open in desktop
File renamed without changes.
0 ...ib/moderngpu/include/device/ctasearch.cuh → ...ib/moderngpu/include/device/ctasearch.cuh
View file
Open in desktop
File renamed without changes.
0 ...moderngpu/include/device/ctasegreduce.cuh → ...moderngpu/include/device/ctasegreduce.cuh
View file
Open in desktop
File renamed without changes.
0 ...b/moderngpu/include/device/ctasegscan.cuh → ...b/moderngpu/include/device/ctasegscan.cuh
View file
Open in desktop
File renamed without changes.
0 ...b/moderngpu/include/device/ctasegsort.cuh → ...b/moderngpu/include/device/ctasegsort.cuh
View file
Open in desktop
File renamed without changes.
0 ...erngpu/include/device/ctasortedsearch.cuh → ...erngpu/include/device/ctasortedsearch.cuh
View file
Open in desktop
File renamed without changes.
0 .../moderngpu/include/device/devicetypes.cuh → .../moderngpu/include/device/devicetypes.cuh
View file
Open in desktop
File renamed without changes.
0 ...b/moderngpu/include/device/deviceutil.cuh → ...b/moderngpu/include/device/deviceutil.cuh
View file
Open in desktop
File renamed without changes.
0 ...b/moderngpu/include/device/intrinsics.cuh → ...b/moderngpu/include/device/intrinsics.cuh
View file
Open in desktop
File renamed without changes.
0 ...ib/moderngpu/include/device/loadstore.cuh → ...ib/moderngpu/include/device/loadstore.cuh
View file
Open in desktop
File renamed without changes.
0 ...b/moderngpu/include/device/serialsets.cuh → ...b/moderngpu/include/device/serialsets.cuh
View file
Open in desktop
File renamed without changes.
0 .../moderngpu/include/device/sortnetwork.cuh → .../moderngpu/include/device/sortnetwork.cuh
View file
Open in desktop
File renamed without changes.
0 .../contrib/moderngpu/include/mgpudevice.cuh → .../contrib/moderngpu/include/mgpudevice.cuh
View file
Open in desktop
File renamed without changes.
0 ...ude/contrib/moderngpu/include/mgpuenums.h → ...ude/contrib/moderngpu/include/mgpuenums.h
View file
Open in desktop
File renamed without changes.
0 ...e/contrib/moderngpu/include/util/static.h → ...e/contrib/moderngpu/include/util/static.h
View file
Open in desktop
File renamed without changes.
0 ...ator/contrib/ctc_include/detail/cpu_ctc.h → 3rdparty/ctc_include/detail/cpu_ctc.h
View file
Open in desktop
File renamed without changes.
0 ...r/contrib/ctc_include/detail/ctc_helper.h → 3rdparty/ctc_include/detail/ctc_helper.h
View file
Open in desktop
File renamed without changes.
0 ...ator/contrib/ctc_include/detail/gpu_ctc.h → 3rdparty/ctc_include/detail/gpu_ctc.h
View file
Open in desktop
File renamed without changes.
0 ...trib/ctc_include/detail/gpu_ctc_kernels.h → ...arty/ctc_include/detail/gpu_ctc_kernels.h
View file
Open in desktop
File renamed without changes.
0 ...r/contrib/ctc_include/detail/hostdevice.h → 3rdparty/ctc_include/detail/hostdevice.h
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions python/mxnet/gluon/loss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,10 @@ def hybrid_forward(self, F, pred, label,
pred = F.swapaxes(pred, 0, 1)
if self._batch_axis == 1:
label = F.swapaxes(label, 0, 1)
loss = F.contrib.CTCLoss(pred, label, pred_lengths, label_lengths,
use_data_lengths=pred_lengths is not None,
use_label_lengths=label_lengths is not None,
blank_label='last')
loss = F.CTCLoss(pred, label, pred_lengths, label_lengths,
use_data_lengths=pred_lengths is not None,
use_label_lengths=label_lengths is not None,
blank_label='last')
return _apply_weighting(F, loss, self._weight, sample_weight)


Expand Down
Loading