Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring back HNSWLIB_NO_NATIVE #493

Merged
merged 3 commits into from
Aug 19, 2023
Merged

Bring back HNSWLIB_NO_NATIVE #493

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08569de
Bring back HNSWLIB_NO_NATIVE
dyashuni Aug 11, 2023
e023f7e
Fix
dyashuni Aug 11, 2023
eecd540
Rename flag, use class name to access static variables
dyashuni Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Rename flag, use class name to access static variables
  • Loading branch information
@dyashuni
dyashuni committed Aug 13, 2023
commit eecd540eb1be6c93a21f3d211fa00be33acf3764
20 changes: 10 additions & 10 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,18 @@ def cpp_flag(compiler):

class BuildExt(build_ext):
"""A custom build extension for adding compiler-specific options."""
native_flag = '-march=native'
compiler_flag_native = '-march=native'
c_opts = {
'msvc': ['/EHsc', '/openmp', '/O2'],
'unix': ['-O3', native_flag], # , '-w'
'unix': ['-O3', compiler_flag_native], # , '-w'
}
link_opts = {
'unix': [],
'msvc': [],
}

if os.environ.get("HNSWLIB_NO_NATIVE"):
c_opts['unix'].remove(native_flag)
c_opts['unix'].remove(compiler_flag_native)

if sys.platform == 'darwin':
c_opts['unix'] += ['-stdlib=libc++', '-mmacosx-version-min=10.7']
Expand All @@ -95,18 +95,18 @@ class BuildExt(build_ext):

def build_extensions(self):
ct = self.compiler.compiler_type
opts = self.c_opts.get(ct, [])
opts = BuildExt.c_opts.get(ct, [])
if ct == 'unix':
opts.append('-DVERSION_INFO="%s"' % self.distribution.get_version())
opts.append(cpp_flag(self.compiler))
if has_flag(self.compiler, '-fvisibility=hidden'):
opts.append('-fvisibility=hidden')
if not os.environ.get("HNSWLIB_NO_NATIVE"):
# check that native flag is available
print('checking avalability of flag:', self.native_flag)
if not has_flag(self.compiler, self.native_flag):
print('removing unsupported compiler flag:', self.native_flag)
opts.remove(self.native_flag)
print('checking avalability of flag:', BuildExt.compiler_flag_native)
if not has_flag(self.compiler, BuildExt.compiler_flag_native):
print('removing unsupported compiler flag:', BuildExt.compiler_flag_native)
opts.remove(BuildExt.compiler_flag_native)
# for macos add apple-m1 flag if it's available
if sys.platform == 'darwin':
m1_flag = '-mcpu=apple-m1'
Expand All @@ -117,13 +117,13 @@ def build_extensions(self):
else:
print(f'flag: {m1_flag} is not available')
else:
print(f'flag: {self.native_flag} is available')
print(f'flag: {BuildExt.compiler_flag_native} is available')
elif ct == 'msvc':
opts.append('/DVERSION_INFO=\\"%s\\"' % self.distribution.get_version())

for ext in self.extensions:
ext.extra_compile_args.extend(opts)
ext.extra_link_args.extend(self.link_opts.get(ct, []))
ext.extra_link_args.extend(BuildExt.link_opts.get(ct, []))

build_ext.build_extensions(self)

Expand Down