Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f17174a
Merge pull request #10 from IntelPython/master
ekomarova Aug 25, 2020
902ebc7
License update for beta release
DmitryKizaev Aug 25, 2020
5f991d0
Indentation fix
DmitryKizaev Aug 25, 2020
5577125
Indentation fix #2
DmitryKizaev Aug 25, 2020
e317e9c
Indentation fix #3
DmitryKizaev Aug 25, 2020
0ee1c2a
Add license_file
DmitryKizaev Aug 25, 2020
c298cf7
Merge pull request #12 from DmitryKizaev/legal-update-beta
DmitryKizaev Aug 25, 2020
5fcfe4b
Update meta.yaml
xaleryb Aug 28, 2020
1143e0b
Update setup.py
xaleryb Aug 28, 2020
748dcf6
Merge pull request #15 from IntelPython/xaleryb-patch-3
xaleryb Aug 28, 2020
17a1279
Merge pull request #16 from IntelPython/xaleryb-patch-4
xaleryb Aug 28, 2020
afa7b8c
Update meta.yaml
xaleryb Aug 28, 2020
1e72cf4
Revert "Update setup.py"
xaleryb Aug 28, 2020
a9a78e8
Update build.sh
xaleryb Aug 28, 2020
6705e06
Add wheels build (#20)
Vyacheslav-Smirnov Nov 19, 2020
559bd0d
Update linux build tah for wheels (#21)
Vyacheslav-Smirnov Feb 1, 2021
5ba4e37
Update packages wheel deps (#22)
Vyacheslav-Smirnov Feb 2, 2021
b601b58
Update development status in setup.py (#23)
Vyacheslav-Smirnov Feb 11, 2021
5a6fadc
Bump build number
Vyacheslav-Smirnov Mar 15, 2021
fb6c945
Merge branch 'master' into wheel_change_to_master
Vyacheslav-Smirnov Mar 18, 2021
24c246e
Add back c compiler for Mac
Vyacheslav-Smirnov Mar 18, 2021
46a2a94
Merge branch 'wheel_change_to_master' of https://github.com/IntelPyth…
Vyacheslav-Smirnov Mar 18, 2021
828bc0f
Update name to scikit-ipp
Vyacheslav-Smirnov Mar 19, 2021
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
8 changes: 8 additions & 0 deletions conda-recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,11 @@ set LIBROOT=%PREFIX%
set USE_OPENMP=1
%PYTHON% setup.py build --force install --old-and-unmanageable
if errorlevel 1 exit 1

rem Build wheel package
if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
%PYTHON% setup.py bdist_wheel
if errorlevel 1 exit 1
copy dist\scikit_ipp*.whl %WHEELS_OUTPUT_FOLDER%
if errorlevel 1 exit 1
)
20 changes: 19 additions & 1 deletion conda-recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
#!/bin/bash
set -ex

if [ `uname` != Darwin ]; then
if [ "$CONDA_PY" == "36" ]; then
WHEELS_BUILD_ARGS="-p manylinux1_x86_64"
else
WHEELS_BUILD_ARGS="-p manylinux2014_x86_64"
fi
# currently intel-openmp does not work for osx
export USE_OPENMP=1
else
WHEELS_BUILD_ARGS=""
export LDFLAGS="-headerpad_max_install_names $LDFLAGS"
fi

LIBROOT=$PREFIX $PYTHON setup.py build install --old-and-unmanageable
export LIBROOT=$PREFIX
$PYTHON setup.py build install --old-and-unmanageable

# Build wheel package
if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then
$PYTHON setup.py bdist_wheel ${WHEELS_BUILD_ARGS}
cp dist/scikit_ipp*.whl ${WHEELS_OUTPUT_FOLDER}
fi
7 changes: 5 additions & 2 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set version = "1.2.0" %}
{% set buildnumber = 0 %}
{% set buildnumber = 6 %}

package:
name: scikit-ipp
Expand All @@ -10,6 +10,8 @@ source:

build:
number: {{ buildnumber }}
script_env:
- WHEELS_OUTPUT_FOLDER

requirements:
build:
Expand All @@ -22,6 +24,7 @@ requirements:
- numpy >=1.15
- python
- setuptools
- wheel
run:
- ipp
- intel-openmp
Expand Down Expand Up @@ -58,7 +61,7 @@ about:
<br/><br/>
EULA: <a href="https://opensource.org/licenses/BSD-3-Clause" target="_blank">BSD-3-Clause</a>
<br/><br/>

extra:
recipe-maintainers:
- samir-nasibli
20 changes: 11 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@
with io.open('skipp/_version.py', 'rt', encoding='utf8') as f:
version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)

with open("README.md", "r", encoding="utf-8") as file:
long_description = file.read()

VERSION = version

CLASSIFIERS = """\
Development Status :: 0 - Alpha
Development Status :: 5 - Production/Stable
Intended Audience :: Science/Research
Intended Audience :: Developers
License :: OSI Approved
Expand Down Expand Up @@ -86,15 +88,11 @@ def setup_package():
from numpy.distutils.core import setup

metadata = dict(
name='skipp',
name='scikit-ipp',
maintainer="Intel Corp.",
maintainer_email="[email protected]",
long_description="""
scikit-ipp is a image processing library,
provided scikit-image-like API to some of
Intel(R) Integrated Performance Primitives (Intel(R) IPP)
functions
""",
long_description=long_description,
long_description_content_type="text/markdown",
description="Image processing library powered by Intel(R) IPP",
url="http://github.com/IntelPython/scikit-ipp",
author="Intel Corporation",
Expand All @@ -103,7 +101,11 @@ def setup_package():
classifiers=[_f for _f in CLASSIFIERS.split('\n') if _f],
platforms=["Windows", "Linux", "Mac OS-X"],
python_requires='>=3.6',
install_requires=['numpy'],
install_requires=[
'ipp',
'intel-openmp',
'numpy'
],
packages=find_packages(),
configuration=configuration
)
Expand Down