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

@@ -5,17 +5,14 @@
     <param name="package-meta">no</param>
     <param name="exclude">.git</param>
     <param name="filename">libpsm2</param>
-    <param name="version">10.2.235</param>
+    <param name="version">10.2.260</param>
     <param name="versionrewrite-pattern">PSM2_(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
     <param name="match-tag">PSM2_*</param>
-    <param name="revision">1248735972dadb21c6173334da20f791c2bf6f6d</param>
+    <param name="revision">3f30d743ffbd39703e3cecdb25d319ed199d3d97</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">libpsm2*.tar</param>
     <param name="compression">bz2</param>
   </service>
-  <service mode="disabled" name="set_version">
-    <param name="basename">libpsm2</param>
-  </service>
 </services>

libpsm2-10.2.235.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fc3040352e5bdd9d1cb225723244beafa2e95ccee83be6b7a181ed49011102f
-size 317071

libpsm2-10.2.260.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:003d9044beab8a9d4b1bf46c50c4cf486aaa21240e14343d601120a715c121e7
+size 323242

libpsm2-compat-dependency-to-libpsm2.patch

@@ -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 \

libpsm2-fix-compilation-for-hfi1-v5.patch

@@ -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 "

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
 
 -------------------------------------------------------------------

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