Hi,
Here are svndiff against oscar-svn 9202 regarding opkg-openmpi.
this allows to upgrade to openmpi 1.4.1
The aim is to have an openmpi version greater than RHEL/CentOS/SL openmpi
package and avoid yum to install the distro version instead of oscar version
(that includes specific options)
Regards,
Olivier.
--
Olivier LAHAYE
CEAEA Saclay
DRT-LIST-DCSI-DIR
Index: config.xml
===================================================================
--- config.xml (révision 9202)
+++ config.xml (copie de travail)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<oscar>
- <name>openmpi-oscar</name>
+ <name>openmpi</name>
<class>included</class>
<summary>Open MPI for OSCAR Clusters</summary>
<description>Open MPI is a project combining technologies and resources from several other projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best MPI library available. A completely new MPI-2 compliant implementation, Open MPI offers advantages for system and software vendors, application developers and computer science researchers.</description>
@@ -17,12 +17,20 @@
<email>di...@osl.iu.edu</email>
</author>
</authors>
- <provide>mpi</provide>
+ <provides>
+ <pkg>mpi</pkg>
+ </provides>
<serverDeps>
<requires>
<pkg>openmpi</pkg>
<pkg>openmpi-switcher-modulefile</pkg>
</requires>
+ <requires>
+ <filters>
+ <dist version="5" >rhel</dist>
+ </filters>
+ <pkg>gcc-gfortran</pkg>
+ </requires>
<requires>
<filters>
<dist version="4" >rhel</dist>
@@ -50,6 +58,12 @@
</requires>
<requires>
<filters>
+ <dist version="5" >rhel</dist>
+ </filters>
+ <pkg>gcc-gfortran</pkg>
+ </requires>
+ <requires>
+ <filters>
<dist>suse</dist>
<dist>sles</dist>
</filters>
@@ -58,7 +72,13 @@
</clientDeps>
<apiDeps/>
<changelog>
- <versionEntry version="1.2.4-1">
+ <versionEntry version="1.4.1-1">
+ <changelogEntry authorName="Olivier Lahaye" date="2010-02-25T15:00:00+02:00">
+ <item>Fixed the missing dependencies on RHEL5.</item>
+ <item>New upstream release.</item>
+ </changelogEntry>
+ </versionEntry>
+ <versionEntry version="1.2.4-1">
<changelogEntry authorName="DongInn Kim" date="2007-12-22T14:58:14+05:00">
<item>Fixed the missing dependencies on RHEL4.</item>
</changelogEntry>
Index: build.cfg
===================================================================
--- build.cfg (révision 9202)
+++ build.cfg (copie de travail)
@@ -5,6 +5,13 @@
requires: torque:torque
openmpi --define "oscar 1" --define "_vendor OSCAR" --define "configure_options --with-tm=/opt/pbs"
+[rhel:4|5:*]
+requires: gcc-gfortran
+requires: switcher:modules-oscar
+common: openmpi-switcher-modulefile --target noarch
+requires: torque:torque
+openmpi --define "oscar 1" --define "_vendor OSCAR" --define "configure_options --with-tm=/opt/pbs"
+
[*:*:*]
requires: switcher:modules-oscar
common: openmpi-switcher-modulefile --target noarch
Index: openmpi.cfg
===================================================================
--- openmpi.cfg (révision 9202)
+++ openmpi.cfg (copie de travail)
@@ -1 +1 @@
-source = wget, http://www.csm.ornl.gov/srt/downloads/oscar/openmpi-1.2.4-1.src.rpm
+source = wget, http://www.csm.ornl.gov/srt/downloads/oscar/openmpi-1.4.1-1.src.rpm
Index: README
===================================================================
--- README (révision 9202)
+++ README (copie de travail)
@@ -2,6 +2,6 @@
rpmbuild --rebuild --define "oscar 1" --define "_packager YOUR_NAME <YOUR_EMAIL>" \
--define "_vendor OSCAR" --define "configure_options --with-tm=/opt/pbs" \
- openmpi-1.0.2-1.src.rpm
+ openmpi-1.4.1-1.src.rpm
Remember to update the command with your name and email address.
Index: testing/rm_script.openmpi
===================================================================
--- testing/rm_script.openmpi (révision 9202)
+++ testing/rm_script.openmpi (copie de travail)
@@ -8,7 +8,8 @@
# Double check that we've got a TM component
-if test -z "`ompi_info -parsable | grep mca:pls:tm`"; then
+#if test -z "`ompi_info -parsable | grep mca:pls:tm`"; then
+if test -z "`ompi_info -parsable | grep mca:plm:tm`"; then
cat 1>&2 <<EOF
ERROR: Open MPI does not appear to have the tm component!
Index: openmpi-switcher-modulefile.cfg
===================================================================
--- openmpi-switcher-modulefile.cfg (révision 9202)
+++ openmpi-switcher-modulefile.cfg (copie de travail)
@@ -1 +1 @@
-source = wget, http://www.csm.ornl.gov/srt/downloads/oscar/openmpi-switcher-modulefile-1.1.1-1.src.rpm
+source = wget, http://www.csm.ornl.gov/srt/downloads/oscar/openmpi-switcher-modulefile-1.4.1-1.src.rpm
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Oscar-devel mailing list
Oscar-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oscar-devel
