Merge pull request src-d#63 from vmarkovtsev/master

Fix the invalid resulting dtype after concatenation

.travis.yml

@@ -1,22 +1,15 @@
 language: python
 cache: pip
+dist: bionic
 linux_before_install: &linux_before_install
   - pip3 install --upgrade pip
 matrix:
   include:
     - language: generic
       os: osx
-    - python: 3.4
-      dist: trusty
-      before_install: *linux_before_install
-    - python: 3.5
-      dist: xenial
-      before_install: *linux_before_install
     - python: 3.6
-      dist: xenial
       before_install: *linux_before_install
     - python: 3.7
-      dist: xenial
       before_install: *linux_before_install
 install:
   - pip3 install numpy scipy pycodestyle codecov

setup.py

@@ -34,7 +34,7 @@
     description="Accelerated functions to calculate Word Mover's Distance",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="1.3.1",
+    version="1.3.2",
     license="Apache Software License",
     author="source{d}",
     author_email="vadim@sourced.tech",
@@ -52,7 +52,7 @@
     setup_requires=["numpy"],  # does not really help - we need it to get_include()
     install_requires=["numpy"],
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Stable",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: POSIX :: Linux",

wmd/__init__.py

@@ -382,6 +382,7 @@ def _get_vocabulary(self, index):
 
     def _common_vocabulary_batch(self, words1, weights1, i2):
         words2, weights2 = self._get_vocabulary(i2)
+        words1 = numpy.asarray(words1).astype(words2.dtype)
         joint, index = numpy.unique(numpy.concatenate((words1, words2)),
                                     return_index=True)
         nw1 = numpy.zeros(len(joint), dtype=numpy.float32)