From 82050710682134845cf03dd67f85a91550811769 Mon Sep 17 00:00:00 2001 From: Wei Wu Date: Wed, 13 Sep 2017 16:05:43 -0600 Subject: [PATCH] fix rebase --- runtime/legion/legion_c.cc | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/runtime/legion/legion_c.cc b/runtime/legion/legion_c.cc index 07c992947c..711ebf9c2d 100644 --- a/runtime/legion/legion_c.cc +++ b/runtime/legion/legion_c.cc @@ -3912,17 +3912,7 @@ legion_runtime_start(int argc, char **argv, bool background /* = false */) { -/* int argc_tmp = 3; - char *argv1 = "/home/wwu/legion-up/tutorial-c/00_hello_world/./hello_world"; - char *argv2 = "-ll:cpu"; - char *argv3 = "7"; - char **argv_tmp = (char**)malloc(sizeof(char*)); - argv_tmp[0] = argv1; - argv_tmp[1] = argv2; - argv_tmp[2] = argv3; - return Runtime::start(argc_tmp, argv_tmp, background); - */ - return Runtime::start(argc, argv, background); + return Runtime::start(argc, argv, background); } void @@ -5077,7 +5067,6 @@ legion_mapper_runtime_find_physical_instance_layout_constraint_id( return ret; } -<<<<<<< ee52a4e921fec38a9b540a0443422fceeb7905c7 bool legion_mapper_runtime_acquire_instance( legion_mapper_runtime_t runtime_, @@ -5139,4 +5128,4 @@ legion_convert_1d_to_2d_column_major( for (i = 0; i < num_columns; i++) { dst[i] = (void*)((unsigned char*)src + offset.offset * i); } -} +} \ No newline at end of file