Move source code to faiss/ subdirectory. (#1312)

* Move source code to faiss/ subdirectory.

* Remove stale files.

.travis.yml

@@ -97,7 +97,7 @@ install:
   - autoconf
   - ./configure --without-cuda
   - make
-  - make -C python
+  - make -C faiss/python
 
 script:
   - make test

Makefile

@@ -5,15 +5,18 @@
 
 -include makefile.inc
 
-HEADERS     = $(wildcard *.h impl/*.h utils/*.h)
+HEADERS     = $(wildcard faiss/*.h faiss/impl/*.h faiss/utils/*.h)
-SRC         = $(wildcard *.cpp impl/*.cpp utils/*.cpp)
+SRC         = $(wildcard faiss/*.cpp faiss/impl/*.cpp faiss/utils/*.cpp)
 OBJ         = $(SRC:.cpp=.o)
 INSTALLDIRS = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/faiss
 
-GPU_HEADERS = $(wildcard gpu/*.h gpu/impl/*.h gpu/impl/*.cuh gpu/utils/*.h gpu/utils/*.cuh)
+GPU_HEADERS = $(wildcard faiss/gpu/*.h faiss/gpu/impl/*.h faiss/gpu/impl/*.cuh \
-GPU_CPPSRC  = $(wildcard gpu/*.cpp gpu/impl/*.cpp gpu/utils/*.cpp)
+faiss/gpu/utils/*.h faiss/gpu/utils/*.cuh)
-GPU_CUSRC   = $(wildcard gpu/*.cu gpu/impl/*.cu gpu/utils/*.cu \
+GPU_CPPSRC  = $(wildcard faiss/gpu/*.cpp faiss/gpu/impl/*.cpp \
-gpu/utils/nvidia/*.cu gpu/utils/blockselect/*.cu gpu/utils/warpselect/*.cu)
+faiss/gpu/utils/*.cpp)
+GPU_CUSRC   = $(wildcard faiss/gpu/*.cu faiss/gpu/impl/*.cu \
+faiss/gpu/utils/*.cu faiss/gpu/utils/nvidia/*.cu \
+faiss/gpu/utils/blockselect/*.cu faiss/gpu/utils/warpselect/*.cu)
 GPU_SRC     = $(GPU_CPPSRC) $(GPU_CUSRC)
 GPU_CPPOBJ  = $(GPU_CPPSRC:.cpp=.o)
 GPU_CUOBJ   = $(GPU_CUSRC:.cu=.o)
@@ -80,7 +83,7 @@ depend: $(SRC) $(GPU_SRC)
 # Python
 
 py: libfaiss.a
-	$(MAKE) -C python
+	$(MAKE) -C faiss/python
 
 
 #############################
@@ -88,12 +91,12 @@ py: libfaiss.a
 
 test: libfaiss.a py
 	$(MAKE) -C tests run
-	PYTHONPATH=./python/build/`ls python/build | grep lib` \
+	PYTHONPATH=./faiss/python/build/`ls faiss/python/build | grep lib` \
 	$(PYTHON) -m unittest discover tests/ -v
 
 test_gpu: libfaiss.a
 	$(MAKE) -C gpu/test run
-	PYTHONPATH=./python/build/`ls python/build | grep lib` \
+	PYTHONPATH=./faiss/python/build/`ls faiss/python/build | grep lib` \
 	$(PYTHON) -m unittest discover gpu/test/ -v
 
 #############################

configure

@@ -587,7 +587,7 @@ PACKAGE_STRING='faiss 1.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
-ac_unique_file="Index.h"
+ac_unique_file="faiss/Index.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>

configure.ac

@@ -7,7 +7,7 @@ AC_COPYRIGHT([Copyright (c) Facebook, Inc. and its affiliates.
 
 This source code is licensed under the MIT license found in the
 LICENSE file in the root directory of this source tree.])
-AC_CONFIG_SRCDIR([Index.h])
+AC_CONFIG_SRCDIR([faiss/Index.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([acinclude])
 

faiss

@@ -1 +0,0 @@
-./