dist-git conversion

Backport from F-14.
- Dont build with valgrind support on sparc arches
2010-07-29 04:59:23 +00:00 · 2010-03-29 20:18:41 +00:00 · 2010-03-11 15:45:59 +00:00 · 2010-02-15 23:39:30 +00:00 · 2010-01-15 22:55:32 +00:00 · 2010-01-15 14:29:29 +00:00
10 changed files with 208 additions and 888 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,54 +1 @@
 openmpi-1.4.1-RH.tar.bz2
-/openmpi-1.5-RH.tar.bz2
-/openmpi-1.5.4-clean.tar.bz2
-/openmpi-1.5.5-clean.tar.bz2
-/openmpi-1.6.tar.bz2
-/openmpi-1.6-clean.tar.bz2
-/openmpi-1.6.1-clean.tar.xz
-/openmpi-1.6.2-clean.tar.xz
-/openmpi-1.6.3-clean.tar.xz
-/openmpi-1.6.4-clean.tar.bz2
-/openmpi-1.6.4-clean.tar.xz
-/openmpi-1.7-clean.tar.xz
-/openmpi-1.7.1-clean.tar.xz
-/openmpi-1.7.2-clean.tar.xz
-/openmpi-1.7.3.tar.bz2
-/openmpi-1.7.4.tar.bz2
-/openmpi-1.7.5.tar.bz2
-/openmpi-1.8.tar.bz2
-/openmpi-1.8.1.tar.bz2
-/openmpi-1.8.2.tar.bz2
-/openmpi-1.8.3.tar.bz2
-/openmpi-1.8.4.tar.bz2
-/openmpi-v1.8.4-99-gd83fb30.tar.gz
-/openmpi-v1.8.4-134-g9ad2aa8.tar.bz2
-/openmpi-1.8.5rc1.tar.bz2
-/openmpi-1.8.5rc3.tar.bz2
-/openmpi-1.8.5.tar.bz2
-/openmpi-1.8.6.tar.bz2
-/openmpi-1.8.7.tar.bz2
-/openmpi-1.8.8.tar.bz2
-/openmpi-1.10.0.tar.bz2
-/openmpi-1.10.1.tar.bz2
-/openmpi-1.10.2.tar.bz2
-/openmpi-1.10.3.tar.bz2
-/openmpi-1.10.4.tar.bz2
-/openmpi-2.0.1.tar.bz2
-/openmpi-2.0.2.tar.bz2
-/openmpi-2.1.0.tar.bz2
-/openmpi-2.1.1.tar.bz2
-/openmpi-2.1.5.tar.bz2
-/openmpi-2.1.6rc1.tar.bz2
-/openmpi-2.1.6.tar.bz2
-/openmpi-3.1.3.tar.bz2
-/openmpi-3.1.4.tar.bz2
-/openmpi-4.0.0.tar.bz2
-/openmpi-4.0.1.tar.bz2
-/openmpi-4.0.2rc1.tar.bz2
-/openmpi-4.0.2rc2.tar.bz2
-/openmpi-4.0.2.tar.bz2
-/openmpi-4.0.3rc3.tar.bz2
-/openmpi-4.0.3rc4.tar.bz2
-/openmpi-4.0.3.tar.bz2
-/openmpi-4.0.4rc1.tar.bz2
-/openmpi-4.0.4.tar.bz2
--- a/.rpmlint
+++ b/.rpmlint
@ -1,6 +0,0 @@
-from Config import *
-addFilter("shared-library-calls-exit .*/lib(mpi|open-rte|oshmem|_java)\.so");
-# We use environment modules to load these paths
-addFilter("file-not-in-%lang /usr/share/man/openmpi-");
-addFilter("invalid-locale-man-dir /usr/share/man/openmpi-");
-addFilter("library-without-ldconfig-post[iu]n /usr/lib(|64)/openmpi/");
--- a/macros.openmpi
+++ b/macros.openmpi
@ -1,7 +1,7 @@
 %_openmpi_load \
 . /etc/profile.d/modules.sh; \
- module load mpi/openmpi-%{_arch}; \
- export OMPI_MCA_rmaps_base_oversubscribe=1
+ module load openmpi-%{_arch}; \
+ export CFLAGS="$CFLAGS %{optflags}";
 %_openmpi_unload \
 . /etc/profile.d/modules.sh; \
- module unload mpi/openmpi-%{_arch};
+ module unload openmpi-%{_arch};
--- a/openmpi-changeset_r22324.patch
+++ b/openmpi-changeset_r22324.patch
@ -0,0 +1,50 @@
+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;
--- a/openmpi.module.in
+++ b/openmpi.module.in
@ -1,21 +1,17 @@
 #%Module 1.0
 #
 #  OpenMPI module for use with 'environment-modules' package:
-#
-conflict		mpi
+# 
 prepend-path 		PATH 		@LIBDIR@/bin
 prepend-path 		LD_LIBRARY_PATH @LIBDIR@/lib
-prepend-path 		PKG_CONFIG_PATH	@LIBDIR@/lib/pkgconfig
-prepend-path		MANPATH		:@MANDIR@
+prepend-path		PYTHONPATH	@PYSITEARCH@
 setenv 			MPI_BIN		@LIBDIR@/bin
 setenv			MPI_SYSCONFIG	@ETCDIR@
 setenv			MPI_FORTRAN_MOD_DIR	@FMODDIR@
 setenv			MPI_INCLUDE	@INCDIR@
 setenv	 		MPI_LIB		@LIBDIR@/lib
 setenv			MPI_MAN		@MANDIR@
-setenv			MPI_PYTHON_SITEARCH	@PY2SITEARCH@
-setenv			MPI_PYTHON2_SITEARCH	@PY2SITEARCH@
-setenv			MPI_PYTHON3_SITEARCH	@PY3SITEARCH@
+setenv			MPI_PYTHON_SITEARCH	@PYSITEARCH@
 setenv			MPI_COMPILER	@COMPILER@
 setenv			MPI_SUFFIX	@SUFFIX@
 setenv	 		MPI_HOME	@LIBDIR@
--- a/openmpi.pc.in
+++ b/openmpi.pc.in
@ -0,0 +1,7 @@
+# pkg-config file for openmpi
+Name: 		@NAME@
+Description:	Open Message Passing Interface headers and libraries
+URL:		http://www.open-mpi.org/
+Version:	@VERSION@-@CC@
+Libs:		-L@LIBDIR@ -lmpi
+Cflags: 	-I@INCDIR@ @MODEFLAG@
--- a/openmpi.pth.py2
+++ b/openmpi.pth.py2
@ -1 +0,0 @@
-import sys, os; s = os.getenv('MPI_PYTHON2_SITEARCH'); s and (s in sys.path or sys.path.append(s))
--- a/openmpi.pth.py3
+++ b/openmpi.pth.py3
@ -1 +0,0 @@
-import sys, os; s = os.getenv('MPI_PYTHON3_SITEARCH'); s and (s in sys.path or sys.path.append(s))
--- a/openmpi.spec
+++ b/openmpi.spec
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (openmpi-4.0.4.tar.bz2) = 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64
+0a343ebe72050f6795a132a8d6df876e  openmpi-1.4.1-RH.tar.bz2
Author	SHA1	Message	Date
Fedora Release Engineering	9004604e7e	dist-git conversion	2010-07-29 04:59:23 +00:00
Jay Fenlason	03f3f365a9	Backport from F-14.	2010-03-29 20:18:41 +00:00
Dennis Gilmore	5e6f2d99fa	- Dont build with valgrind support on sparc arches - use -fPIC on sparc arches	2010-03-11 15:45:59 +00:00
Jay Fenlason	23f5faa236	Backport 1.4.1-2 to F-12	2010-02-15 23:39:30 +00:00
Doug Ledford	b9d08f710c	- Fix an issue with usage of _cc_name_suffix that cause a broken define in our module file	2010-01-15 22:55:32 +00:00
Doug Ledford	2532265549	- Fix pkgconfig file substitution - Bump version so we are later than the equivalent version from Red Hat Enterprise Linux	2010-01-15 14:29:29 +00:00
Doug Ledford	ec68ec9e1a	- 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	2010-01-13 18:42:01 +00:00
Bill Nottingham	15263000d8	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:24:17 +00:00
Jesse Keating	927ec06c36	Initialize branch F-12 for openmpi	2009-09-29 05:47:59 +00:00
				`@ -1 +0,0 @@`
				`import sys, os; s = os.getenv('MPI_PYTHON2_SITEARCH'); s and (s in sys.path or sys.path.append(s))`