Commit f7fb309e authored by Matthijs Douze's avatar Matthijs Douze Committed by GitHub

Revert quoting of BLASLDFLAGS

parent 1057c2cf
...@@ -68,7 +68,7 @@ BLASLDFLAGS=/usr/lib64/libopenblas.so.0 ...@@ -68,7 +68,7 @@ BLASLDFLAGS=/usr/lib64/libopenblas.so.0
# for Ubuntu 14: # for Ubuntu 14:
# sudo apt-get install libopenblas-dev liblapack3 python-numpy python-dev # sudo apt-get install libopenblas-dev liblapack3 python-numpy python-dev
# BLASLDFLAGS="/usr/lib/libopenblas.so.0 /usr/lib/lapack/liblapack.so.3.0" # BLASLDFLAGS=/usr/lib/libopenblas.so.0 /usr/lib/lapack/liblapack.so.3.0
# #
# 3. Atlas # 3. Atlas
...@@ -79,7 +79,7 @@ BLASLDFLAGS=/usr/lib64/libopenblas.so.0 ...@@ -79,7 +79,7 @@ BLASLDFLAGS=/usr/lib64/libopenblas.so.0
# directory name, eg. atlas-sse3 = optimized for SSE3 architecture. # directory name, eg. atlas-sse3 = optimized for SSE3 architecture.
# #
# BLASCFLAGS=-DFINTEGER=int # BLASCFLAGS=-DFINTEGER=int
# BLASLDFLAGS="/usr/lib64/atlas-sse3/libptf77blas.so.3 /usr/lib64/atlas-sse3/liblapack.so" # BLASLDFLAGS=/usr/lib64/atlas-sse3/libptf77blas.so.3 /usr/lib64/atlas-sse3/liblapack.so
# #
# 4. reference implementation # 4. reference implementation
...@@ -88,7 +88,7 @@ BLASLDFLAGS=/usr/lib64/libopenblas.so.0 ...@@ -88,7 +88,7 @@ BLASLDFLAGS=/usr/lib64/libopenblas.so.0
# implementation, that is not optimized at all. # implementation, that is not optimized at all.
# #
# BLASCFLAGS=-DFINTEGER=int # BLASCFLAGS=-DFINTEGER=int
# BLASLDFLAGS="/usr/lib64/libblas.so.3 /usr/lib64/liblapack.so.3.2" # BLASLDFLAGS=/usr/lib64/libblas.so.3 /usr/lib64/liblapack.so.3.2
# #
...@@ -139,8 +139,9 @@ NVCCFLAGS= $(CUDAFLAGS) \ ...@@ -139,8 +139,9 @@ NVCCFLAGS= $(CUDAFLAGS) \
--std c++11 -lineinfo \ --std c++11 -lineinfo \
-ccbin $(CC11) -DFAISS_USE_FLOAT16 -ccbin $(CC11) -DFAISS_USE_FLOAT16
# BLAS LD flags for nvcc (used to generate an executable) # BLAS LD flags for nvcc (used to generate an executable)
# if BLASLDFLAGS contains several flags, each one may
# need to be prepended with -Xlinker
BLASLDFLAGSNVCC=-Xlinker $(BLASLDFLAGS) BLASLDFLAGSNVCC=-Xlinker $(BLASLDFLAGS)
# Same, but to generate a .so # Same, but to generate a .so
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment