diff --git a/.gitignore b/.gitignore index c597842..a33e76f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openmpi-1.10.3.tar.bz2 +SOURCES/openmpi-1.10.6.tar.bz2 SOURCES/openmpi-1.6.4-clean.tar.xz diff --git a/.openmpi.metadata b/.openmpi.metadata index 9706f55..4f3c94e 100644 --- a/.openmpi.metadata +++ b/.openmpi.metadata @@ -1,2 +1,2 @@ -a3355a5c1c96cf9298ef48061d9db8c2fbd014ea SOURCES/openmpi-1.10.3.tar.bz2 +cbb3121d30869ee89b5484af274b6b477d8ac72f SOURCES/openmpi-1.10.6.tar.bz2 24ec0fd3b82c72df9086e5b6b6be6d0a72f70892 SOURCES/openmpi-1.6.4-clean.tar.xz diff --git a/SOURCES/0001-Add-Chelsio-T6-adapter-device-parameters.patch b/SOURCES/0001-Add-Chelsio-T6-adapter-device-parameters.patch new file mode 100644 index 0000000..b4dba68 --- /dev/null +++ b/SOURCES/0001-Add-Chelsio-T6-adapter-device-parameters.patch @@ -0,0 +1,33 @@ +From 0d4d36a2dd40bddb866d10fe056e371a8441a116 Mon Sep 17 00:00:00 2001 +From: Potnuri Bharat Teja +Date: Tue, 23 Aug 2016 10:38:13 +0530 +Subject: [PATCH] Add Chelsio T6 adapter device parameters. + +Signed-off-by: Potnuri Bharat Teja +(cherry picked from commit 9b7f9ece2031531d159283000ebeecb0eaa1ef0d) +--- + ompi/mca/btl/openib/mca-btl-openib-device-params.ini | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/ompi/mca/btl/openib/mca-btl-openib-device-params.ini b/ompi/mca/btl/openib/mca-btl-openib-device-params.ini +index a61b91ffcb..406f2f917e 100644 +--- a/ompi/mca/btl/openib/mca-btl-openib-device-params.ini ++++ b/ompi/mca/btl/openib/mca-btl-openib-device-params.ini +@@ -253,6 +253,14 @@ mtu = 2048 + receive_queues = P,65536,64 + max_inline_data = 280 + ++[Chelsio T6] ++vendor_id = 0x1425 ++vendor_part_id = 0x6400,0x6401,0x6402,0x6403,0x6404,0x6405,0x6406,0x6407,0x6408,0x6409,0x640d,0x6410,0x6411,0x6414,0x6415 ++use_eager_rdma = 1 ++mtu = 2048 ++receive_queues = P,65536,64 ++max_inline_data = 280 ++ + ############################################################################ + + # I'm *assuming* that 0x4040 is the PCI ID... +-- +2.9.3 + diff --git a/SPECS/openmpi.spec b/SPECS/openmpi.spec index afc7f50..71d13f6 100644 --- a/SPECS/openmpi.spec +++ b/SPECS/openmpi.spec @@ -18,20 +18,21 @@ #global _cc_name_suffix -gcc %global majmin 1.10 -%global mainversion %{majmin}.3 +%global mainversion %{majmin}.6 Name: openmpi%{?_cc_name_suffix} Version: %{mainversion} -Release: 3%{?dist} +Release: 2%{?dist} Summary: Open Message Passing Interface Group: Development/Libraries -License: BSD, MIT and Romio +License: BSD and MIT and Romio URL: http://www.open-mpi.org/ # We can't use %{name} here because of _cc_name_suffix Source0: http://www.open-mpi.org/software/ompi/v%{majmin}/downloads/openmpi-%{mainversion}.tar.bz2 Source1: openmpi.module.in Source2: macros.openmpi.in +Patch1: 0001-Add-Chelsio-T6-adapter-device-parameters.patch # openmpi-1.6.4-clean.tar.xz was generated by taking the upstream tarball # and removing license-incompatible files: @@ -79,8 +80,8 @@ Provides: libmpi_usempi.so.1 %endif # Private openmpi libraries -%global __provides_exclude_from ^%{_libdir}/(openmpi|compat-openmpi16)/lib/(lib(mca|o|v)|openmpi/).*\\.so(\\..*)?$ -%global __requires_exclude ^lib(mca|ompi|open-(pal|rte|trace)|otf|vt|oshmem).*$ +%global __provides_exclude_from %{_libdir}/(openmpi|compat-openmpi16)/lib/(lib(mca|ompi|open-(pal|rte|trace))|openmpi/).*.so +%global __requires_exclude lib(mca|ompi|open-(pal|rte|trace)|vt).* %description Open MPI is an open source, freely available implementation of both the @@ -106,7 +107,7 @@ Contains development headers and libraries for openmpi Summary: Open MPI 1.6 compat library Group: Development/Libraries Version: 1.6.4 -Release: 10.3%{?dist} +Release: 10.5%{?dist} Provides: mpi Requires: environment-modules @@ -165,6 +166,7 @@ Contains development headers and libraries for compat-openmpi16 %prep %setup -q -n openmpi-%{mainversion} -b 100 +%patch1 -p1 cd .. cd openmpi-1.6.4 @@ -483,6 +485,17 @@ cd .. %endif %changelog +* Wed Apr 19 2017 Michal Schmidt - 1.10.6-2 +- Add Chelsio T6 adapter device parameters. +- Fix License tag format. +- Resolves: #1435249 + +* Fri Mar 24 2017 Michal Schmidt - 1.10.6-1 +- Update to upstream release 1.10.6. +- Fix missing RPM provides. +- Resolves: #1382800 +- Resolves: #1365792 + * Thu Aug 04 2016 Michal Schmidt - 1.10.3-3 - Restore libmpi_usempi.so.1. - Related: #1273175