Merge pull request explosion#1 from henningpeters/master

fancyvec -> sense2vec
orsonadams · Feb 1, 2016 · d16d858 · d16d858
2 parents a75afb3 + 3b4323a
commit d16d858
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 107 deletions.
diff --git a/fancyvec/tests/.test_vectors.py.swp b/fancyvec/tests/.test_vectors.py.swp
diff --git a/fancyvec/tests/__pycache__/test_vectors.cpython-27-PYTEST.pyc b/fancyvec/tests/__pycache__/test_vectors.cpython-27-PYTEST.pyc
diff --git a/sense2vec/__init__.py b/sense2vec/__init__.py
diff --git a/fancyvec/about.py → sense2vec/about.py b/fancyvec/about.py → sense2vec/about.py
@@ -3,8 +3,8 @@
 # https://python-packaging-user-guide.readthedocs.org/en/latest/single_source_version/
 # https://github.com/pypa/warehouse/blob/master/warehouse/__about__.py
 
-__name__ = 'fancyvec'
-__version__ = '0.1'
+__name__ = 'sense2vec'
+__version__ = '0.1.0'
 __summary__ = 'Fancy word2vec'
 __uri__ = 'https://spacy.io'
 __author__ = 'Matthew Honnibal'

diff --git a/sense2vec/cblas_shim.h b/sense2vec/cblas_shim.h
@@ -0,0 +1,8 @@
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+#include <cblas.h>
+#ifdef __cplusplus
+}
+#endif
diff --git a/fancyvec/count_words.pyx → sense2vec/count_words.pyx b/fancyvec/count_words.pyx → sense2vec/count_words.pyx
diff --git a/fancyvec/merge_text.py → sense2vec/merge_text.py b/fancyvec/merge_text.py → sense2vec/merge_text.py
diff --git a/fancyvec/tests/test_vectors.py → sense2vec/tests/test_vectors.py b/fancyvec/tests/test_vectors.py → sense2vec/tests/test_vectors.py
@@ -1,7 +1,7 @@
 import pytest
 import numpy
 
-from fancyvec.vectors import Vectors
+from sense2vec.vectors import Vectors
 
 
 def test_init():

diff --git a/fancyvec/vectors.pyx → sense2vec/vectors.pyx b/fancyvec/vectors.pyx → sense2vec/vectors.pyx
@@ -201,7 +201,7 @@ cdef void linear_similarity(int* indices, float* scores, float* tmp,
         i += 1
 
 
-cdef extern from "cblas.h":
+cdef extern from "cblas_shim.h":
     float cblas_sdot(int N, float  *x, int incX, float  *y, int incY ) nogil
     float cblas_snrm2(int N, float  *x, int incX) nogil
 

diff --git a/fancyvec/word2vec.py → sense2vec/word2vec.py b/fancyvec/word2vec.py → sense2vec/word2vec.py
diff --git a/fancyvec/word2vec_inner.pxd → sense2vec/word2vec_inner.pxd b/fancyvec/word2vec_inner.pxd → sense2vec/word2vec_inner.pxd
diff --git a/fancyvec/word2vec_inner.pyx → sense2vec/word2vec_inner.pyx b/fancyvec/word2vec_inner.pyx → sense2vec/word2vec_inner.pyx
diff --git a/serve_vectors.py b/serve_vectors.py
diff --git a/setup.py b/setup.py
@@ -15,10 +15,10 @@
 
 
 PACKAGES = [
-    'fancyvec'
+    'sense2vec'
 ]
 
-MOD_NAMES = ['fancyvec.vectors']
+MOD_NAMES = ['sense2vec.vectors']
 
 
 if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[0:2] < (3, 4):
@@ -28,10 +28,13 @@
 # By subclassing build_extensions we have the actual compiler that will be used which is really known only after finalize_options
 # http://stackoverflow.com/questions/724664/python-distutils-how-to-get-a-compiler-that-is-going-to-be-used
 compile_options =  {'msvc'  : ['/Ox', '/EHsc'],
-                    'other' : ['-O3', '-Wno-strict-prototypes', '-Wno-unused-function', '-fopenmp',
-                                '-fno-stack-protector']}
+                    'other' : ['-O3', '-Wno-unused-function',
+                               '-fopenmp', '-fno-stack-protector']}
 link_options    =  {'msvc'  : [],
-                    'other' : ['-lcblas', '-fopenmp', '-fno-stack-protector']}
+                    'other' : ['-Wl,--no-undefined',
+                               '-fopenmp', '-fno-stack-protector',
+                               '-L/usr/lib64/atlas',  # needed for redhat
+                               '-lcblas']}
 
 if sys.platform.startswith('darwin'):
     compile_options['other'].append('-mmacosx-version-min=10.8')
@@ -130,7 +133,7 @@ def setup_package():
 
     with chdir(root):
         about = {}
-        with open(os.path.join(root, "fancyvec", "about.py")) as f:
+        with open(os.path.join(root, "sense2vec", "about.py")) as f:
             exec(f.read(), about)
 
         include_dirs = [
@@ -145,7 +148,7 @@ def setup_package():
                     language='c++', include_dirs=include_dirs))
 
         if not is_source_release(root):
-            generate_cython(root, 'fancyvec')
+            generate_cython(root, 'sense2vec')
             prepare_includes(root)
 
         setup(