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.

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

compiler: Unified Memory Allocator #2023

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0befd4e
dsl: Creates CupyAllocator class
Oct 19, 2022
db87362
misc: Fix indentation
Oct 19, 2022
ef1f368
dsl: Fix del method allowing the dealocation of the Cupy data
Oct 19, 2022
ca806b3
dsl: Changes that exclude copyin and copyout pragmas from source code…
Oct 19, 2022
50cd534
dsl: Remove the part of the code that makes the source code be genera…
Oct 26, 2022
539254c
dsl: Change from CUPY_ALLOC to ALLOC_CUPY
Oct 26, 2022
ddb5991
dsl: Update CupyAllocator's mem_free_args as a tuple, allowing remova…
Oct 27, 2022
d337ac8
misc: Fix indentation and comments
Oct 27, 2022
6511b06
dsl: Update free method inside CupyAllocator
Nov 4, 2022
ce12f56
tests: Add test to unified memory allocator
Feb 7, 2023
3ce03ba
dsl: Add conditional import for Cupy module
Mar 8, 2023
f4231e2
test: Update tests adding a class responsible for test external and …
Mar 8, 2023
c4444a1
dsl: Changing import cupy from init() to initialize()
Apr 13, 2023
f3f90c1
dsl: Update to fix the problem when ALLOC_CUPY tries to alloc data w…
Apr 24, 2023
41838ae
dsl: Update CupyAllocator to run at multiples nodes using MPI
May 11, 2023
241e444
dsl: Fix CupyAllocator to properly support MPI execution.
May 17, 2023
e724ffb
misc: Fix indentation
May 17, 2023
9379b31
misc: Removes unwanted leftover comments.
Mar 8, 2024
7814a46
dsl: Update the way MPI is imported at CupyAllocator
Mar 8, 2024
6df7a06
misc: Add explanatory comment
Mar 8, 2024
76dcdb1
dsl: Update "except" to "except ImportError". Other errors should be …
Mar 8, 2024
6ad6611
tests: Update memory allocator test to use skipif('nodevice')
Mar 8, 2024
92ba35c
dsl: Update of the way data type allocation is defined
Mar 18, 2024
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
Prev Previous commit
Next Next commit
test: Update tests adding a class responsible for test external and u…
…ma allocators
Gustavo Coelho committed Mar 8, 2023
commit f4231e24e7642ad3d10d7a8698408f0e93e7c0b4
91 changes: 46 additions & 45 deletions tests/test_data.py
Original file line number Diff line number Diff line change
@@ -207,26 +207,6 @@ def test_indexing_into_sparse(self):
sf.data[1:-1, 0] = np.arange(8)
assert np.all(sf.data[1:-1, 0] == np.arange(8))

def test_uma_allocation(self):
"""
Test Unified Memory allocation.
"""
nt = 5
grid = Grid(shape=(4, 4, 4))

u = Function(name='u', grid=grid, allocator=ALLOC_CUPY )
u.data[:] = 5
address = u.data.ctypes.data
pointerAttr = cp.cuda.runtime.pointerGetAttributes(address)
assert pointerAttr.devicePointer == pointerAttr.hostPointer

v = TimeFunction(name='v', grid=grid, save=nt, allocator=ALLOC_CUPY )
v.data[:] = 5
address = v.data.ctypes.data
pointerAttr = cp.cuda.runtime.pointerGetAttributes(address)
assert pointerAttr.devicePointer == pointerAttr.hostPointer



class TestLocDataIDX(object):
"""
@@ -1494,6 +1474,52 @@ def test_gather_time_function(self):
assert ans == np.array(None)


class TestAllocators(object):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move to test_gpu_common as TestCupyAllocator with an nividia device skip so it's added to GPU CI


def test_uma_allocation(self):
"""
Test Unified Memory allocation.
"""
nt = 5
grid = Grid(shape=(4, 4, 4))

u = Function(name='u', grid=grid, allocator=ALLOC_CUPY )
u.data[:] = 5
address = u.data.ctypes.data
pointerAttr = cp.cuda.runtime.pointerGetAttributes(address)
assert pointerAttr.devicePointer == pointerAttr.hostPointer

v = TimeFunction(name='v', grid=grid, save=nt, allocator=ALLOC_CUPY )
v.data[:] = 5
address = v.data.ctypes.data
pointerAttr = cp.cuda.runtime.pointerGetAttributes(address)
assert pointerAttr.devicePointer == pointerAttr.hostPointer

def test_external_allocator(self):
shape = (2, 2)
space_order = 0
numpy_array = np.ones(shape, dtype=np.float32)
g = Grid(shape)
f = Function(name='f', space_order=space_order, grid=g,
allocator=ExternalAllocator(numpy_array), initializer=lambda x: None)

# Ensure the two arrays have the same value
assert(np.array_equal(f.data, numpy_array))

# Ensure the original numpy array is unchanged
assert(np.array_equal(numpy_array, np.ones(shape, dtype=np.float32)))

# Change the underlying numpy array
numpy_array[:] = 3.
# Ensure the function.data changes too
assert(np.array_equal(f.data, numpy_array))

# Change the function.data
f.data[:] = 4.
# Ensure the underlying numpy array changes too
assert(np.array_equal(f.data, numpy_array))


def test_scalar_arg_substitution():
"""
Tests the relaxed (compared to other devito sympy subclasses)
@@ -1540,31 +1566,6 @@ def test_numpy_c_contiguous():
assert(u._data_allocated.flags.c_contiguous)


def test_external_allocator():
shape = (2, 2)
space_order = 0
numpy_array = np.ones(shape, dtype=np.float32)
g = Grid(shape)
f = Function(name='f', space_order=space_order, grid=g,
allocator=ExternalAllocator(numpy_array), initializer=lambda x: None)

# Ensure the two arrays have the same value
assert(np.array_equal(f.data, numpy_array))

# Ensure the original numpy array is unchanged
assert(np.array_equal(numpy_array, np.ones(shape, dtype=np.float32)))

# Change the underlying numpy array
numpy_array[:] = 3.
# Ensure the function.data changes too
assert(np.array_equal(f.data, numpy_array))

# Change the function.data
f.data[:] = 4.
# Ensure the underlying numpy array changes too
assert(np.array_equal(f.data, numpy_array))


def test_boolean_masking_array():
"""
Test truth value of array, raised in Python 3.9 (MFE for issue #1788)