diff --git a/python_bindings/setup.py b/python_bindings/setup.py index cd5cf01..49a22f6 100755 --- a/python_bindings/setup.py +++ b/python_bindings/setup.py @@ -19,7 +19,7 @@ else: # Otherwise build all the files here directly (excluding extras which need eigen/boost) - exclude_files = set("""lsh.cc lsh_multiprobe.cc lsh_space.cc falconn.cc nndes.cc space_sqfd.cc + exclude_files = set("""bbtree.cc lsh.cc lsh_multiprobe.cc lsh_space.cc falconn.cc nndes.cc space_sqfd.cc dummy_app.cc main.cc""".split()) for root, subdirs, files in os.walk(os.path.join("nmslib", "similarity_search", "src")): diff --git a/similarity_search/include/factory/method/bbtree.h b/similarity_search/include/factory/method/bbtree.h index 6f79806..264550f 100644 --- a/similarity_search/include/factory/method/bbtree.h +++ b/similarity_search/include/factory/method/bbtree.h @@ -15,7 +15,7 @@ #ifndef _FACTORY_BBTREE_H_ #define _FACTORY_BBTREE_H_ -#if WITH_EXTRAS +#ifdef WITH_EXTRAS #include diff --git a/similarity_search/include/method/bbtree.h b/similarity_search/include/method/bbtree.h index 888e924..e4a4fad 100644 --- a/similarity_search/include/method/bbtree.h +++ b/similarity_search/include/method/bbtree.h @@ -33,8 +33,6 @@ #ifndef _BBTREE_H_ #define _BBTREE_H_ -#if WITH_EXTRAS - #include "index.h" #include "params.h" @@ -128,6 +126,4 @@ class BBTree : public Index { } // namespace similarity -#endif - #endif // _BBTREE_H_ diff --git a/similarity_search/test/test_integr.cc b/similarity_search/test/test_integr.cc index 0fe083b..15fcff9 100644 --- a/similarity_search/test/test_integr.cc +++ b/similarity_search/test/test_integr.cc @@ -289,6 +289,7 @@ vector vTestCaseDesc = { MethodTestCase(DIST_TYPE_FLOAT, "l2", "final8_10K.txt", "list_clusters", false, "strategy=random,useBucketSize=1,bucketSize=10", "", 0 /* no KNN */, 0.5 /* range search radius 0.5*/ , 1.0, 1.0, 0.0, 0.0, 2.4, 3.4), +#ifdef WITH_EXTRAS // *************** bbtree tests ******************** // // knn /* @@ -311,7 +312,6 @@ vector vTestCaseDesc = { MethodTestCase(DIST_TYPE_FLOAT, "kldivgenfast", "final8_10K.txt", "bbtree", false, "bucketSize=10", "", 0 /* no KNN */, 0.5 /* range search radius 0.5*/ , 0.999, 1.0, 0.0, 0.0, 1.2, 2.4), -#ifdef WITH_EXTRAS // *************** multi-probe LSH tests ******************** // // knn