Fix PersistentNdarrayLoad problem restoring same object twice

theano/compile/sharedvalue.py

@@ -76,7 +76,7 @@ class SharedVariable(Variable):
                 raise TypeError('value and strict are ignored if you pass '
                                 'a container here')
         else:
-            if container is not None:
+            if value is not None:
                 raise TypeError('Error to specify both value and container')
             self.container = Container(
                 self,

theano/misc/pkl_utils.py

@@ -275,10 +275,14 @@ class PersistentNdarrayLoad(object):
     """
     def __init__(self, zip_file):
         self.zip_file = zip_file
+        self.cache = {}
 
     def __call__(self, persid):
         array_type, name = persid.split('.')
 
+        if name in self.cache:
+            return self.cache[name]
+        ret = None
         array = numpy.lib.format.read_array(self.zip_file.open(name))
         if array_type == 'cuda_ndarray':
             if config.experimental.unpickle_gpu_on_cpu:
@@ -286,14 +290,16 @@ class PersistentNdarrayLoad(object):
                 warnings.warn("config.experimental.unpickle_gpu_on_cpu is set "
                               "to True. Unpickling CudaNdarray as "
                               "numpy.ndarray")
-                return array
+                ret = array
             elif cuda_ndarray:
-                return cuda_ndarray.cuda_ndarray.CudaNdarray(array)
+                ret = cuda_ndarray.cuda_ndarray.CudaNdarray(array)
             else:
                 raise ImportError("Cuda not found. Cannot unpickle "
                                   "CudaNdarray")
         else:
-            return array
+            ret = array
+        self.cache[name] = ret
+        return ret
 
 
 def dump(obj, file_handler, protocol=DEFAULT_PROTOCOL,