commit f5bd6fd24d04c40a6bfd06438c14011a51ca68db
author Ben Vanik <benvanik@google.com> Wed Aug 05 21:14:57 2020 -0700
committer Ben Vanik <benvanik@google.com> Mon Aug 17 09:42:22 2020 -0700
tree dd5fef9e342281a4db13f7b236c7ba82dc6f5746
parent 3bf301e4091725e8296a1f00a198c448808f6711

Changing IREE_ALLOCATOR_* macros to static inline functions.

bindings/python/pyiree/rt/vm.cc

diff --git a/bindings/python/pyiree/rt/vm.cc b/bindings/python/pyiree/rt/vm.cc
index 9892814..5cd4cbd 100644
--- a/bindings/python/pyiree/rt/vm.cc
+++ b/bindings/python/pyiree/rt/vm.cc
@@ -34,23 +34,24 @@
 
 VmModule CreateHalModule(HalDevice* device) {
   iree_vm_module_t* module;
-  CheckApiStatus(
-      iree_hal_module_create(device->raw_ptr(), IREE_ALLOCATOR_SYSTEM, &module),
-      "Error creating hal module");
+  CheckApiStatus(iree_hal_module_create(device->raw_ptr(),
+                                        iree_allocator_system(), &module),
+                 "Error creating hal module");
   return VmModule::CreateRetained(module);
 }
 
 VmModule CreateStringsModule() {
   iree_vm_module_t* module;
-  CheckApiStatus(iree_strings_module_create(IREE_ALLOCATOR_SYSTEM, &module),
+  CheckApiStatus(iree_strings_module_create(iree_allocator_system(), &module),
                  "Error creating trings module");
   return VmModule::CreateRetained(module);
 }
 
 VmModule CreateTensorListModule() {
   iree_vm_module_t* module;
-  CheckApiStatus(iree_tensorlist_module_create(IREE_ALLOCATOR_SYSTEM, &module),
-                 "Error creating tensorlist module");
+  CheckApiStatus(
+      iree_tensorlist_module_create(iree_allocator_system(), &module),
+      "Error creating tensorlist module");
   return VmModule::CreateRetained(module);
 }
 
@@ -62,7 +63,7 @@
 
 VmInstance VmInstance::Create() {
   iree_vm_instance_t* instance;
-  auto status = iree_vm_instance_create(IREE_ALLOCATOR_SYSTEM, &instance);
+  auto status = iree_vm_instance_create(iree_allocator_system(), &instance);
   CheckApiStatus(status, "Error creating instance");
   return VmInstance::CreateRetained(instance);
 }
@@ -77,7 +78,7 @@
   if (!modules) {
     // Simple create with open allowed modules.
     auto status = iree_vm_context_create(instance->raw_ptr(),
-                                         IREE_ALLOCATOR_SYSTEM, &context);
+                                         iree_allocator_system(), &context);
     CheckApiStatus(status, "Error creating vm context");
   } else {
     // Closed set of modules.
@@ -88,7 +89,7 @@
     }
     auto status = iree_vm_context_create_with_modules(
         instance->raw_ptr(), module_handles.data(), module_handles.size(),
-        IREE_ALLOCATOR_SYSTEM, &context);
+        iree_allocator_system(), &context);
     CheckApiStatus(status, "Error creating vm context with modules");
   }
 
@@ -140,7 +141,7 @@
 void VmContext::Invoke(iree_vm_function_t f, VmVariantList& inputs,
                        VmVariantList& outputs) {
   CheckApiStatus(iree_vm_invoke(raw_ptr(), f, nullptr, inputs.raw_ptr(),
-                                outputs.raw_ptr(), IREE_ALLOCATOR_SYSTEM),
+                                outputs.raw_ptr(), iree_allocator_system()),
                  "Error invoking function");
 }
 
@@ -165,7 +166,7 @@
   auto status = iree_vm_bytecode_module_create(
       {static_cast<const uint8_t*>(buffer_info.ptr),
        static_cast<iree_host_size_t>(buffer_info.size)},
-      deallocator, IREE_ALLOCATOR_SYSTEM, &module);
+      deallocator, iree_allocator_system(), &module);
   if (!iree_status_is_ok(status)) {
     deallocator.free(raw_ptr, nullptr);
   }