some tidying up, made auto installation work

resero-labs · Mar 22, 2013 · d5d7ec0 · d5d7ec0
1 parent cffacca
commit d5d7ec0
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 3 deletions.
diff --git a/py_bh_tsne/Makefile → Makefile b/py_bh_tsne/Makefile → Makefile
@@ -1,5 +1,6 @@
 all:
 	python setup.py build_ext --inplace
+	python setup.py install
 
 clean :
 	rm -rf *.pyc *.so build/ py_bh_tsne.cpp
diff --git a/py_bh_tsne/Readme.txt → fasttsne/Readme.txt b/py_bh_tsne/Readme.txt → fasttsne/Readme.txt
diff --git a/py_bh_tsne/__init__.py → fasttsne/__init__.py b/py_bh_tsne/__init__.py → fasttsne/__init__.py
diff --git a/py_bh_tsne/compile_linux → fasttsne/compile_linux b/py_bh_tsne/compile_linux → fasttsne/compile_linux
diff --git a/py_bh_tsne/compile_mac → fasttsne/compile_mac b/py_bh_tsne/compile_mac → fasttsne/compile_mac
diff --git a/py_bh_tsne/fast_tsne.m → fasttsne/fast_tsne.m b/py_bh_tsne/fast_tsne.m → fasttsne/fast_tsne.m
diff --git a/py_bh_tsne/py_bh_tsne.pyx → fasttsne/py_bh_tsne.pyx b/py_bh_tsne/py_bh_tsne.pyx → fasttsne/py_bh_tsne.pyx
diff --git a/py_bh_tsne/quadtree.cpp → fasttsne/quadtree.cpp b/py_bh_tsne/quadtree.cpp → fasttsne/quadtree.cpp
diff --git a/py_bh_tsne/quadtree.h → fasttsne/quadtree.h b/py_bh_tsne/quadtree.h → fasttsne/quadtree.h
diff --git a/py_bh_tsne/tsne.cpp → fasttsne/tsne.cpp b/py_bh_tsne/tsne.cpp → fasttsne/tsne.cpp
diff --git a/py_bh_tsne/tsne.h → fasttsne/tsne.h b/py_bh_tsne/tsne.h → fasttsne/tsne.h
diff --git a/py_bh_tsne/vptree.h → fasttsne/vptree.h b/py_bh_tsne/vptree.h → fasttsne/vptree.h
diff --git a/py_bh_tsne/setup.py → setup.py b/py_bh_tsne/setup.py → setup.py
@@ -8,7 +8,7 @@
 if sys.platform == 'darwin':
     ext_modules = [Extension(
         name="py_bh_tsne",
-        sources=["quadtree.cpp", "tsne.cpp", "py_bh_tsne.pyx"],
+        sources=["fasttsne/quadtree.cpp", "fasttsne/tsne.cpp", "fasttsne/py_bh_tsne.pyx"],
         include_dirs = [numpy.get_include()],
         extra_compile_args=['-faltivec', '-I/System/Library/Frameworks/vecLib.framework/Headers'],
         extra_link_args=["-Wl,-framework", "-Wl,Accelerate", "-lcblas"],
@@ -17,7 +17,7 @@
 else:
     ext_modules = [Extension(
         name="py_bh_tsne",
-        sources=["quadtree.cpp", "tsne.cpp", "py_bh_tsne.pyx"],
+        sources=["fasttsne/quadtree.cpp", "fasttsne/tsne.cpp", "fasttsne/py_bh_tsne.pyx"],
         include_dirs = [numpy.get_include(), "/usr/local/include"],
         library_dirs = ["/usr/local/lib"],
         extra_compile_args=['-msse2', '-O3', '-fPIC', '-w'],
@@ -28,5 +28,6 @@
 setup(
     name = "py_bh_tsne",
     cmdclass = {"build_ext": build_ext},
-    ext_modules = ext_modules
+    ext_modules = ext_modules,
+    packages=['fasttsne'],
     )