Object versioning for DataCarrier object

pyop2/base.py

@@ -1250,6 +1250,9 @@ class DataCarrier(object):
     (:class:`Global`), rank 1 (:class:`Dat`), or rank 2
     (:class:`Mat`)"""
 
+    def __init__(self):
+        self.dat_version = 0
+
     @cached_property
     def dtype(self):
         """The Python type of the data."""
@@ -1366,6 +1369,7 @@ def __init__(self, dataset, data=None, dtype=None, name=None, uid=None):
             # a dataset dimension of 1.
             dataset = dataset ** 1
         self._shape = (dataset.total_size,) + (() if dataset.cdim == 1 else dataset.dim)
+        DataCarrier.__init__(self)
         _EmptyDataMixin.__init__(self, data, dtype, self._shape)
 
         self._dataset = dataset
@@ -2267,6 +2271,7 @@ def __init__(self, dim, data=None, dtype=None, name=None, comm=None):
             return
         self._dim = as_tuple(dim, int)
         self._cdim = np.prod(self._dim).item()
+        DataCarrier.__init__(self)
         _EmptyDataMixin.__init__(self, data, dtype, self._dim)
         self._buf = np.empty(self.shape, dtype=self.dtype)
         self._name = name or "global_%d" % Global._globalcount
@@ -2327,6 +2332,7 @@ def shape(self):
     @property
     def data(self):
         """Data array."""
+        self.dat_version += 1
         if len(self._data) == 0:
             raise RuntimeError("Illegal access: No data associated with this Global!")
         return self._data
@@ -2338,12 +2344,13 @@ def dtype(self):
     @property
     def data_ro(self):
         """Data array."""
-        view = self.data.view()
+        view = self._data.view()
         view.setflags(write=False)
         return view
 
     @data.setter
     def data(self, value):
+        self.dat_version += 1
         self._data[:] = verify_reshape(value, self.dtype, self.dim)
 
     @property
@@ -2375,6 +2382,7 @@ def copy(self, other, subset=None):
 
     @collective
     def zero(self):
+        self.dat_version += 1
         self._data[...] = 0
 
     @collective
@@ -3112,6 +3120,7 @@ def pack(self):
     @validate_type(('sparsity', Sparsity, SparsityTypeError),
                    ('name', str, NameTypeError))
     def __init__(self, sparsity, dtype=None, name=None):
+        DataCarrier.__init__(self)
         self._sparsity = sparsity
         self.lcomm = sparsity.lcomm
         self.rcomm = sparsity.rcomm

test/unit/test_globals.py

@@ -44,3 +44,35 @@ def test_global_operations():
     assert (g1 * g2).data == 10.
     g1 *= g2
     assert g1.data == 10.
+
+
+def test_global_dat_version():
+    g1 = op2.Global(1, data=1.)
+    g2 = op2.Global(1, data=2.)
+
+    assert g1.dat_version == 0
+    assert g2.dat_version == 0
+
+    # Access data property
+    d1 = g1.data
+
+    assert g1.dat_version == 1
+    assert g2.dat_version == 0
+
+    # Access data property
+    g2.data[:] += 1
+
+    assert g1.dat_version == 1
+    assert g2.dat_version == 1
+
+    # Access zero property
+    g1.zero()
+
+    assert g1.dat_version == 2
+    assert g2.dat_version == 1
+
+    # Access data setter
+    g2.data = d1
+
+    assert g1.dat_version == 2
+    assert g2.dat_version == 2