KeyedVecs refactoring for word2vec #980
Conversation
Conflicts: CHANGELOG.md gensim/models/word2vec.py
|
|
||
| @property | ||
| def vocab(self): | ||
| return self.wv.vocab |
There was a problem hiding this comment.
should there be a warning here?
There was a problem hiding this comment.
Yes, there should be. I've added warnings now.
|
|
||
| @property | ||
| def index2word(self): | ||
| return self.wv.index2word |
There was a problem hiding this comment.
should there be a warning here?
There was a problem hiding this comment.
Same here. Added warnings now.
|
@anmol01gulati Please resolve the merge conflict by pulling in develop |
|
I've made the changes as suggested. Please review once. |
| @@ -100,15 +101,16 @@ | |||
| from types import GeneratorType | |||
|
|
|||
| logger = logging.getLogger(__name__) | |||
|
|
|||
| logging.basicConfig(format='%(asctime)s : %(levelname)s : %(message)s') | |||
There was a problem hiding this comment.
Not sure if this should be present here, logging config is usually left up to either __main__ or someone using the module.
There was a problem hiding this comment.
See #910 to see why it was removed
There was a problem hiding this comment.
Removed logging config now.
| except ImportError: | ||
| # failed... fall back to plain numpy (20-80x slower training than the above) | ||
| # Can't log here because logger is usually not configured at import time | ||
| logger.warning('Slow version of {0} is being used'.format(__name__)) |
There was a problem hiding this comment.
Does this work fine? (the removed comment seems to indicate otherwise, just making sure)
There was a problem hiding this comment.
This should be removed too @anmol01gulati
| @@ -311,23 +364,39 @@ def testLocking(self): | |||
| model.build_vocab(corpus) | |||
|
|
|||
| # remember two vectors | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
A few merge conflicts below too need to be resolved.
anmolgulati
force-pushed
the
keyedvecs
branch
from
2850bbf
to
3775552
Compare
| try: | ||
| from gensim.models.word2vec_inner import train_batch_sg, train_batch_cbow | ||
| from gensim.models.word2vec_inner import score_sentence_sg, score_sentence_cbow | ||
| from gensim.models.word2vec_inner import FAST_VERSION, MAX_WORDS_IN_BATCH | ||
| logger.debug('Fast version of {0} is being used'.format(__name__)) |
anmolgulati
force-pushed
the
keyedvecs
branch
from
ca9c5d5
to
f6adac5
Compare
|
@tmylk I've removed the log config and logging statements. Please review once, and I think we could merge it then. |
Adresses #833.