facebookresearch/faiss
1
0
Fork 0
mirror of https://github.com/facebookresearch/faiss.git synced 2026-10-12 02:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add (un)install Makefile targets for CPU version. (#344)

Browse Source 
* Remove useless LIBNAME macro in Makefile.

* Add installdirs, install, and uninstall Makefile targets.

* Fix merge.
This commit is contained in:
Lucas Hosseini
2018-04-05 11:45:33 +02:00
committed by Matthijs Douze
parent 111546927f
commit 1ae7494491
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+22 -12
View File
@@ -11,9 +11,9 @@ MAKEFILE_INC=makefile.inc
-include $(MAKEFILE_INC)
LIBNAME=libfaiss
PREFIX ?= /usr/local/
all: .env_ok $(LIBNAME).a demos/demo_ivfpq_indexing
all: .env_ok libfaiss.a demos/demo_ivfpq_indexing
py: _swigfaiss.so
@@ -33,11 +33,11 @@ LIBOBJ=hamming.o utils.o \
IndexIVFFlat.o OnDiskInvertedLists.o
$(LIBNAME).a: $(LIBOBJ)
ar r $(LIBNAME).a $^
libfaiss.a: $(LIBOBJ)
ar r libfaiss.a $^
$(LIBNAME).$(SHAREDEXT): $(LIBOBJ)
$(CXX) $(LDFLAGS) $(FAISSSHAREDFLAGS) -o $(LIBNAME).$(SHAREDEXT) $^ $(BLASLDFLAGS)
libfaiss.$(SHAREDEXT): $(LIBOBJ)
$(CXX) $(LDFLAGS) $(FAISSSHAREDFLAGS) -o libfaiss.$(SHAREDEXT) $^ $(BLASLDFLAGS)
.cpp.o:
$(CXX) $(CXXFLAGS) -c $< -o $@ $(FLAGS) $(EXTRAFLAGS)
@@ -62,11 +62,11 @@ BLASLDFLAGSSO ?= $(BLASLDFLAGS)
tests/test_blas: tests/test_blas.cpp
$(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) $(BLASLDFLAGS) $(BLASCFLAGS)
demos/demo_ivfpq_indexing: demos/demo_ivfpq_indexing.cpp $(LIBNAME).a
$(CXX) -o $@ $(CXXFLAGS) $< $(LIBNAME).a $(LDFLAGS) $(BLASLDFLAGS)
demos/demo_ivfpq_indexing: demos/demo_ivfpq_indexing.cpp libfaiss.a
$(CXX) -o $@ $(CXXFLAGS) $< libfaiss.a $(LDFLAGS) $(BLASLDFLAGS)
demos/demo_sift1M: demos/demo_sift1M.cpp $(LIBNAME).a
$(CXX) -o $@ $(CXXFLAGS) $< $(LIBNAME).a $(LDFLAGS) $(BLASLDFLAGS)
demos/demo_sift1M: demos/demo_sift1M.cpp libfaiss.a
$(CXX) -o $@ $(CXXFLAGS) $< libfaiss.a $(LDFLAGS) $(BLASLDFLAGS)
#############################
@@ -83,7 +83,7 @@ python/swigfaiss_wrap.cxx: swigfaiss.swig $(HFILES)
# extension is .so even on the mac
python/_swigfaiss.so: python/swigfaiss_wrap.cxx $(LIBNAME).a
python/_swigfaiss.so: python/swigfaiss_wrap.cxx libfaiss.a
$(CXX) -I. $(CXXFLAGS) $(LDFLAGS) $(PYTHONCFLAGS) $(SHAREDFLAGS) \
-o $@ $^ $(BLASLDFLAGSSO)
@@ -156,9 +156,19 @@ IndexIVFFlat.o: IndexIVFFlat.cpp IndexIVFFlat.h IndexIVF.h Index.h \
OnDiskInvertedLists.o: OnDiskInvertedLists.cpp OnDiskInvertedLists.h \
IndexIVF.h Index.h Clustering.h Heap.h FaissAssert.h FaissException.h
installdirs:
mkdir -p $(DESTDIR)$(PREFIX)/lib $(DESTDIR)$(PREFIX)/include/faiss
install: libfaiss.a libfaiss.$(SHAREDEXT) installdirs
cp libfaiss.a libfaiss.$(SHAREDEXT) $(DESTDIR)$(PREFIX)/lib/
cp ./*.h $(DESTDIR)$(PREFIX)/include/faiss/
uninstall:
rm $(DESTDIR)$(PREFIX)/lib/libfaiss.*
rm -rf $(DESTDIR)$(PREFIX)/include/faiss
clean:
rm -f $(LIBNAME).a $(LIBNAME).$(SHAREDEXT)* *.o \
rm -f libfaiss.a libfaiss.$(SHAREDEXT)* *.o \
lua/swigfaiss.so lua/swigfaiss_wrap.cxx \
python/_swigfaiss.so python/swigfaiss_wrap.cxx \
python/swigfaiss.py _swigfaiss.so swigfaiss.py