restyle API Ref #2102
restyle API Ref #2102
Conversation
# Conflicts: # docs/conf.py # docs/src/_static/css/style.css # docs/src/apiref.rst # docs/src/corpora/lowcorpus.rst # docs/src/corpora/malletcorpus.rst # docs/src/corpora/textcorpus.rst # docs/src/corpora/ucicorpus.rst # docs/src/gensim_theme/layout.html # docs/src/models/lsi_dispatcher.rst # docs/src/models/lsi_worker.rst # docs/src/models/wrappers/fasttext.rst # gensim/__init__.py # gensim/models/fasttext.py # setup.py
|
@anotherbugmaster I'm getting some CircleCI errors after the merge, not sure how to resolve those. Can you please have a look? |
|
@piskvorky, I'm on a vacation til 5th of July, but I'll have a look tonight |
|
Fixed. Removed *.rst with inner/outer d2v and w2v for now (not sure where to place them in the new API reference). |
|
Strange, I see some more merge conflicts, although I'm pretty sure I merged |
|
@piskvorky in #1809 no more merge conflicts and Circle build successfully, probably your merge was incorrect, let's work in #1809 and close current PR. |
|
I resolved the merge conflict. It was due to the recently merged non-API PR, which changed some files that this PR deleted. We cannot just close this PR, it contains multiple important fixes and conflict resolutions in its merge commits. I suggest closing #1809 (I see some regressions in the recent commits there) and continuing here. |
| @@ -301,10 +301,12 @@ def __init__(self, corpus=None, id2word=None, dictionary=None, wlocal=utils.iden | |||
| Only when `pivot` is not None will pivoted document length normalization be applied. | |||
| Otherwise, regular TfIdf is used. | |||
| slope : float, optional | |||
| Parameter required by pivoted document length normalization which determines the slope to which | |||
| the `old normalization` can be tilted. This parameter only works when `pivot` is defined. | |||
| It is the parameter required by pivoted document length normalization which determines the slope to which | |||
There was a problem hiding this comment.
Regression (PR contained had a newer, fixed version).
Out of curiosity -- what was this conflict from? This branch was already up-to-date with develop.
|
This PR is important, but we need to fix current issues first, CC @anotherbugmaster
|
mpenkov
added
the
stale
|
Apparently this PR contains some doc fixes, now lost in a sea of weird merges and abandoned code. I no longer recall what all this was about. Is it worth fishing out those fixes and applying them to the current |
Render a nicer API reference page. Continues from #1809.
I had trouble merging
developinto this PR -- there were files with trailing whitespace (*_inner.c), and even two files with Windows line endings:lsi_dispatcher.py,lsi_worker.py, which prevented me from committing the resolved conflicts.I solved the conflicts by removing trailing whitespace, converting line endings to Unix and then finishing the merge commit.
I also fixed the content of the documentation of the distributed LSI and LDA files, since it used incorrect docstring style and introduced some minor documentation bugs, in PR #1912 (specifically commit 1611f3a).