r44184 - /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 10:52:20 UTC 2011
Author: trophime-guest
Date: Fri Dec 16 10:52:20 2011
New Revision: 44184
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44184
Log:
fix mpi_hostfile issue
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=44184&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/config.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/config.patch Fri Dec 16 10:52:20 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-13 11:45:33.000000000 +0100
-+++ astk-1.10.0/ASTK_CLIENT/etc/astkrc/outils 2011-12-13 11:48:35.000000000 +0100
+--- 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
@@ -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-13 11:45:33.000000000 +0100
-+++ astk-1.10.0/ASTK_CLIENT/bin/astk 2011-12-13 11:51:04.000000000 +0100
+--- 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
@@ -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-13 11:45:33.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/profile.csh 2011-12-13 12:04:41.000000000 +0100
+--- 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
@@ -12,39 +12,26 @@
setenv DEFINE_PROFILE_ASRUN done
#--- ifndef DEFINE_PROFILE_ASRUN -----------------------------------------------
@@ -127,9 +127,9 @@
# source local profile
Index: astk-1.10.0/ASTK_SERV/etc/asrun
===================================================================
---- astk-1.10.0.orig/ASTK_SERV/etc/asrun 2011-12-13 11:45:33.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/asrun 2011-12-13 11:48:35.000000000 +0100
-@@ -212,7 +212,7 @@
+--- 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
+@@ -212,10 +212,10 @@
# mpirun
# available arguments are : mpi_hostfile, mpi_nbnoeud, mpi_nbcpu
# (use Python string formatting style)
@@ -137,7 +137,11 @@
+mpirun_cmd : mpirun -np %(mpi_nbcpu)s --hostfile %(mpi_hostfile)s %(program)s
# file which contains list of hosts (REQUIRED even if it is not used in mpirun_cmd)
- mpi_hostfile : $ASTER_ETC/codeaster/mpi_hostfile
+-mpi_hostfile : $ASTER_ETC/codeaster/mpi_hostfile
++mpi_hostfile : /etc/codeaster/aster-mpihosts
+
+ # command called to initialize MPI environment (for example for mpich2)
+ #mpi_ini : mpdboot --totalnum=%(mpi_nbnoeud)s --file=%(mpi_hostfile)s ; sleep 10
@@ -248,10 +248,10 @@
#-------------------------------------------------------------------------------
@@ -173,8 +177,8 @@
# [OPTIONNAL]
Index: astk-1.10.0/ASTK_SERV/etc/aster
===================================================================
---- astk-1.10.0.orig/ASTK_SERV/etc/aster 2011-12-13 11:45:33.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/aster 2011-12-13 11:48:35.000000000 +0100
+--- 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
@@ -3,7 +3,7 @@
# examples : NEW11, /usr/lib/codeaster/NEW11
@@ -186,8 +190,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-13 11:45:33.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/share/codeaster/asrun/data/mpirun_template 2011-12-13 11:48:35.000000000 +0100
+--- 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
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
@@ -196,8 +200,8 @@
Index: astk-1.10.0/ASTK_CLIENT/bin/bsf
===================================================================
---- astk-1.10.0.orig/ASTK_CLIENT/bin/bsf 2011-12-13 11:45:33.000000000 +0100
-+++ astk-1.10.0/ASTK_CLIENT/bin/bsf 2011-12-13 11:50:56.000000000 +0100
+--- 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
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
@@ -237,8 +241,8 @@
Index: astk-1.10.0/ASTK_SERV/etc/profile.sh
===================================================================
---- astk-1.10.0.orig/ASTK_SERV/etc/profile.sh 2011-12-13 11:45:33.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/profile.sh 2011-12-13 11:48:35.000000000 +0100
+--- 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
@@ -14,39 +14,28 @@
if [ -z "$ASTER_ROOT" ]; then
@@ -292,8 +296,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-06-15 17:36:38.000000000 +0200
-+++ astk-1.10.0/ASTK_SERV/bin/as_run 2011-12-13 11:59:53.000000000 +0100
+--- 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
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
@@ -326,8 +330,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-06-15 17:36:38.000000000 +0200
-+++ astk-1.10.0/ASTK_SERV/bin/auto_update.cron 2011-12-13 12:02:18.000000000 +0100
+--- 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
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
@@ -372,8 +376,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-06-15 17:36:38.000000000 +0200
-+++ astk-1.10.0/ASTK_SERV/bin/parallel_cp 2011-12-13 12:00:33.000000000 +0100
+--- 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
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
More information about the debian-science-commits
mailing list