Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Vec's state counter for MixedDat #670

Merged
merged 3 commits into from
Jul 27, 2022
Merged

Fix Vec's state counter for MixedDat #670

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2103cf
Increase state counter inside vec_context
nbouziani Jul 24, 2022
e09cd25
Update MixedDat._vec counter via Vec.array
nbouziani Jul 26, 2022
cb3ae29
Clean-up
nbouziani Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pyop2/types/dat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,12 +1015,13 @@ def vec_context(self, access):
# values
if access is not Access.WRITE:
offset = 0
array = self._vec.array
for d in self:
with d.vec_ro as v:
size = v.local_size
array[offset:offset+size] = v.array_r[:]
offset += size
with self._vec as array:
for d in self:
with d.vec_ro as v:
size = v.local_size
array[offset:offset+size] = v.array_r[:]
offset += size

dham marked this conversation as resolved.
Show resolved Hide resolved
yield self._vec
if access is not Access.READ:
# Reverse scatter to get the values back to their original locations
Expand Down