r44186 - /packages/code-aster/astk/trunk/debian/patches/config.patch

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Fri Dec 16 12:20:22 UTC 2011 

Author: trophime-guest
Date: Fri Dec 16 12:20:21 2011
New Revision: 44186

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44186
Log:
fix mpi_get_procid_cmd in asrun

Modified:
    packages/code-aster/astk/trunk/debian/patches/config.patch

Modified: packages/code-aster/astk/trunk/debian/patches/config.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/patches/config.patch?rev=44186&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/config.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/config.patch Fri Dec 16 12:20:21 2011
@@ -1,7 +1,7 @@
 Index: astk-1.10.0/ASTK_CLIENT/etc/astkrc/outils
 ===================================================================
---- astk-1.10.0.orig/ASTK_CLIENT/etc/astkrc/outils	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_CLIENT/etc/astkrc/outils	2011-12-16 11:18:47.000000000 +0100
+--- astk-1.10.0.orig/ASTK_CLIENT/etc/astkrc/outils	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_CLIENT/etc/astkrc/outils	2011-12-16 13:18:53.000000000 +0100
 @@ -4,22 +4,22 @@
  astkrc_version : 1.1
  #
@@ -31,8 +31,8 @@
  #
 Index: astk-1.10.0/ASTK_CLIENT/bin/astk
 ===================================================================
---- astk-1.10.0.orig/ASTK_CLIENT/bin/astk	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_CLIENT/bin/astk	2011-12-16 11:18:47.000000000 +0100
+--- astk-1.10.0.orig/ASTK_CLIENT/bin/astk	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_CLIENT/bin/astk	2011-12-16 13:18:53.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!?SHELL_EXECUTION?
 +#!/bin/bash
@@ -72,8 +72,8 @@
  
 Index: astk-1.10.0/ASTK_SERV/etc/profile.csh
 ===================================================================
---- astk-1.10.0.orig/ASTK_SERV/etc/profile.csh	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/profile.csh	2011-12-16 11:18:47.000000000 +0100
+--- astk-1.10.0.orig/ASTK_SERV/etc/profile.csh	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/etc/profile.csh	2011-12-16 13:18:53.000000000 +0100
 @@ -12,39 +12,26 @@
     setenv DEFINE_PROFILE_ASRUN done
  #--- ifndef DEFINE_PROFILE_ASRUN -----------------------------------------------
@@ -127,8 +127,8 @@
  # source local profile
 Index: astk-1.10.0/ASTK_SERV/etc/asrun
 ===================================================================
---- astk-1.10.0.orig/ASTK_SERV/etc/asrun	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/asrun	2011-12-16 11:20:05.000000000 +0100
+--- astk-1.10.0.orig/ASTK_SERV/etc/asrun	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/etc/asrun	2011-12-16 13:19:24.000000000 +0100
 @@ -212,10 +212,10 @@
  # mpirun
  #    available arguments are : mpi_hostfile, mpi_nbnoeud, mpi_nbcpu
@@ -142,6 +142,15 @@
  
  # command called to initialize MPI environment (for example for mpich2)
  #mpi_ini : mpdboot --totalnum=%(mpi_nbnoeud)s --file=%(mpi_hostfile)s ; sleep 10
+@@ -229,7 +229,7 @@
+ # OpenMPI (1.3) : echo $OMPI_MCA_orte_ess_vpid
+ # OpenMPI (1.34 : echo $OMPI_COMM_WORLD_RANK
+ # Mpich2  : echo $PMI_RANK
+-mpi_get_procid_cmd : echo $PMI_RANK
++mpi_get_procid_cmd : echo $OMPI_MCA_orte_ess_vpid
+ 
+ # should heavily decrease the elapsed time copying the environment
+ # for a lot of processors (but not yet very qualified, may fail)
 @@ -248,10 +248,10 @@
  
  #-------------------------------------------------------------------------------
@@ -177,8 +186,8 @@
  # [OPTIONNAL]
 Index: astk-1.10.0/ASTK_SERV/etc/aster
 ===================================================================
---- astk-1.10.0.orig/ASTK_SERV/etc/aster	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/aster	2011-12-16 11:18:47.000000000 +0100
+--- astk-1.10.0.orig/ASTK_SERV/etc/aster	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/etc/aster	2011-12-16 13:18:53.000000000 +0100
 @@ -3,7 +3,7 @@
  # examples : NEW11, /usr/lib/codeaster/NEW11
  
@@ -190,8 +199,8 @@
  # DO NOT EDIT FOLLOWING LINE !
 Index: astk-1.10.0/ASTK_SERV/share/codeaster/asrun/data/mpirun_template
 ===================================================================
---- astk-1.10.0.orig/ASTK_SERV/share/codeaster/asrun/data/mpirun_template	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/share/codeaster/asrun/data/mpirun_template	2011-12-16 11:18:47.000000000 +0100
+--- astk-1.10.0.orig/ASTK_SERV/share/codeaster/asrun/data/mpirun_template	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/share/codeaster/asrun/data/mpirun_template	2011-12-16 13:18:53.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!?SHELL_EXECUTION?
 +#!/bin/bash
@@ -200,8 +209,8 @@
  
 Index: astk-1.10.0/ASTK_CLIENT/bin/bsf
 ===================================================================
---- astk-1.10.0.orig/ASTK_CLIENT/bin/bsf	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_CLIENT/bin/bsf	2011-12-16 11:18:47.000000000 +0100
+--- astk-1.10.0.orig/ASTK_CLIENT/bin/bsf	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_CLIENT/bin/bsf	2011-12-16 13:18:53.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!?SHELL_EXECUTION?
 +#!/bin/bash
@@ -241,8 +250,8 @@
  
 Index: astk-1.10.0/ASTK_SERV/etc/profile.sh
 ===================================================================
---- astk-1.10.0.orig/ASTK_SERV/etc/profile.sh	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/profile.sh	2011-12-16 11:18:47.000000000 +0100
+--- astk-1.10.0.orig/ASTK_SERV/etc/profile.sh	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/etc/profile.sh	2011-12-16 13:18:53.000000000 +0100
 @@ -14,39 +14,28 @@
  
  if [ -z "$ASTER_ROOT" ]; then
@@ -296,8 +305,8 @@
  # source local profile
 Index: astk-1.10.0/ASTK_SERV/bin/as_run
 ===================================================================
---- astk-1.10.0.orig/ASTK_SERV/bin/as_run	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/bin/as_run	2011-12-16 11:18:47.000000000 +0100
+--- astk-1.10.0.orig/ASTK_SERV/bin/as_run	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/bin/as_run	2011-12-16 13:18:53.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!?SHELL_EXECUTION?
 +#!/bin/bash
@@ -330,8 +339,8 @@
  if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
 Index: astk-1.10.0/ASTK_SERV/bin/auto_update.cron
 ===================================================================
---- astk-1.10.0.orig/ASTK_SERV/bin/auto_update.cron	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/bin/auto_update.cron	2011-12-16 11:18:47.000000000 +0100
+--- astk-1.10.0.orig/ASTK_SERV/bin/auto_update.cron	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/bin/auto_update.cron	2011-12-16 13:18:53.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!?SHELL_EXECUTION?
 +#!/bin/bash
@@ -376,8 +385,8 @@
                                                  >> ${LOG_FILE} 2>> ${ERR_FILE}
 Index: astk-1.10.0/ASTK_SERV/bin/parallel_cp
 ===================================================================
---- astk-1.10.0.orig/ASTK_SERV/bin/parallel_cp	2011-12-16 10:18:06.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/bin/parallel_cp	2011-12-16 11:18:47.000000000 +0100
+--- astk-1.10.0.orig/ASTK_SERV/bin/parallel_cp	2011-12-16 11:20:55.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/bin/parallel_cp	2011-12-16 13:18:53.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!?SHELL_EXECUTION?
 +#!/bin/bash

More information about the debian-science-commits mailing list