Author: bugman
Date: Wed Oct 15 23:10:22 2008
New Revision: 7725
URL: http://svn.gna.org/viewcvs/relax?rev=7725&view=rev
Log:
Manually ported r3252 from the multi_processor branch.
The command used was:
svn merge -r3251:3252
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3252 | varioustoxins | 2007-03-30 09:57:54 +0200 (Fri, 30 Mar 2007) | 2
lines
Changed paths:
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/processor.py
M /branches/multi_processor/multi/uni_processor.py
applied GPL v2 licenses
.....
Modified:
branches/multi_processor_merge/multi/commands.py
branches/multi_processor_merge/multi/mpi4py_processor.py
branches/multi_processor_merge/multi/processor.py
branches/multi_processor_merge/multi/uni_processor.py
Modified: branches/multi_processor_merge/multi/commands.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/commands.py?rev=7725&r1=7724&r2=7725&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/commands.py (original)
+++ branches/multi_processor_merge/multi/commands.py Wed Oct 15 23:10:22 2008
@@ -1,3 +1,26 @@
+################################################################################
+#
#
+# Copyright (C) 2007 Gary S Thompson (see
https://gna.org/users/varioustoxins #
+# for contact details)
#
+#
#
+#
#
+# This file is part of the program relax.
#
+#
#
+# relax is free software; you can redistribute it and/or modify
#
+# it under the terms of the GNU General Public License as published by
#
+# the Free Software Foundation; either version 2 of the License, or
#
+# (at your option) any later version.
#
+#
#
+# relax is distributed in the hope that it will be useful,
#
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
+# GNU General Public License for more details.
#
+#
#
+# You should have received a copy of the GNU General Public License
#
+# along with relax; if not, write to the Free Software
#
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+#
#
+################################################################################
from multi.processor import Memo,Slave_command
from multi.processor import Result_command,Result_string,NULL_RESULT
Modified: branches/multi_processor_merge/multi/mpi4py_processor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/mpi4py_processor.py?rev=7725&r1=7724&r2=7725&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/mpi4py_processor.py (original)
+++ branches/multi_processor_merge/multi/mpi4py_processor.py Wed Oct 15
23:10:22 2008
@@ -1,4 +1,26 @@
-#!/usr/bin/env python
+################################################################################
+#
#
+# Copyright (C) 2007 Gary S Thompson (see
https://gna.org/users/varioustoxins #
+# for contact details)
#
+#
#
+#
#
+# This file is part of the program relax.
#
+#
#
+# relax is free software; you can redistribute it and/or modify
#
+# it under the terms of the GNU General Public License as published by
#
+# the Free Software Foundation; either version 2 of the License, or
#
+# (at your option) any later version.
#
+#
#
+# relax is distributed in the hope that it will be useful,
#
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
+# GNU General Public License for more details.
#
+#
#
+# You should have received a copy of the GNU General Public License
#
+# along with relax; if not, write to the Free Software
#
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+#
#
+################################################################################
#TODO clone communicators & resize
import sys
@@ -207,8 +229,3 @@
-
-if __name__ == '__main__':
- test = Mpi4py_processor(None)
- print test
- print MPI.rank
Modified: branches/multi_processor_merge/multi/processor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/processor.py?rev=7725&r1=7724&r2=7725&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/processor.py (original)
+++ branches/multi_processor_merge/multi/processor.py Wed Oct 15 23:10:22 2008
@@ -1,3 +1,27 @@
+################################################################################
+#
#
+# Copyright (C) 2007 Gary S Thompson (see
https://gna.org/users/varioustoxins #
+# for contact details)
#
+#
#
+#
#
+# This file is part of the program relax.
#
+#
#
+# relax is free software; you can redistribute it and/or modify
#
+# it under the terms of the GNU General Public License as published by
#
+# the Free Software Foundation; either version 2 of the License, or
#
+# (at your option) any later version.
#
+#
#
+# relax is distributed in the hope that it will be useful,
#
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
+# GNU General Public License for more details.
#
+#
#
+# You should have received a copy of the GNU General Public License
#
+# along with relax; if not, write to the Free Software
#
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+#
#
+################################################################################
+
class Result(object):
def __init__(self,completed):
self.completed=completed
Modified: branches/multi_processor_merge/multi/uni_processor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/uni_processor.py?rev=7725&r1=7724&r2=7725&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/uni_processor.py (original)
+++ branches/multi_processor_merge/multi/uni_processor.py Wed Oct 15 23:10:22
2008
@@ -1,5 +1,26 @@
-#!/usr/bin/env python
-
+################################################################################
+#
#
+# Copyright (C) 2007 Gary S Thompson (see
https://gna.org/users/varioustoxins #
+# for contact details)
#
+#
#
+#
#
+# This file is part of the program relax.
#
+#
#
+# relax is free software; you can redistribute it and/or modify
#
+# it under the terms of the GNU General Public License as published by
#
+# the Free Software Foundation; either version 2 of the License, or
#
+# (at your option) any later version.
#
+#
#
+# relax is distributed in the hope that it will be useful,
#
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
+# GNU General Public License for more details.
#
+#
#
+# You should have received a copy of the GNU General Public License
#
+# along with relax; if not, write to the Free Software
#
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+#
#
+################################################################################
import threading, Queue
import sys
import multi
r7725 - in /branches/multi_processor_merge/multi: commands.py mpi4py_processor.py processor.py uni_processor.py