[Yt-svn] yt-commit r1096 - in trunk/yt: fido lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Thu Jan  8 13:35:37 2009
New Revision: 1096
URL: http://yt.spacepope.org/changeset/1096

Log:
More fixes for parallel computation with parameter file storage.  I stupidly
set the parameter wrong in ParallelTools.py.  I think there's one more issue to
deal with.



Modified:
   trunk/yt/fido/ParameterFileStorage.py
   trunk/yt/lagos/ParallelTools.py

Modified: trunk/yt/fido/ParameterFileStorage.py
==============================================================================
--- trunk/yt/fido/ParameterFileStorage.py	(original)
+++ trunk/yt/fido/ParameterFileStorage.py	Thu Jan  8 13:35:37 2009
@@ -43,8 +43,7 @@
         return self
 
     def __init__(self, in_memory = False):
-        self._do_shelve = ytcfg.getboolean("yt", "StoreParameterFiles")
-        only_on_root(self.__init_shelf)
+        self.__init_shelf()
 
     def _get_db_name(self):
         if not os.access(os.path.expanduser("~/"), os.W_OK):
@@ -127,15 +126,14 @@
         shelve.open(self._get_db_name(), 'c', protocol=-1)
 
     def __setitem__(self, key, val):
-        only_on_root(self.__store_item, key, val)
+        self.__store_item(key, val)
 
     def __delitem__(self, key):
-        only_on_root(self.__delete_item, key)
+        self.__delete_item(key)
 
     def keys(self):
-        my_shelf = shelve.open(self._get_db_name(), flag='r', protocol=-1)
+        my_shelf = self.__read_only()
         return my_shelf.keys()
 
 class ObjectStorage(object):
     pass
-        

Modified: trunk/yt/lagos/ParallelTools.py
==============================================================================
--- trunk/yt/lagos/ParallelTools.py	(original)
+++ trunk/yt/lagos/ParallelTools.py	Thu Jan  8 13:35:37 2009
@@ -38,7 +38,7 @@
         ytcfg["yt","__parallel_rank"] = str(MPI.COMM_WORLD.rank)
         ytcfg["yt","__parallel_size"] = str(MPI.COMM_WORLD.size)
         ytcfg["yt","__parallel"] = "True"
-        ytcfg["yt","StoreParameterFiles"] = "True"
+        ytcfg["yt","StoreParameterFiles"] = "False"
         # Now let's make sure we have the right options set.
         if MPI.COMM_WORLD.rank > 0:
             if ytcfg.getboolean("lagos","serialize"):