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
Show file tree
Hide file tree
Changes from 10 commits
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
26 changes: 25 additions & 1 deletion devito/data/allocators.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import os
import sys

import cupy as cp
import numpy as np
import ctypes
from ctypes.util import find_library
Expand All @@ -15,7 +16,7 @@

__all__ = ['ALLOC_FLAT', 'ALLOC_NUMA_LOCAL', 'ALLOC_NUMA_ANY',
'ALLOC_KNL_MCDRAM', 'ALLOC_KNL_DRAM', 'ALLOC_GUARD',
'default_allocator']
'ALLOC_CUPY', 'default_allocator']


class MemoryAllocator(object):
Expand Down Expand Up @@ -317,6 +318,28 @@ def put_local(self):
return self._node == 'local'


class CupyAllocator(MemoryAllocator):

"""
Memory allocator based on Unified Memory concept. The allocation is made using Cupy.
"""

def __init__(self):
self.mempool = cp.cuda.MemoryPool(cp.cuda.malloc_managed)
cp.cuda.set_allocator(self.mempool.malloc)

@classmethod
def initialize(cls):
pass

def _alloc_C_libcall(self, size, ctype):
mem_obj = cp.zeros(size, dtype=cp.float64)
return mem_obj.data.ptr, (mem_obj,)

def free(self, _):
self.mempool.free_all_blocks()


class ExternalAllocator(MemoryAllocator):

"""
Expand Down Expand Up @@ -373,6 +396,7 @@ def alloc(self, shape, dtype):
ALLOC_KNL_MCDRAM = NumaAllocator(1)
ALLOC_NUMA_ANY = NumaAllocator('any')
ALLOC_NUMA_LOCAL = NumaAllocator('local')
ALLOC_CUPY = CupyAllocator()

custom_allocators = {}
"""User-defined allocators."""
Expand Down
23 changes: 22 additions & 1 deletion tests/test_data.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import pytest
import numpy as np
import cupy as cp
Copy link
Contributor

Choose a reason for hiding this comment

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

Need to be added somehow to the test requirements and this step should be decoratred with a skipif(device)


from devito import (Grid, Function, TimeFunction, SparseTimeFunction, Dimension, # noqa
Eq, Operator, ALLOC_GUARD, ALLOC_FLAT, configuration, switchconfig)
Eq, Operator, ALLOC_GUARD, ALLOC_FLAT, ALLOC_CUPY, configuration, switchconfig)
from devito.data import LEFT, RIGHT, Decomposition, loc_data_idx, convert_index
from devito.tools import as_tuple
from devito.types import Scalar
Expand Down Expand Up @@ -206,6 +207,26 @@ 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):
Copy link
Contributor

Choose a reason for hiding this comment

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

There's a test_external_allocator somewhere in this file. Could you move that test, and this test, within a new class, say TestAllocators?

Copy link
Author

Choose a reason for hiding this comment

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

I updated the PR with this change

"""
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):
"""
Expand Down