From 16590665c8d38535f8ba21cab2fd6b483015f938 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 21 May 2024 21:27:10 +0000 Subject: [PATCH 1/4] updated v3.2.4.post2 --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index baecaf1..1cd7670 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.2.4.post1" %} +{% set version = "3.2.4.post2" %} package: name: scs @@ -6,7 +6,7 @@ package: source: - url: https://github.com/bodono/scs-python/archive/refs/tags/{{ version }}.tar.gz - sha256: bb509507d857906eb95d17d5824138e48e7c75d1a692d0aa7256d899c7e703c5 + sha256: c010fd88b905240fc5e0ce10bb122ce0d22be30954b6fca22536bdd0197ad185 patches: # backport https://github.com/bodono/scs-python/pull/84 - patches/0001-Add-support-for-MKL-pardiso-in-meson-build.-84.patch @@ -16,9 +16,9 @@ source: folder: scs_source build: - number: 4 - string: mkl_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [blas_impl == "mkl"] - string: default_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [blas_impl != "mkl"] + number: 0 + string: mkl_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [blas_impl == "mkl"] + string: default_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [blas_impl != "mkl"] script: # Copy cross-compile meson file hack from scipy feedstock: # See https://github.com/conda-forge/scipy-feedstock/blob/9401aa4ee5d9a22c2c9d219e5fb6dbd580f30207/recipe/build.sh#L10 From d21b0c744be0b10617203684479dc00f5665cd09 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 21 May 2024 21:28:57 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.21.18.33.22 --- .../osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml | 2 ++ .../osx_64_blas_implmklnumpy1.22python3.9.____73_pypy.yaml | 2 ++ .../osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml | 2 ++ .../osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml | 2 ++ .../osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml | 2 ++ .../osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml | 2 ++ .../osx_64_blas_implnetlibnumpy1.22python3.8.____cpython.yaml | 2 ++ .../osx_64_blas_implnetlibnumpy1.22python3.9.____73_pypy.yaml | 2 ++ .../osx_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml | 2 ++ .../osx_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml | 2 ++ .../osx_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml | 2 ++ .../osx_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml | 2 ++ .gitattributes | 4 ++-- 18 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml index 5a8c746..9768e8f 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - mkl c_compiler: diff --git a/.ci_support/osx_64_blas_implmklnumpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_blas_implmklnumpy1.22python3.9.____73_pypy.yaml index 5a09827..b9ffa78 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.22python3.9.____73_pypy.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - mkl c_compiler: diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml index 9b3520e..585d22d 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - mkl c_compiler: diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml index 3dfa722..965492a 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - mkl c_compiler: diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml index 43a441a..0119097 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - mkl c_compiler: diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml index 5612aa2..2893426 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - mkl c_compiler: diff --git a/.ci_support/osx_64_blas_implnetlibnumpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_blas_implnetlibnumpy1.22python3.8.____cpython.yaml index b38c469..75c3070 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy1.22python3.8.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - netlib c_compiler: diff --git a/.ci_support/osx_64_blas_implnetlibnumpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_blas_implnetlibnumpy1.22python3.9.____73_pypy.yaml index eaf0ff2..20aa75c 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy1.22python3.9.____73_pypy.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - netlib c_compiler: diff --git a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml index 5872829..be7ddeb 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - netlib c_compiler: diff --git a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml index d00f963..4f4efe7 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - netlib c_compiler: diff --git a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml index dda2d61..3278571 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - netlib c_compiler: diff --git a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml index f36d222..9659204 100644 --- a/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implnetlibnumpy2.0python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' blas_impl: - netlib c_compiler: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index efe27bd..dc23fd3 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' blas_impl: - netlib c_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 9f4d9ca..304bb84 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' blas_impl: - netlib c_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index d1b0e0f..b903d4b 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' blas_impl: - netlib c_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index f18187f..9d52dc1 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' blas_impl: - netlib c_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index 7113999..02c321e 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' blas_impl: - netlib c_compiler: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true From 57de4936c1aa1be246db35177bdd9ec1f6dd5c04 Mon Sep 17 00:00:00 2001 From: Will Shanks Date: Wed, 22 May 2024 10:36:20 -0400 Subject: [PATCH 3/4] Remove MKL patch (now upstream) --- ...t-for-MKL-pardiso-in-meson-build.-84.patch | 143 ------------------ 1 file changed, 143 deletions(-) delete mode 100644 recipe/patches/0001-Add-support-for-MKL-pardiso-in-meson-build.-84.patch diff --git a/recipe/patches/0001-Add-support-for-MKL-pardiso-in-meson-build.-84.patch b/recipe/patches/0001-Add-support-for-MKL-pardiso-in-meson-build.-84.patch deleted file mode 100644 index f81f15a..0000000 --- a/recipe/patches/0001-Add-support-for-MKL-pardiso-in-meson-build.-84.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 0a8a5e52650dfea00bca7f104424cb7d90918ba2 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Thu, 2 May 2024 10:07:41 -0500 -Subject: [PATCH] Add support for MKL pardiso in meson build. (#84) - -[Removed irrelevant changes in .github/workflows/build.yml from patch] ---- - meson.build | 101 +++++++++++++++++++++++++++++++++----------------- - meson.options | 2 + - 2 files changed, 70 insertions(+), 33 deletions(-) - -diff --git a/meson.build b/meson.build -index 7dd0944..2fa6d2a 100644 ---- a/meson.build -+++ b/meson.build -@@ -4,44 +4,43 @@ py = import('python').find_installation(pure: false) - - cc = meson.get_compiler('c') - blas_deps = [] --if host_machine.system() == 'darwin' -- blas_deps = [dependency('Accelerate')] --else -- blas_deps = [cc.find_library('openblas', static: get_option('link_blas_statically'), required : false)] -- if not blas_deps[0].found() -- blas_deps = [dependency(['openblas', 'OpenBLAS'], static: get_option('link_blas_statically'), required : false)] -- endif --endif - --# try to find blas/cblas (e.g., Linux) --if not blas_deps[0].found() -- blas_deps = [cc.find_library('blas', static: get_option('link_blas_statically'), required : false)] -+if get_option('link_mkl') -+ blas_deps = [cc.find_library('mkl_rt', required : false)] - if not blas_deps[0].found() -- blas_deps = [dependency('blas', static: get_option('link_blas_statically'), required : false)] -- endif -- lapack_dep = cc.find_library('lapack', static: get_option('link_blas_statically'), required : false) -- if not lapack_dep.found() -- lapack_dep = dependency('lapack', static: get_option('link_blas_statically'), required : false) -- endif -- if lapack_dep.found() -- blas_deps += lapack_dep -- endif -- cblas_dep = cc.find_library('cblas', static: get_option('link_blas_statically'), required : false) -- if not cblas_dep.found() -- cblas_dep = dependency('cblas', static: get_option('link_blas_statically'), required : false) -+ blas_deps = [dependency('mkl-sdl', required : false)] - endif -- if cblas_dep.found() -- blas_deps += cblas_dep -+else -+ if host_machine.system() == 'darwin' -+ blas_deps = [dependency('Accelerate')] -+ else -+ blas_deps = [cc.find_library('openblas', static: get_option('link_blas_statically'), required : false)] -+ if not blas_deps[0].found() -+ blas_deps = [dependency(['openblas', 'OpenBLAS'], static: get_option('link_blas_statically'), required : false)] -+ endif - endif --endif - --# We find anaconda blas on windows for github CI --if host_machine.system() == 'windows' and not blas_deps[0].found() -- message(run_command(py,['-c','''import os; print('CONDA LIB FOLDER'); print(os.listdir('C:/Miniconda/envs/test\\Library\\lib'))''']).stdout()) -- blas_deps = [cc.find_library('openblas', -- dirs: ['C:/Miniconda/envs/test\\Library\\lib'], # this is the location on github CI -- static: get_option('link_blas_statically'), -- required : false)] -+ # try to find blas/cblas (e.g., Linux) -+ if not blas_deps[0].found() -+ blas_deps = [cc.find_library('blas', static: get_option('link_blas_statically'), required : false)] -+ if not blas_deps[0].found() -+ blas_deps = [dependency('blas', static: get_option('link_blas_statically'), required : false)] -+ endif -+ lapack_dep = cc.find_library('lapack', static: get_option('link_blas_statically'), required : false) -+ if not lapack_dep.found() -+ lapack_dep = dependency('lapack', static: get_option('link_blas_statically'), required : false) -+ endif -+ if lapack_dep.found() -+ blas_deps += lapack_dep -+ endif -+ cblas_dep = cc.find_library('cblas', static: get_option('link_blas_statically'), required : false) -+ if not cblas_dep.found() -+ cblas_dep = dependency('cblas', static: get_option('link_blas_statically'), required : false) -+ endif -+ if cblas_dep.found() -+ blas_deps += cblas_dep -+ endif -+ endif - endif - - # Since nothing above was required, we stop here if failed -@@ -156,4 +155,40 @@ py.extension_module( - dependencies: blas_deps, - ) - -+if get_option('link_mkl') -+ py.extension_module( -+ '_scs_mkl', -+ -+ 'scs/scspy.c', -+ 'scs_source/linsys/mkl/direct/private.c', -+ -+ # scs_source/src: -+ 'scs_source/src/aa.c', -+ 'scs_source/src/cones.c', -+ 'scs_source/src/ctrlc.c', -+ 'scs_source/src/exp_cone.c', -+ 'scs_source/src/linalg.c', -+ 'scs_source/src/normalize.c', -+ 'scs_source/src/rw.c', -+ 'scs_source/src/scs_version.c', -+ 'scs_source/src/scs.c', -+ 'scs_source/src/util.c', -+ -+ # scs_source/linsys: -+ 'scs_source/linsys/scs_matrix.c', -+ 'scs_source/linsys/csparse.c', -+ -+ include_directories : [ -+ 'scs', -+ 'scs_source/include', -+ 'scs_source/linsys', -+ 'scs_source/linsys/mkl/direct', -+ incdir_numpy], -+ install: true, -+ c_args: c_args + ['-DPYTHON', '-DCTRLC=1', '-DPY_MKL', -+ '-DUSE_LAPACK=1', '-DDLONG=1'], -+ dependencies: blas_deps, -+ ) -+endif -+ - py.install_sources('scs/__init__.py', subdir: 'scs') -diff --git a/meson.options b/meson.options -index 5db6627..ba840d4 100644 ---- a/meson.options -+++ b/meson.options -@@ -3,3 +3,5 @@ - # installation - option('link_blas_statically', type: 'boolean', - value: false, description: 'copy BLAS compiled object into SCS module(s)') -+option('link_mkl', type: 'boolean', -+ value: false, description: 'link to mkl-rt library') From 885b60f40dfbf21be0b444da408a12a5db5c3f72 Mon Sep 17 00:00:00 2001 From: Will Shanks Date: Wed, 22 May 2024 10:38:37 -0400 Subject: [PATCH 4/4] Update scs source to match upstream --- recipe/meta.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1cd7670..85a2e23 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,12 +7,9 @@ package: source: - url: https://github.com/bodono/scs-python/archive/refs/tags/{{ version }}.tar.gz sha256: c010fd88b905240fc5e0ce10bb122ce0d22be30954b6fca22536bdd0197ad185 - patches: - # backport https://github.com/bodono/scs-python/pull/84 - - patches/0001-Add-support-for-MKL-pardiso-in-meson-build.-84.patch # include submodule (not in github tarball due to dear-github/dear-github#214) - git_url: https://github.com/cvxgrp/scs.git - git_rev: 9024b8ccc1bba6ee797440fb22354cadb9c81839 + git_rev: 697e64783bb16489528b127d530400d4d29d73d0 folder: scs_source build: