From 70e6a6f583c1a74b6f9b0f0b05467bc8c66e748e78bace06520e3ff7cac8e25f Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Wed, 6 Sep 2017 07:17:03 +0000 Subject: [PATCH] Accepting request 521602 from home:NMoreyChaisemartin:branches:science:HPC - Update to version 10.2.260: - Fixed support for SLE12-SP2 - V2 EPID - Initialize CUDA support only if env variable is switched on - Add PSM_PERF functionality (for measuring number of instructions retired between two points in code) - Bug Fixes - Include commits from GitHub PR's #13, #14, #16 - Fix SLES build issue - Allow psm2_ep_connect to be called multiple times with 'self' epid - Fix issue with psm2_mq_ipeek2 and psm2_mq_test2 when used with multi-threaded OMPI - Fix performance related bugs for PSM2_CUDA builds - Remove libpsm2-fix-compilation-for-hfi1-v5.patch and libpsm2-compat-dependency-to-libpsm2.patch as they were merged upstream. OBS-URL: https://build.opensuse.org/request/show/521602 OBS-URL: https://build.opensuse.org/package/show/science:HPC/libpsm2?expand=0&rev=32 --- _service | 7 ++--- libpsm2-10.2.235.tar.bz2 | 3 --- libpsm2-10.2.260.tar.bz2 | 3 +++ libpsm2-compat-dependency-to-libpsm2.patch | 13 ---------- libpsm2-fix-compilation-for-hfi1-v5.patch | 30 ---------------------- libpsm2.changes | 18 ++++++++++++- libpsm2.spec | 6 +---- 7 files changed, 23 insertions(+), 57 deletions(-) delete mode 100644 libpsm2-10.2.235.tar.bz2 create mode 100644 libpsm2-10.2.260.tar.bz2 delete mode 100644 libpsm2-compat-dependency-to-libpsm2.patch delete mode 100644 libpsm2-fix-compilation-for-hfi1-v5.patch diff --git a/_service b/_service index 8e729ef..3586426 100644 --- a/_service +++ b/_service @@ -5,17 +5,14 @@ no .git libpsm2 - 10.2.235 + 10.2.260 PSM2_(.*) \1 PSM2_* - 1248735972dadb21c6173334da20f791c2bf6f6d + 3f30d743ffbd39703e3cecdb25d319ed199d3d97 libpsm2*.tar bz2 - - libpsm2 - diff --git a/libpsm2-10.2.235.tar.bz2 b/libpsm2-10.2.235.tar.bz2 deleted file mode 100644 index c29613d..0000000 --- a/libpsm2-10.2.235.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4fc3040352e5bdd9d1cb225723244beafa2e95ccee83be6b7a181ed49011102f -size 317071 diff --git a/libpsm2-10.2.260.tar.bz2 b/libpsm2-10.2.260.tar.bz2 new file mode 100644 index 0000000..beb66d3 --- /dev/null +++ b/libpsm2-10.2.260.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:003d9044beab8a9d4b1bf46c50c4cf486aaa21240e14343d601120a715c121e7 +size 323242 diff --git a/libpsm2-compat-dependency-to-libpsm2.patch b/libpsm2-compat-dependency-to-libpsm2.patch deleted file mode 100644 index 36c2d1a..0000000 --- a/libpsm2-compat-dependency-to-libpsm2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git compat/Makefile compat/Makefile -index e087be1..f52d255 100644 ---- compat/Makefile -+++ compat/Makefile -@@ -80,7 +80,7 @@ $(OUTDIR)/%.o: $(compat_build_dir)/%.c - - $(OUTDIR)/${COMPATLIB}.so.${MAJOR}: ${${COMPATLIB}-objs} - $(CC) $(BASECFLAGS) $(LINKER_SCRIPT) $(LDFLAGS) -Wl,-soname=${COMPATLIB}.so.${MAJOR} -shared \ -- -L$(OUTDIR)/.. -lpsm2 -o $@ ${${COMPATLIB}-objs} -+ -L$(OUTDIR)/.. -o $@ ${${COMPATLIB}-objs} -lpsm2 - - clean: - @if [ -d $(OUTDIR) ]; then \ diff --git a/libpsm2-fix-compilation-for-hfi1-v5.patch b/libpsm2-fix-compilation-for-hfi1-v5.patch deleted file mode 100644 index 46dd470..0000000 --- a/libpsm2-fix-compilation-for-hfi1-v5.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git psm_context.c psm_context.c -index fd5eaa2..95368a0 100644 ---- psm_context.c -+++ psm_context.c -@@ -260,10 +260,12 @@ psmi_compute_start_and_end_unit(psmi_context_t *context,long unit_param, - psmi_spread_hfi_selection(job_key, unit_start, - unit_end, nunits); - } -+#ifdef PSM2_SUPPORT_IW_CMD_API - } else if ((context->user_info.hfi1_alg == HFI1_ALG_ACROSS_ALL) && - (nunitsactive > 1)) { - psmi_spread_hfi_selection(job_key, unit_start, - unit_end, nunits); -+#endif - } - else { - *unit_start = 0; -@@ -789,8 +791,11 @@ int psmi_get_hfi_selection_algorithm(void) - hfi1_alg = HFI1_ALG_ACROSS; - else if (!strcasecmp(env_hfi1_alg.e_str, "Packed")) - hfi1_alg = HFI1_ALG_WITHIN; -- else if (!strcasecmp(env_hfi1_alg.e_str, "Round Robin All")) -+#ifdef PSM2_SUPPORT_IW_CMD_API -+ else if (hfi_get_user_major_version() == IOCTL_CMD_API_MODULE_MAJOR && -+ !strcasecmp(env_hfi1_alg.e_str, "Round Robin All")) - hfi1_alg = HFI1_ALG_ACROSS_ALL; -+#endif - else { - _HFI_ERROR - ("Unknown HFI selection algorithm %s. Defaulting to Round Robin " diff --git a/libpsm2.changes b/libpsm2.changes index e738bde..3aff80c 100644 --- a/libpsm2.changes +++ b/libpsm2.changes @@ -1,6 +1,22 @@ ------------------------------------------------------------------- -Tue Sep 5 16:20:58 UTC 2017 - nmoreychaisemartin@suse.com +Wed Sep 6 05:55:42 UTC 2017 - nmoreychaisemartin@suse.com +- Update to version 10.2.260: + - Fixed support for SLE12-SP2 + - V2 EPID + - Initialize CUDA support only if env variable is switched on + - Add PSM_PERF functionality (for measuring number of instructions + retired between two points in code) + - Bug Fixes + - Include commits from GitHub PR's #13, #14, #16 + - Fix SLES build issue + - Allow psm2_ep_connect to be called multiple times with 'self' epid + - Fix issue with psm2_mq_ipeek2 and psm2_mq_test2 when used with + multi-threaded OMPI + - Fix performance related bugs for PSM2_CUDA builds +- Remove libpsm2-fix-compilation-for-hfi1-v5.patch and + libpsm2-compat-dependency-to-libpsm2.patch as they were merged + upstream. - Update _service to allow auto updates from github ------------------------------------------------------------------- diff --git a/libpsm2.spec b/libpsm2.spec index 9afdcaf..896cea6 100644 --- a/libpsm2.spec +++ b/libpsm2.spec @@ -20,7 +20,7 @@ %define psm_so 2 Name: libpsm2 -Version: 10.2.235 +Version: 10.2.260 Release: 0 Summary: Intel PSM Messaging API libraries License: BSD-2-Clause or GPL-2.0 @@ -32,8 +32,6 @@ Source2: libpsm2-rpmlintrc Patch2: libpsm2-use_RPM_OPT_FLAGS.patch Patch3: libpsm2-use-exported-variable-for-version-and-release.patch Patch4: libpsm2-include-ioctl_h.patch -Patch6: libpsm2-compat-dependency-to-libpsm2.patch -Patch7: libpsm2-fix-compilation-for-hfi1-v5.patch BuildRequires: libnuma-devel BuildRequires: libuuid-devel BuildRequires: pkg-config @@ -88,8 +86,6 @@ Support for MPIs linked with PSM versions < 2. %patch2 %patch3 -p1 %patch4 -p1 -%patch6 -%patch7 cp %{S:1} ChangeLog