Author: dledford
Update of /cvs/extras/rpms/openmpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19404
Modified Files:
openmpi.spec sources
Added Files:
openmpi-changeset_r22324.patch
Removed Files:
openmpi-bz515567.patch
Log Message:
* Wed Jan 13 2010 Doug Ledford <dledford at redhat.com> - 1.4-1
- Update to latest upstream stable version
- Add support for libibcm usage
- Enable sge support via configure options since it's no longer on by default
- Add patch to resolve allreduce issue (bz538199)
- Remove no longer needed patch for Chelsio cards
openmpi-changeset_r22324.patch:
amd64/atomic.h | 16 ++++++++--------
ia32/atomic.h | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
--- NEW FILE openmpi-changeset_r22324.patch ---
Index: /trunk/opal/include/opal/sys/amd64/atomic.h
===================================================================
--- /trunk/opal/include/opal/sys/amd64/atomic.h (revision 21180)
+++ /trunk/opal/include/opal/sys/amd64/atomic.h (revision 22324)
@@ -85,9 +85,9 @@
unsigned char ret;
__asm__ __volatile__ (
- SMPLOCK "cmpxchgl %1,%2 \n\t"
+ SMPLOCK "cmpxchgl %3,%4 \n\t"
"sete %0 \n\t"
- : "=qm" (ret)
- : "q"(newval), "m"(*addr), "a"(oldval)
- : "memory");
+ : "=qm" (ret), "=a" (oldval), "=m" (*addr)
+ : "q"(newval), "m"(*addr), "1"(oldval)
+ );
return (int)ret;
@@ -106,9 +106,9 @@
unsigned char ret;
__asm__ __volatile__ (
- SMPLOCK "cmpxchgq %1,%2 \n\t"
+ SMPLOCK "cmpxchgq %3,%4 \n\t"
"sete %0 \n\t"
- : "=qm" (ret)
- : "q"(newval), "m"(*((volatile long*)addr)), "a"(oldval)
- : "memory");
+ : "=qm" (ret), "=a" (oldval), "=m" (*((volatile long*)addr))
+ : "q"(newval), "m"(*((volatile long*)addr)), "1"(oldval)
+ );
return (int)ret;
Index: /trunk/opal/include/opal/sys/ia32/atomic.h
===================================================================
--- /trunk/opal/include/opal/sys/ia32/atomic.h (revision 21180)
+++ /trunk/opal/include/opal/sys/ia32/atomic.h (revision 22324)
@@ -92,9 +92,9 @@
unsigned char ret;
__asm__ __volatile__ (
- SMPLOCK "cmpxchgl %1,%2 \n\t"
+ SMPLOCK "cmpxchgl %3,%4 \n\t"
"sete %0 \n\t"
- : "=qm" (ret)
- : "q"(newval), "m"(*((volatile long*)addr)), "a"(oldval)
- : "memory");
+ : "=qm" (ret), "=a" (oldval), "=m" (*addr)
+ : "q"(newval), "m"(*((volatile long*)addr)), "1"(oldval)
+ );
return (int)ret;
Index: openmpi.spec
===================================================================
RCS file: /cvs/extras/rpms/openmpi/devel/openmpi.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- openmpi.spec 22 Sep 2009 18:36:00 -0000 1.43
+++ openmpi.spec 13 Jan 2010 18:25:52 -0000 1.44
@@ -18,8 +18,8 @@
#define _cc_name_suffix -gcc
Name: openmpi%{?_cc_name_suffix}
-Version: 1.3.3
-Release: 6%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Open Message Passing Interface
Group: Development/Libraries
License: BSD
@@ -29,11 +29,11 @@ Source0: http://www.open-mpi.org/softwa
Source1: openmpi.pc.in
Source2: openmpi.module.in
Source3: macros.openmpi
-Patch0: openmpi-bz515567.patch
+Patch0: openmpi-changeset_r22324.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran, libtool, numactl-devel, valgrind-devel
-BuildRequires: libibverbs-devel, opensm-devel > 3.3.0
-BuildRequires: librdmacm librdmacm-devel
+BuildRequires: libibverbs-devel >= 1.1.3, opensm-devel > 3.3.0
+BuildRequires: librdmacm librdmacm-devel libibcm libibcm-devel
#%ifnarch ppc
#BuildRequires: compat-dapl-devel
#%endif
@@ -106,7 +106,7 @@ Contains development headers and librari
%prep
%setup -q -n openmpi-%{version}
-%patch0 -p0 -b .bz515567
+%patch0 -p2 -b .bz538199
%ifarch x86_64
XFLAGS="-fPIC"
%endif
@@ -117,6 +117,8 @@ XFLAGS="-fPIC"
--includedir=%{_includedir}/%{namearch} \
--sysconfdir=%{_sysconfdir}/%{namearch} \
--enable-mpi-threads \
+ --enable-openib-ibcm \
+ --with-sge \
--with-valgrind \
--with-wrapper-cflags="%{?opt_cflags} %{?modeflag}" \
--with-wrapper-cxxflags="%{?opt_cxxflags} %{?modeflag}" \
@@ -214,6 +216,13 @@ rm -rf %{buildroot}
%{_sysconfdir}/rpm/macros.%{namearch}
%changelog
+* Wed Jan 13 2010 Doug Ledford <dledford at redhat.com> - 1.4-1
+- Update to latest upstream stable version
+- Add support for libibcm usage
+- Enable sge support via configure options since it's no longer on by default
+- Add patch to resolve allreduce issue (bz538199)
+- Remove no longer needed patch for Chelsio cards
+
* Tue Sep 22 2009 Jay Fenlason <fenlason at redhat.com> - 1.3.3-6
- Create and own man* directories for use by dependent packages.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openmpi/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 21 Jul 2009 15:08:21 -0000 1.9
+++ sources 13 Jan 2010 18:25:52 -0000 1.10
@@ -1 +1 @@
-f6cdc9c195daa8571b2e509e952d6755 openmpi-1.3.3.tar.bz2
+9786ec0698afed9498ce43dc3978a435 openmpi-1.4.tar.bz2
--- openmpi-bz515567.patch DELETED ---