Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.

remove dependency on llvm-openmp #1

Merged
xaleryb merged 3 commits into from
Aug 28, 2020
Merged

remove dependency on llvm-openmp #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69b740c
remove dependency on llvm-openmp
samir-nasibli Aug 10, 2020
330bf51
update skipp/setup.py
samir-nasibli Aug 12, 2020
1c13710
Merge branch 'master' into hotfix/remove_llvm_openmp
xaleryb Aug 28, 2020
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
3 changes: 1 addition & 2 deletions conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ requirements:
- setuptools
run:
- ipp
- intel-openmp # [not osx]
- llvm-openmp # [osx]
- intel-openmp
- numpy >=1.15
- python

Expand Down
31 changes: 14 additions & 17 deletions skipp/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ def configuration(parent_package='', top_path=None):
def _get_sources_and_includes(dirs_list):
"""
Returns list of source files and list of includes

Parameters
----------
dirs_list : list:
Expand Down Expand Up @@ -78,24 +77,23 @@ def _get_sources_and_includes(dirs_list):

include_dir = [join(lib_root, 'include')]
library_dirs = [join(lib_root, 'lib')]
ipp_libraries = ["ippcv", "ippcore", "ippvm", "ipps", "ippi"]
libraries = ["ippcv", "ippcore", "ippvm", "ipps", "ippi"]

_ipp_utils_dir = ['_ipp_utils']
_ipp_wr_dir = ['_ipp_wr']

extra_compile_args=[]
extra_link_args=[]
define_macros=[]

if(use_omp):
if IS_LIN or IS_MAC:
extra_compile_args.append('-fopenmp')
extra_link_args.append('-fopenmp')
elif IS_WIN:
extra_compile_args.append('-openmp')
extra_link_args.append('-openmp')
define_macros.append(('USE_OPENMP', None))

if IS_LIN:
extra_compile_args=['-fopenmp']
extra_link_args=['-fopenmp']
elif IS_WIN:
extra_compile_args=['-openmp']
extra_link_args=['-openmp']
elif IS_MAC:
extra_compile_args=['-fopenmp']
extra_link_args=['-fopenmp=libiomp5']

@oleksandr-pavlyk oleksandr-pavlyk Aug 13, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this make the extension importable?

@samir-nasibli samir-nasibli Aug 13, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure. It just was an attempt to fix the problem. PR is in progress

if IS_MAC:
libraries.append("iomp5")

extension_names = [] # extension names and their dir names are the same
extension_cy_src = {}

Expand Down Expand Up @@ -131,8 +129,7 @@ def _get_sources_and_includes(dirs_list):
sources=extension_sources +
[extension_cy_src[extension_name]],
language="c",
libraries=ipp_libraries,
define_macros=define_macros,
libraries=libraries,
extra_compile_args=extra_compile_args,
extra_link_args=extra_link_args,
include_dirs=include_dirs,
Expand Down