Skip to content

Commit

Permalink
Merge pull request #443 from de11n/fix-libraries-parsing
Browse files Browse the repository at this point in the history
Fix setup.py to respect numpy's parsing of libraries in site.cfg
  • Loading branch information
robbmcleod authored Aug 6, 2023
2 parents 4b2d89c + c2dd659 commit 67a1221
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ def parse_site_cfg():
site['mkl']['include_dirs'].split(os.pathsep))
lib_dirs.extend(
site['mkl']['library_dirs'].split(os.pathsep))
# numpy's site.cfg splits libraries by comma, but numexpr historically split by os.pathsep.
# For compatibility, we split by both.
libs.extend(
site['mkl']['libraries'].split(os.pathsep))
site['mkl']['libraries'].replace(os.pathsep, ',').split(','))
def_macros.append(('USE_VML', None))
print(f'FOUND MKL IMPORT')

Expand Down

0 comments on commit 67a1221

Please sign in to comment.