From 5206ee67dd6bfd183b092cf57a64bff5f257268a Mon Sep 17 00:00:00 2001
From: Joachim Wolff <wolffj@informatik.uni-freiburg.de>
Date: Thu, 22 Dec 2016 16:41:44 +0100
Subject: [PATCH] Updated setup.py

---
 setup.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/setup.py b/setup.py
index 89c79a5..0e7e670 100755
--- a/setup.py
+++ b/setup.py
@@ -48,11 +48,11 @@
 import distutils.sysconfig
 import distutils.ccompiler
 
-sources_list = ['sklearn_freiburg_extension/computation/interface/nearestNeighbors_PythonInterface.cpp', 'sklearn_freiburg_extension/computation/nearestNeighbors.cpp', 
-                 'sklearn_freiburg_extension/computation/inverseIndex.cpp', 'sklearn_freiburg_extension/computation/inverseIndexStorageUnorderedMap.cpp']
-depends_list = ['sklearn_freiburg_extension/computation/nearestNeighbors.h', 'sklearn_freiburg_extension/computation/inverseIndex.h', 'sklearn_freiburg_extension/computation/kSizeSortedMap.h',
-         'sklearn_freiburg_extension/computation/typeDefinitions.h', 'sklearn_freiburg_extension/computation/parsePythonToCpp.h', 'sklearn_freiburg_extension/computation/sparseMatrix.h',
-          'sklearn_freiburg_extension/computation/inverseIndexStorage.h', 'sklearn_freiburg_extension/computation/inverseIndexStorageUnorderedMap.h','sklearn_freiburg_extension/computation/hash.h']
+sources_list = ['sparse_neighbors_search/computation/interface/nearestNeighbors_PythonInterface.cpp', 'sparse_neighbors_search/computation/nearestNeighbors.cpp', 
+                 'sparse_neighbors_search/computation/inverseIndex.cpp', 'sparse_neighbors_search/computation/inverseIndexStorageUnorderedMap.cpp']
+depends_list = ['sparse_neighbors_search/computation/nearestNeighbors.h', 'sparse_neighbors_search/computation/inverseIndex.h', 'sparse_neighbors_search/computation/kSizeSortedMap.h',
+         'sparse_neighbors_search/computation/typeDefinitions.h', 'sparse_neighbors_search/computation/parsePythonToCpp.h', 'sparse_neighbors_search/computation/sparseMatrix.h',
+          'sparse_neighbors_search/computation/inverseIndexStorage.h', 'sparse_neighbors_search/computation/inverseIndexStorageUnorderedMap.h','sparse_neighbors_search/computation/hash.h']
 openmp = True
 if "--openmp" in sys.argv:
     module1 = Extension('_nearestNeighbors', sources = sources_list, depends = depends_list,
@@ -231,7 +231,7 @@ def build_extensions(self):
 
 if (locate_cuda() == None or no_cuda):
     print("No Cuda found or no cuda forced. Installation without GPU support.")
-    setup (name = 'sklearn_freiburg_extension',
+    setup (name = 'sparse_neighbors_search',
             author = 'Joachim Wolff',
             author_email = 'wolffj@informatik.uni-freiburg.de',
             url='https://github.com/joachimwolff/minHashNearestNeighbors',
@@ -244,9 +244,9 @@ def build_extensions(self):
             "scikit-learn >= 0.16.0",],
             ext_modules = [module1],
             # cmdclass={'build_ext': custom_build_ext_gcc},
-            packages=['sklearn_freiburg_extension',
-                        'sklearn_freiburg_extension.neighbors',
-                        'sklearn_freiburg_extension.cluster',
+            packages=['sparse_neighbors_search',
+                        'sparse_neighbors_search.neighbors',
+                        'sparse_neighbors_search.cluster',
                         #  'bioinf.computation',
                     ],
             platforms = "Linux, Mac OS X",
@@ -254,8 +254,8 @@ def build_extensions(self):
             )
 else:
     print ("CUDA found on system. Installing MinHash with CUDA-Support.")
-    sources_list.extend(['sklearn_freiburg_extension/computation/kernel.cu', 'sklearn_freiburg_extension/computation/inverseIndexCuda.cu', 'sklearn_freiburg_extension/computation/nearestNeighborsCuda.cu'])
-    depends_list.extend(['sklearn_freiburg_extension/computation/typeDefinitionsCuda.h', 'sklearn_freiburg_extension/computation/kernel.h', 'sklearn_freiburg_extension/computation/inverseIndexCuda.h', 'sklearn_freiburg_extension/computation/nearestNeighborsCuda.h', ])
+    sources_list.extend(['sparse_neighbors_search/computation/kernel.cu', 'sparse_neighbors_search/computation/inverseIndexCuda.cu', 'sparse_neighbors_search/computation/nearestNeighborsCuda.cu'])
+    depends_list.extend(['sparse_neighbors_search/computation/typeDefinitionsCuda.h', 'sparse_neighbors_search/computation/kernel.h', 'sparse_neighbors_search/computation/inverseIndexCuda.h', 'sparse_neighbors_search/computation/nearestNeighborsCuda.h', ])
     # Extension('_nearestNeighbors', sources = sources_list, depends = depends_list,
     #      define_macros=[('OPENMP', None)], extra_link_args = ["-lm", "-lrt","-lgomp"], 
     #     extra_compile_args=["-fopenmp", "-O3", "-std=c++11"])
@@ -298,7 +298,7 @@ def build_extensions(self):
                     platforms = "Linux, Mac OS X"
                     )
                 
-    setup(name='sklearn_freiburg_extension',
+    setup(name='sparse_neighbors_search',
         # random metadata. there's more you can supploy
         author='Joachim Wolff',
         ext_modules = [ext],
@@ -318,9 +318,9 @@ def build_extensions(self):
         "scipy >= 0.14.0",
         "scikit-learn >= 0.16.0",],
         # ext_modules = [module1],
-        packages=['sklearn_freiburg_extension',
-                    'sklearn_freiburg_extension.neighbors',
-                    'sklearn_freiburg_extension.cluster',
+        packages=['sparse_neighbors_search',
+                    'sparse_neighbors_search.neighbors',
+                    'sparse_neighbors_search.cluster',
                 ],
         platforms = "Linux, Mac OS X",
         version = '0.1')
\ No newline at end of file