merge

ut-parla · Nov 10, 2023 · 9f0b7e2 · 9f0b7e2
1 parent 9bdc3fa
commit 9f0b7e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/src/python/parla/cython/CMakeLists.txt b/src/python/parla/cython/CMakeLists.txt
@@ -4,6 +4,7 @@ endif()
 
 set(PYX_FILES
     cyparray_state.pyx
+    mm.pyx
     cyparray.pyx
     core.pyx
     stream_pool.pyx
@@ -15,8 +16,9 @@ set(PYX_FILES
 
 set(FILE_MAP
     "cyparray_state.pxd"
+    "mm.pxd"
     "cyparray.pxd cyparray_state.pxd"
-    "core.pxd device.pxd device_manager.pxd resources.pxd cyparray.pxd"
+    "core.pxd device.pxd device_manager.pxd resources.pxd cyparray.pxd mm.pxd"
     "stream_pool.pxd"
     "device.pxd"
     "device_manager.pxd device.pxd stream_pool.pxd"

diff --git a/src/python/parla/cython/core.pyx b/src/python/parla/cython/core.pyx
@@ -656,10 +656,6 @@ cdef class PyInnerScheduler:
         with nogil:
             c_self.task_cleanup_and_wait_for_task(c_worker, c_task, state)
 
-    cpdef get_num_active_tasks(self):
-        cdef InnerScheduler* c_self = self.inner_scheduler
-        return c_self.get_num_active_tasks()
-
     cpdef increase_num_active_tasks(self):
         cdef InnerScheduler* c_self = self.inner_scheduler
         c_self.increase_num_active_tasks()

diff --git a/src/python/parla/cython/tasks.pyx b/src/python/parla/cython/tasks.pyx
@@ -12,7 +12,7 @@ import functools
 from ..utility.threads import Propagate
 
 from .core import PyInnerTask, CyTaskList, PyTaskSpace, PyTaskBarrier, DataMovementTaskAttributes
-from .device import PyDevice, PyCPUDevice, PyGPUDevice, DeviceResourceRequirement
+from .device import PyDevice, PyCPUDevice, PyGPUDevice, DeviceResourceRequirement, PyDeviceType
 from .cyparray import CyPArray
 
 from ..common.globals import _Locals as Locals
@@ -23,13 +23,6 @@ from ..common.globals import SynchronizationType as SyncType
 from ..common.parray.core import PArray
 from ..common.globals import _global_data_tasks
 
-
-PyDevice = device.PyDevice
-PyCUDADevice = device.PyCUDADevice
-PyCPUDevice = device.PyCPUDevice
-PyArchitecture = device.PyArchitecture
-PyCUDAArchitecture = device.PyCUDAArchitecture
-
 DeviceType = PyDeviceType
 
 from abc import abstractmethod, ABCMeta