Merge pull request #51 #53
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
dont have time to check right now so you guys merge if you think it's OK
…On Fri, Jun 5, 2020 at 4:41 PM Haowen Qiu ***@***.***> wrote:
This PR is totally from Dan's PR #51
<https://github.com/danpovey/k2/pull/51> about Array2 , I just fix a few
style issues.
------------------------------
You can view, comment on, or merge this pull request online at:
https://github.com/danpovey/k2/pull/53
Commit Summary
- Added interface for auxiliary labels
- Add notes on Python interface
- Fix typos
- Merge master
- Fix conflicts, remove some typedefs
- Fixes from review
- Small fixes in determinization code
- Merge remote-tracking branch 'upstream/master' into aux_labels
- Progress on determinization code; add new declarations of un-pruned
functions
- Merge remote-tracking branch 'upstream/master' into aux_labels
- Fix compile error
- Resolve conflicts
- Add LogAdd
- Fix compile errors in util.h
- More progress on determinization code
- Merge master
- More progress on determinizaton draft.
- More work on Determinize code.
- Draft of ConstFsa interface and CfsaVec
- Add interface for ConstFsa; more notes on python interface
- Small fixes to ConstFsa interface
- Changes from review
- Merge remote-tracking branch 'upstream/master' into cfsa_etc
- Fix style issues
- Add itf for DenseFsa (not compiled)
- Merge remote-tracking branch 'upstream/master' into cfsa_etc
- Draft of Array2/Array3
- Merge master
- Some notes on how this would work in Python
- Fix conflict
- [src] More drafts in array stuff, RE interface of functions.
- Further changes
- Merge branch 'master'
- merge Dan's PR about Array2
File Changes
- *A* k2/csrc/array.h
<https://github.com/danpovey/k2/pull/53/files#diff-c1c89fb9eaf433843ef80a1f8c518a42>
(121)
- *M* k2/csrc/aux_labels.h
<https://github.com/danpovey/k2/pull/53/files#diff-6acc9d8cbd8e9318e50608e4ca81c753>
(37)
- *M* k2/csrc/fsa.h
<https://github.com/danpovey/k2/pull/53/files#diff-70d3739c02ab83e03e1499ed60d1e46d>
(7)
- *A* notes/array.py
<https://github.com/danpovey/k2/pull/53/files#diff-1cae66d26e724cf48c6251231d8ffa63>
(57)
- *M* notes/python.txt
<https://github.com/danpovey/k2/pull/53/files#diff-3cee0c64b91b1a02a92ed9a8889a6689>
(85)
Patch Links:
- https://github.com/danpovey/k2/pull/53.patch
- https://github.com/danpovey/k2/pull/53.diff
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<https://github.com/danpovey/k2/pull/53>, or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAZFLO2FDPJPKB6Z3GS7QBLRVCVR5ANCNFSM4NTLEMIQ>
.
|
|
Merging as previous comments in pull request https://github.com/danpovey/k2/pull/51 have been fixed. We can fix any other issues later while we use |
Closed
csukuangfj
reviewed
Jun 5, 2020
| # would be (150,None,None). | ||
| # The Nones are for dimensions where the shape is not known | ||
| # because it is variable. | ||
| return (indexes.shape[0] - 1, None, *data.shape[1:]) |
There was a problem hiding this comment.
The comments are confusing compared to
return (indexes.shape[0] - 1, None, *data.shape[1:]).
Could you please make it clearer? @danpovey
There was a problem hiding this comment.
I think indexes.shape should be 16 here. Can you please edit though? Sorry I am a bit busy today. I am hoping @qindazhu can have a look at your PR. Thanks so much!!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is totally from Dan's PR https://github.com/danpovey/k2/pull/51 about
Array2, I just fix a few style issues.