From 754b5ceef84b8114436cc03a5643e7b7d395038f Mon Sep 17 00:00:00 2001 From: "fuhua.wang" Date: Fri, 30 Jul 2021 10:12:43 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?= =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?= =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?openeuler-scipy=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E5=BC=80=E5=90=AF?= =?UTF-8?q?OpenMP=E7=BA=BF=E7=A8=8B=E6=A0=B8=E7=BB=91=E5=AE=9A]=20[?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E9=A3=8E=E9=99=A9=EF=BC=9A=E6=97=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scipy.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scipy.spec b/scipy.spec index 2523da3..3868b16 100644 --- a/scipy.spec +++ b/scipy.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: scipy Version: 1.2.2 -Release: 4 +Release: 5 Summary: A Python-based ecosystem of open-source software for mathematics, science, and engineering License: BSD, MIT, Boost and Public Domain URL: https://www.scipy.org @@ -54,6 +54,8 @@ cp -a . %{py3dir} %build +#开启OpenMP线程核绑定,由于此次比赛时间紧迫,且没有时间进行验证,暂且只保证编译通过。 +export OMP_PROC_BIND=true export CFLAGS="$RPM_OPT_FLAGS -lm" export LDFLAGS="$RPM_LD_FLAGS -Wall -shared" pushd %{py3dir} -- Gitee From f82764947d94a6c25ddbbe5c15c0fbf5df632fb9 Mon Sep 17 00:00:00 2001 From: "fuhua.wang" Date: Fri, 30 Jul 2021 11:45:11 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?= =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?= =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?openeuler-scipy=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E9=AA=8C=E8=AF=81?= =?UTF-8?q?license=E9=97=AE=E9=A2=98]=20[=E6=96=B9=E6=A1=88=E9=A3=8E?= =?UTF-8?q?=E9=99=A9=EF=BC=9A=E6=97=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scipy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy.spec b/scipy.spec index 3868b16..5c9c1ae 100644 --- a/scipy.spec +++ b/scipy.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: scipy Version: 1.2.2 -Release: 5 +Release: 4 Summary: A Python-based ecosystem of open-source software for mathematics, science, and engineering License: BSD, MIT, Boost and Public Domain URL: https://www.scipy.org -- Gitee From e0ae9eb7bbb79b45f254f4d0fa9c9b2859bc81fc Mon Sep 17 00:00:00 2001 From: "fuhua.wang" Date: Fri, 30 Jul 2021 12:07:26 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?= =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?= =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?openeuler-scipy=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98]=20[=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=EF=BC=9A=E6=97=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scipy.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/scipy.spec b/scipy.spec index 5c9c1ae..2523da3 100644 --- a/scipy.spec +++ b/scipy.spec @@ -54,8 +54,6 @@ cp -a . %{py3dir} %build -#开启OpenMP线程核绑定,由于此次比赛时间紧迫,且没有时间进行验证,暂且只保证编译通过。 -export OMP_PROC_BIND=true export CFLAGS="$RPM_OPT_FLAGS -lm" export LDFLAGS="$RPM_LD_FLAGS -Wall -shared" pushd %{py3dir} -- Gitee From 82d008b07f20446f57f1db0a92b222dddc1f5dbf Mon Sep 17 00:00:00 2001 From: "fuhua.wang" Date: Fri, 30 Jul 2021 12:09:12 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?= =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?= =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?openeuler-scipy=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98]=20[=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=EF=BC=9A=E6=97=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scipy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy.spec b/scipy.spec index 2523da3..ae3438a 100644 --- a/scipy.spec +++ b/scipy.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: scipy Version: 1.2.2 -Release: 4 +Release: 5 Summary: A Python-based ecosystem of open-source software for mathematics, science, and engineering License: BSD, MIT, Boost and Public Domain URL: https://www.scipy.org -- Gitee From d90df70cb907b0fe5cc2849c388b4733b47811eb Mon Sep 17 00:00:00 2001 From: "fuhua.wang" Date: Fri, 30 Jul 2021 13:11:26 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?= =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?= =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?openeuler-scipy=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98]=20[=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=EF=BC=9A=E6=97=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scipy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy.spec b/scipy.spec index ae3438a..13e4dcb 100644 --- a/scipy.spec +++ b/scipy.spec @@ -9,7 +9,7 @@ URL: https://www.scipy.org Source0: https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{version}.tar.gz BuildRequires: python3-devel python3-numpy >= 1.8.2 python3-numpy-f2py -BuildRequires: gcc-c++ openblas-devel gcc-gfortran git +BuildRequires: gcc-c++ openblas-devel gcc-gfortran <= 9.9.9 git gcc <= 9.9.9 %description SciPy (pronounced "Sigh Pie") is open-source software for mathematics, science, and engineering. -- Gitee From 4ca4344ec024d51ba8712e04af89ec0d90cf5d2d Mon Sep 17 00:00:00 2001 From: "fuhua.wang" Date: Fri, 30 Jul 2021 13:23:00 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?= =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?= =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?openeuler-scipy=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98]=20[=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=EF=BC=9A=E6=97=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scipy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy.spec b/scipy.spec index 13e4dcb..a215c83 100644 --- a/scipy.spec +++ b/scipy.spec @@ -9,7 +9,7 @@ URL: https://www.scipy.org Source0: https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{version}.tar.gz BuildRequires: python3-devel python3-numpy >= 1.8.2 python3-numpy-f2py -BuildRequires: gcc-c++ openblas-devel gcc-gfortran <= 9.9.9 git gcc <= 9.9.9 +BuildRequires: gcc-c++ openblas-devel gcc-gfortran <= 9.9.9 git %description SciPy (pronounced "Sigh Pie") is open-source software for mathematics, science, and engineering. -- Gitee From 77877372dd6300b5034c7c227ef31cb1429ab16b Mon Sep 17 00:00:00 2001 From: "fuhua.wang" Date: Fri, 30 Jul 2021 14:17:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?= =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?= =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?openeuler-scipy=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98]=20[=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=EF=BC=9A=E6=97=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scipy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy.spec b/scipy.spec index a215c83..bd59c67 100644 --- a/scipy.spec +++ b/scipy.spec @@ -9,7 +9,7 @@ URL: https://www.scipy.org Source0: https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{version}.tar.gz BuildRequires: python3-devel python3-numpy >= 1.8.2 python3-numpy-f2py -BuildRequires: gcc-c++ openblas-devel gcc-gfortran <= 9.9.9 git +BuildRequires: gcc-c++ openblas-devel gcc-gfortran >=10.9 git %description SciPy (pronounced "Sigh Pie") is open-source software for mathematics, science, and engineering. -- Gitee