From 902ebc7fa151e5dc8277bf330b78b741bea3e63e Mon Sep 17 00:00:00 2001
From: DmitryKizaev <43135840+DmitryKizaev@users.noreply.github.com>
Date: Tue, 25 Aug 2020 15:13:31 +0300
Subject: [PATCH 01/21] License update for beta release
Build number increased, legal notice added
---
conda-recipe/meta.yaml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 551cbbd..3d84db8 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -1,5 +1,5 @@
{% set version = "1.2.0" %}
-{% set buildnumber = 0 %}
+{% set buildnumber = 1 %}
package:
name: scikit-ipp
@@ -49,6 +49,15 @@ test:
about:
license: BSD-3-Clause
license_family: BSD
+ description: |
+ LEGAL NOTICE: Use of this software package is subject to the
+ software license agreement (as set forth above, in the license section of
+ the installed Conda package and/or the README file) and all notices,
+ disclaimers or license terms for third party or open source software
+ included in or with the software.
+
+ EULA: BSD-3-Clause
+
extra:
recipe-maintainers:
From 5f991d0fda755c949a78014e3212993efd03d418 Mon Sep 17 00:00:00 2001
From: DmitryKizaev <43135840+DmitryKizaev@users.noreply.github.com>
Date: Tue, 25 Aug 2020 17:32:13 +0300
Subject: [PATCH 02/21] Indentation fix
---
conda-recipe/meta.yaml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 3d84db8..1463028 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -50,14 +50,14 @@ about:
license: BSD-3-Clause
license_family: BSD
description: |
- LEGAL NOTICE: Use of this software package is subject to the
- software license agreement (as set forth above, in the license section of
- the installed Conda package and/or the README file) and all notices,
- disclaimers or license terms for third party or open source software
- included in or with the software.
-
- EULA: BSD-3-Clause
-
+ LEGAL NOTICE: Use of this software package is subject to the
+ software license agreement (as set forth above, in the license section of
+ the installed Conda package and/or the README file) and all notices,
+ disclaimers or license terms for third party or open source software
+ included in or with the software.
+
+ EULA: BSD-3-Clause
+
extra:
recipe-maintainers:
From 5577125549d3c0e4bc3c271ff3ce3a61e62d1a17 Mon Sep 17 00:00:00 2001
From: DmitryKizaev <43135840+DmitryKizaev@users.noreply.github.com>
Date: Tue, 25 Aug 2020 18:09:58 +0300
Subject: [PATCH 03/21] Indentation fix #2
---
conda-recipe/meta.yaml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 1463028..7bccb1d 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -50,14 +50,14 @@ about:
license: BSD-3-Clause
license_family: BSD
description: |
- LEGAL NOTICE: Use of this software package is subject to the
- software license agreement (as set forth above, in the license section of
- the installed Conda package and/or the README file) and all notices,
- disclaimers or license terms for third party or open source software
- included in or with the software.
-
- EULA: BSD-3-Clause
-
+ LEGAL NOTICE: Use of this software package is subject to the
+ software license agreement (as set forth above, in the license section of
+ the installed Conda package and/or the README file) and all notices,
+ disclaimers or license terms for third party or open source software
+ included in or with the software.
+
+ EULA: BSD-3-Clause
+
extra:
recipe-maintainers:
From e317e9c7627ef988b40640a4efad27a74d07af7c Mon Sep 17 00:00:00 2001
From: DmitryKizaev <43135840+DmitryKizaev@users.noreply.github.com>
Date: Tue, 25 Aug 2020 18:25:44 +0300
Subject: [PATCH 04/21] Indentation fix #3
---
conda-recipe/meta.yaml | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 7bccb1d..287f1a2 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -47,17 +47,17 @@ test:
- skipp/transform/tests/tests/
about:
- license: BSD-3-Clause
- license_family: BSD
- description: |
- LEGAL NOTICE: Use of this software package is subject to the
- software license agreement (as set forth above, in the license section of
- the installed Conda package and/or the README file) and all notices,
- disclaimers or license terms for third party or open source software
- included in or with the software.
-
- EULA: BSD-3-Clause
-
+ license: BSD-3-Clause
+ license_family: BSD
+ description: |
+ LEGAL NOTICE: Use of this software package is subject to the
+ software license agreement (as set forth above, in the license section of
+ the installed Conda package and/or the README file) and all notices,
+ disclaimers or license terms for third party or open source software
+ included in or with the software.
+
+ EULA: BSD-3-Clause
+
extra:
recipe-maintainers:
From 0ee1c2a9fb54ea8df34c517f3db0021220b1d9a3 Mon Sep 17 00:00:00 2001
From: DmitryKizaev <43135840+DmitryKizaev@users.noreply.github.com>
Date: Tue, 25 Aug 2020 18:47:47 +0300
Subject: [PATCH 05/21] Add license_file
---
conda-recipe/meta.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 287f1a2..d3b5f67 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -48,6 +48,7 @@ test:
about:
license: BSD-3-Clause
+ license_file: LICENSE.txt
license_family: BSD
description: |
LEGAL NOTICE: Use of this software package is subject to the
From 5fcfe4b1c9af9b98c9cce0208cdc6859326f1f52 Mon Sep 17 00:00:00 2001
From: Alexander Rybkin <38352652+xaleryb@users.noreply.github.com>
Date: Fri, 28 Aug 2020 20:43:36 +0300
Subject: [PATCH 06/21] Update meta.yaml
---
conda-recipe/meta.yaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index d3b5f67..6ff8b5f 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -24,8 +24,7 @@ requirements:
- setuptools
run:
- ipp
- - intel-openmp # [not osx]
- - llvm-openmp # [osx]
+ - intel-openmp
- numpy >=1.15
- python
From 1143e0b0f69cff408f49f9c1c60550fe3afed8af Mon Sep 17 00:00:00 2001
From: Alexander Rybkin <38352652+xaleryb@users.noreply.github.com>
Date: Fri, 28 Aug 2020 20:49:20 +0300
Subject: [PATCH 07/21] Update setup.py
---
skipp/setup.py | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/skipp/setup.py b/skipp/setup.py
index 426d0d9..25cc3c8 100644
--- a/skipp/setup.py
+++ b/skipp/setup.py
@@ -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:
@@ -78,23 +77,22 @@ 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']
+ if IS_MAC:
+ libraries.append("iomp5")
extension_names = [] # extension names and their dir names are the same
extension_cy_src = {}
@@ -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,
From afa7b8cce1180b59acefbda23fe85964a40c1237 Mon Sep 17 00:00:00 2001
From: Alexander Rybkin <38352652+xaleryb@users.noreply.github.com>
Date: Fri, 28 Aug 2020 22:00:23 +0300
Subject: [PATCH 08/21] Update meta.yaml
---
conda-recipe/meta.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 6ff8b5f..cfc5d67 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -13,7 +13,7 @@ build:
requirements:
build:
- - {{ compiler('c') }}
+ - {{ compiler('c') }} #[not osx]
host:
- cython
- ipp
From 1e72cf49d6b866e6da2acaccccf9c741beaf1c13 Mon Sep 17 00:00:00 2001
From: Alexander Rybkin
Date: Fri, 28 Aug 2020 22:32:16 +0300
Subject: [PATCH 09/21] Revert "Update setup.py"
This reverts commit 1143e0b0f69cff408f49f9c1c60550fe3afed8af.
---
skipp/setup.py | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/skipp/setup.py b/skipp/setup.py
index 25cc3c8..426d0d9 100644
--- a/skipp/setup.py
+++ b/skipp/setup.py
@@ -44,6 +44,7 @@ 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:
@@ -77,22 +78,23 @@ def _get_sources_and_includes(dirs_list):
include_dir = [join(lib_root, 'include')]
library_dirs = [join(lib_root, 'lib')]
- libraries = ["ippcv", "ippcore", "ippvm", "ipps", "ippi"]
+ ipp_libraries = ["ippcv", "ippcore", "ippvm", "ipps", "ippi"]
_ipp_utils_dir = ['_ipp_utils']
_ipp_wr_dir = ['_ipp_wr']
- 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']
- if IS_MAC:
- libraries.append("iomp5")
+ 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))
extension_names = [] # extension names and their dir names are the same
extension_cy_src = {}
@@ -129,7 +131,8 @@ def _get_sources_and_includes(dirs_list):
sources=extension_sources +
[extension_cy_src[extension_name]],
language="c",
- libraries=libraries,
+ libraries=ipp_libraries,
+ define_macros=define_macros,
extra_compile_args=extra_compile_args,
extra_link_args=extra_link_args,
include_dirs=include_dirs,
From a9a78e80fefb93da46156caf8984cbc191d6144f Mon Sep 17 00:00:00 2001
From: Alexander Rybkin <38352652+xaleryb@users.noreply.github.com>
Date: Fri, 28 Aug 2020 22:57:26 +0300
Subject: [PATCH 10/21] Update build.sh
---
conda-recipe/build.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
index 889e961..3951924 100644
--- a/conda-recipe/build.sh
+++ b/conda-recipe/build.sh
@@ -1,6 +1,8 @@
if [ `uname` != Darwin ]; then
# currently intel-openmp does not work for osx
export USE_OPENMP=1
+else
+ export LDFLAGS="-headerpad_max_install_names $LDFLAGS"
fi
LIBROOT=$PREFIX $PYTHON setup.py build install --old-and-unmanageable
From 6705e06ba12efd2e4c404ed05aec1aff81cb414b Mon Sep 17 00:00:00 2001
From: Vyacheslav-Smirnov
<51660067+Vyacheslav-Smirnov@users.noreply.github.com>
Date: Thu, 19 Nov 2020 13:13:00 +0300
Subject: [PATCH 11/21] Add wheels build (#20)
* Add wheels build
* Change build format
* Add wheel to host requirements
* Set wheel name for package = scikit-ipp
* Revert package name back to skipp
---
conda-recipe/bld.bat | 8 ++++++++
conda-recipe/build.sh | 14 +++++++++++++-
conda-recipe/meta.yaml | 5 ++++-
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
index b88a9c5..fbd09f3 100644
--- a/conda-recipe/bld.bat
+++ b/conda-recipe/bld.bat
@@ -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\skipp*.whl %WHEELS_OUTPUT_FOLDER%
+ if errorlevel 1 exit 1
+)
diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
index 3951924..49e121d 100644
--- a/conda-recipe/build.sh
+++ b/conda-recipe/build.sh
@@ -1,8 +1,20 @@
+#!/bin/bash
+set -ex
+
if [ `uname` != Darwin ]; then
+ WHEELS_BUILD_ARGS="-p manylinux1_x86_64"
# 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/skipp*.whl ${WHEELS_OUTPUT_FOLDER}
+fi
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index cfc5d67..3aa5457 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -1,5 +1,5 @@
{% set version = "1.2.0" %}
-{% set buildnumber = 1 %}
+{% set buildnumber = 2 %}
package:
name: scikit-ipp
@@ -10,6 +10,8 @@ source:
build:
number: {{ buildnumber }}
+ script_env:
+ - WHEELS_OUTPUT_FOLDER
requirements:
build:
@@ -22,6 +24,7 @@ requirements:
- numpy >=1.15
- python
- setuptools
+ - wheel
run:
- ipp
- intel-openmp
From 559bd0d29007914aa619601d9794ada031a81008 Mon Sep 17 00:00:00 2001
From: Vyacheslav-Smirnov
<51660067+Vyacheslav-Smirnov@users.noreply.github.com>
Date: Mon, 1 Feb 2021 12:15:27 +0300
Subject: [PATCH 12/21] Update linux build tah for wheels (#21)
---
conda-recipe/build.sh | 6 +++++-
conda-recipe/meta.yaml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
index 49e121d..79839f7 100644
--- a/conda-recipe/build.sh
+++ b/conda-recipe/build.sh
@@ -2,7 +2,11 @@
set -ex
if [ `uname` != Darwin ]; then
- WHEELS_BUILD_ARGS="-p manylinux1_x86_64"
+ 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
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 3aa5457..fdb200d 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -1,5 +1,5 @@
{% set version = "1.2.0" %}
-{% set buildnumber = 2 %}
+{% set buildnumber = 3 %}
package:
name: scikit-ipp
From 5ba4e377973712abb0d71cab660e7d537396a7ad Mon Sep 17 00:00:00 2001
From: Vyacheslav-Smirnov
<51660067+Vyacheslav-Smirnov@users.noreply.github.com>
Date: Wed, 3 Feb 2021 00:38:51 +0300
Subject: [PATCH 13/21] Update packages wheel deps (#22)
* Update packages wheel deps
* Update wheel name in build scripts
---
conda-recipe/bld.bat | 2 +-
conda-recipe/build.sh | 2 +-
conda-recipe/meta.yaml | 2 +-
setup.py | 18 ++++++++++--------
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
index fbd09f3..15f8b19 100644
--- a/conda-recipe/bld.bat
+++ b/conda-recipe/bld.bat
@@ -9,6 +9,6 @@ rem Build wheel package
if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
%PYTHON% setup.py bdist_wheel
if errorlevel 1 exit 1
- copy dist\skipp*.whl %WHEELS_OUTPUT_FOLDER%
+ copy dist\scikit_ipp*.whl %WHEELS_OUTPUT_FOLDER%
if errorlevel 1 exit 1
)
diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
index 79839f7..893cb95 100644
--- a/conda-recipe/build.sh
+++ b/conda-recipe/build.sh
@@ -20,5 +20,5 @@ $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/skipp*.whl ${WHEELS_OUTPUT_FOLDER}
+ cp dist/scikit_ipp*.whl ${WHEELS_OUTPUT_FOLDER}
fi
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index fdb200d..543b9e6 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -1,5 +1,5 @@
{% set version = "1.2.0" %}
-{% set buildnumber = 3 %}
+{% set buildnumber = 4 %}
package:
name: scikit-ipp
diff --git a/setup.py b/setup.py
index 71cc432..ba21db7 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,8 @@
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
@@ -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="scripting@intel.com",
- 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",
@@ -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
)
From b601b582bf13d02c5f671ce929547a552f4d1641 Mon Sep 17 00:00:00 2001
From: Vyacheslav-Smirnov
<51660067+Vyacheslav-Smirnov@users.noreply.github.com>
Date: Thu, 11 Feb 2021 22:19:08 +0300
Subject: [PATCH 14/21] Update development status in setup.py (#23)
---
conda-recipe/meta.yaml | 2 +-
setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 543b9e6..172d81e 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -1,5 +1,5 @@
{% set version = "1.2.0" %}
-{% set buildnumber = 4 %}
+{% set buildnumber = 5 %}
package:
name: scikit-ipp
diff --git a/setup.py b/setup.py
index ba21db7..0569882 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@
VERSION = version
CLASSIFIERS = """\
-Development Status :: 0 - Alpha
+Development Status :: 5 - Production/Stable
Intended Audience :: Science/Research
Intended Audience :: Developers
License :: OSI Approved
From 5a6fadc8b92d3511418a8262d57d7741fb573faf Mon Sep 17 00:00:00 2001
From: Vyacheslav-Smirnov
<51660067+Vyacheslav-Smirnov@users.noreply.github.com>
Date: Mon, 15 Mar 2021 17:28:50 +0300
Subject: [PATCH 15/21] Bump build number
To rebuild wheel without strict numpy version
---
conda-recipe/meta.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 172d81e..f6b36b9 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -1,5 +1,5 @@
{% set version = "1.2.0" %}
-{% set buildnumber = 5 %}
+{% set buildnumber = 6 %}
package:
name: scikit-ipp
From 19f8b5486bdae07c1d1ac0889945d21ad85963d2 Mon Sep 17 00:00:00 2001
From: Vyacheslav-Smirnov
Date: Mon, 27 Sep 2021 16:57:13 +0300
Subject: [PATCH 16/21] Rebuild
---
conda-recipe/meta.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index f6b36b9..5a364b6 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -1,5 +1,5 @@
{% set version = "1.2.0" %}
-{% set buildnumber = 6 %}
+{% set buildnumber = 7 %}
package:
name: scikit-ipp
From 9eccf90f9d69fb355ee520293d1f2df4234d208c Mon Sep 17 00:00:00 2001
From: Vyacheslav-Smirnov
Date: Tue, 28 Sep 2021 19:06:19 +0300
Subject: [PATCH 17/21] Works with only 2021.3 ipp
---
conda-recipe/meta.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 5a364b6..d793320 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -18,9 +18,9 @@ requirements:
- {{ compiler('c') }} #[not osx]
host:
- cython
- - ipp
- - ipp-devel
- - ipp-include
+ - ipp 2021.3
+ - ipp-devel 2021.3
+ - ipp-include 2021.3
- numpy >=1.15
- python
- setuptools
From 315cd0eb5f3acf598d284685a196ebc083221b21 Mon Sep 17 00:00:00 2001
From: Alexander-Makaryev
Date: Mon, 25 Oct 2021 15:03:33 +0300
Subject: [PATCH 18/21] delete restrictions for IPP version
---
conda-recipe/meta.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index d793320..5a364b6 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -18,9 +18,9 @@ requirements:
- {{ compiler('c') }} #[not osx]
host:
- cython
- - ipp 2021.3
- - ipp-devel 2021.3
- - ipp-include 2021.3
+ - ipp
+ - ipp-devel
+ - ipp-include
- numpy >=1.15
- python
- setuptools
From dcf3cd7d7f4497b0878f14885dbedf9fe19f10b9 Mon Sep 17 00:00:00 2001
From: Alexander-Makaryev
Date: Mon, 25 Oct 2021 15:04:13 +0300
Subject: [PATCH 19/21] increase build number
---
conda-recipe/meta.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 5a364b6..60f807d 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -1,5 +1,5 @@
{% set version = "1.2.0" %}
-{% set buildnumber = 7 %}
+{% set buildnumber = 8 %}
package:
name: scikit-ipp
From 234bc08dc2576f38e87ad207077fdbd62782f744 Mon Sep 17 00:00:00 2001
From: Alexander-Makaryev
Date: Mon, 25 Oct 2021 15:32:25 +0300
Subject: [PATCH 20/21] Update meta.yaml
---
conda-recipe/meta.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 60f807d..88d42c9 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -22,6 +22,7 @@ requirements:
- ipp-devel
- ipp-include
- numpy >=1.15
+ - numpy 1.20 # [osx]
- python
- setuptools
- wheel
From b34122ab9b3570ad1864932f9d30f06458bf2fea Mon Sep 17 00:00:00 2001
From: Alexander-Makaryev
Date: Mon, 25 Oct 2021 15:42:17 +0300
Subject: [PATCH 21/21] Update meta.yaml
---
conda-recipe/meta.yaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 88d42c9..28ebffb 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -15,14 +15,13 @@ build:
requirements:
build:
- - {{ compiler('c') }} #[not osx]
+ - {{ compiler('c') }}
host:
- cython
- ipp
- ipp-devel
- ipp-include
- numpy >=1.15
- - numpy 1.20 # [osx]
- python
- setuptools
- wheel