Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
faiss
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
钟尚武
faiss
Commits
5ca05218
Commit
5ca05218
authored
Jun 21, 2017
by
matthijs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move to C++11
parent
3ba41afe
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
FaissException.h
FaissException.h
+2
-2
makefile.inc.Linux
example_makefiles/makefile.inc.Linux
+8
-8
makefile.inc.Mac.brew
example_makefiles/makefile.inc.Mac.brew
+1
-1
makefile.inc.Mac.port
example_makefiles/makefile.inc.Mac.port
+1
-1
No files found.
FaissException.h
View file @
5ca05218
...
...
@@ -27,9 +27,9 @@ class FaissException : public std::exception {
int
line
);
/// from std::exception
virtual
const
char
*
what
()
const
_GLIBCXX_USE_NOEXCEPT
const
char
*
what
()
const
noexcept
override
{
return
msg
.
c_str
();
}
virtual
~
FaissException
()
_GLIBCXX_USE_NOEXCEPT
{}
~
FaissException
()
noexcept
override
{}
std
::
string
msg
;
};
...
...
example_makefiles/makefile.inc.Linux
View file @
5ca05218
...
...
@@ -11,7 +11,7 @@
CC
=
g++
CFLAGS
=
-fPIC
-m64
-Wall
-g
-O3
-msse4
-mpopcnt
-fopenmp
-Wno-sign-compare
-
Dnullptr
=
NULL
-Doverride
=
-fopenmp
CFLAGS
=
-fPIC
-m64
-Wall
-g
-O3
-msse4
-mpopcnt
-fopenmp
-Wno-sign-compare
-
std
=
c++11
-fopenmp
LDFLAGS
=
-g
-fPIC
-fopenmp
# common linux flags
...
...
@@ -62,11 +62,11 @@ BLASCFLAGS=-DFINTEGER=int
# This is for Centos:
BLASLDFLAGS
?=
/usr/lib64/libopenblas.so.0
# for Ubuntu 16:
# for Ubuntu 16:
# sudo apt-get install libopenblas-dev python-numpy python-dev
# BLASLDFLAGS?=/usr/lib/libopenblas.so.0
# for Ubuntu 14:
# for Ubuntu 14:
# sudo apt-get install libopenblas-dev liblapack3 python-numpy python-dev
# BLASLDFLAGS?=/usr/lib/libopenblas.so.0 /usr/lib/lapack/liblapack.so.3.0
#
...
...
@@ -102,12 +102,12 @@ SWIGEXEC=swig
#
# python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()"
# python -c "import numpy ; print numpy.get_include()"
#
# or, for Python 3, with
#
#
# or, for Python 3, with
#
# python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())"
# python3 -c "import numpy ; print(numpy.get_include())"
#
#
PYTHONCFLAGS
=
-I
/usr/include/python2.7/
-I
/usr/lib64/python2.7/site-packages/numpy/core/include/
...
...
@@ -138,7 +138,7 @@ NVCCFLAGS= $(CUDAFLAGS) \
-ccbin
$(CC11)
-DFAISS_USE_FLOAT16
# BLAS LD flags for nvcc (used to generate an executable)
# if BLASLDFLAGS contains several flags, each one may
# if BLASLDFLAGS contains several flags, each one may
# need to be prepended with -Xlinker
BLASLDFLAGSNVCC
=
-Xlinker
$(BLASLDFLAGS)
...
...
example_makefiles/makefile.inc.Mac.brew
View file @
5ca05218
...
...
@@ -4,7 +4,7 @@
# Tested on macOS Sierra (10.12.2) with llvm installed using Homebrew (https://brew.sh)
# brew install llvm
CC
=
/usr/local/opt/llvm/bin/clang++
CFLAGS
=
-fPIC
-m64
-Wall
-g
-O3
-msse4
-mpopcnt
-fopenmp
-Wno-sign-compare
-Dnullptr
=
NULL
-I
/usr/local/opt/llvm/include
-
Doverride
=
CFLAGS
=
-fPIC
-m64
-Wall
-g
-O3
-msse4
-mpopcnt
-fopenmp
-Wno-sign-compare
-Dnullptr
=
NULL
-I
/usr/local/opt/llvm/include
-
std
=
c++11
LDFLAGS
=
-g
-fPIC
-fopenmp
-L
/usr/local/opt/llvm/lib
# common mac flags
...
...
example_makefiles/makefile.inc.Mac.port
View file @
5ca05218
...
...
@@ -9,7 +9,7 @@
# port install g++-mp-6
CC
=
/opt/local/bin/g++-mp-6
CFLAGS
=
-fPIC
-m64
-Wall
-g
-O3
-msse4
-mpopcnt
-fopenmp
-Wno-sign-compare
-
Doverride
=
CFLAGS
=
-fPIC
-m64
-Wall
-g
-O3
-msse4
-mpopcnt
-fopenmp
-Wno-sign-compare
-
std
=
c++11
LDFLAGS
=
-g
-fPIC
-fopenmp
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment