From 87cf6ad70d2df215aafddad3a6c1fd0e1e07d4def8b3ac33e09d4e662a99c117 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Fri, 16 Mar 2018 07:13:38 +0000 Subject: [PATCH 1/4] Accepting request 587613 from home:eeich:branches:science:HPC - build with pmi/slurm support (bsc#1085506) OBS-URL: https://build.opensuse.org/request/show/587613 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=34 --- mvapich2.changes | 5 +++++ mvapich2.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/mvapich2.changes b/mvapich2.changes index 870fc83..7445c38 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 15 15:50:21 UTC 2018 - cgoll@suse.com + +- build with pmi/slurm support (bsc#1085506) + ------------------------------------------------------------------- Fri Feb 9 11:29:26 UTC 2018 - cgoll@suse.com diff --git a/mvapich2.spec b/mvapich2.spec index 98a5c28..fe5ffb7 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -179,6 +179,7 @@ BuildRequires: mpi-selector %else BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: lua-lmod +BuildRequires: slurm-devel BuildRequires: suse-hpc %endif %if "%{build_flavor}" == "psm" @@ -290,6 +291,8 @@ cp /usr/share/automake*/config.* . %if %{with hpc} %{hpc_setup} %{hpc_configure} \ + --with-pmi=pmi2 \ + --with-pm=slurm \ %else %configure \ --prefix=%{p_prefix} \ From cd8474af3a1cb5f05806f4f9ce4b3a52be7456ee1a22111c6bc90b7cd36badcd Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Fri, 16 Mar 2018 08:18:03 +0000 Subject: [PATCH 2/4] Add missing Require to slurm-devel OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=35 --- mvapich2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mvapich2.spec b/mvapich2.spec index fe5ffb7..8ba5940 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -234,6 +234,7 @@ Requires: gcc-c++ Requires: gcc-fortran %else %hpc_requires_devel +Requires: slurm-devel %endif %description devel From 192abc7f9104c5f39ef41a226a639a0dcf3fea9eb0237da6b67afc34116749f2 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Fri, 16 Mar 2018 08:59:17 +0000 Subject: [PATCH 3/4] osc copypac from project:science:HPC package:mvapich2 revision:33 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=36 --- mvapich2.changes | 5 ----- mvapich2.spec | 4 ---- 2 files changed, 9 deletions(-) diff --git a/mvapich2.changes b/mvapich2.changes index 7445c38..870fc83 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Mar 15 15:50:21 UTC 2018 - cgoll@suse.com - -- build with pmi/slurm support (bsc#1085506) - ------------------------------------------------------------------- Fri Feb 9 11:29:26 UTC 2018 - cgoll@suse.com diff --git a/mvapich2.spec b/mvapich2.spec index 8ba5940..98a5c28 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -179,7 +179,6 @@ BuildRequires: mpi-selector %else BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: lua-lmod -BuildRequires: slurm-devel BuildRequires: suse-hpc %endif %if "%{build_flavor}" == "psm" @@ -234,7 +233,6 @@ Requires: gcc-c++ Requires: gcc-fortran %else %hpc_requires_devel -Requires: slurm-devel %endif %description devel @@ -292,8 +290,6 @@ cp /usr/share/automake*/config.* . %if %{with hpc} %{hpc_setup} %{hpc_configure} \ - --with-pmi=pmi2 \ - --with-pm=slurm \ %else %configure \ --prefix=%{p_prefix} \ From 9087f49e9c1a59e182fd25638303682fa9996df07bbb2eaaaff138c17c585d7e Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Mon, 26 Mar 2018 14:24:11 +0000 Subject: [PATCH 4/4] Accepting request 590919 from home:kasimir:ToTest - Change mvapich2-arm-support.patch to provide missing functions for armv6hl OBS-URL: https://build.opensuse.org/request/show/590919 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=37 --- mvapich2-arm-support.patch | 2 +- mvapich2.changes | 6 ++++++ mvapich2.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mvapich2-arm-support.patch b/mvapich2-arm-support.patch index 6dcbc82..f756907 100644 --- a/mvapich2-arm-support.patch +++ b/mvapich2-arm-support.patch @@ -6,7 +6,7 @@ index ac117c2..335d07f 100644 asm volatile ("mov %0=ar.itc" : "=r" (ret)); return ret; } -+#elif defined(__ARM_ARCH_7A__) ++#elif defined(__ARM_ARCH_7A__) || defined(__arm__) +typedef unsigned long long cycles_t; +static inline cycles_t get_cycles(void) +{ diff --git a/mvapich2.changes b/mvapich2.changes index 870fc83..4bdc91a 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 25 13:07:18 UTC 2018 - kasimir_@outlook.de + +- Change mvapich2-arm-support.patch to provide missing functions for + armv6hl + ------------------------------------------------------------------- Fri Feb 9 11:29:26 UTC 2018 - cgoll@suse.com diff --git a/mvapich2.spec b/mvapich2.spec index 98a5c28..ca05681 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -165,7 +165,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: automake BuildRequires: bison -%ifnarch s390 s390x armv7hl +%ifnarch s390 s390x %{arm} BuildRequires: libnuma-devel %endif BuildRequires: libtool