From ea143b1a0c95b79b7b384a76c0c15a46a7970a66 Mon Sep 17 00:00:00 2001 From: Seema Mirchandaney Date: Tue, 25 Jun 2024 11:45:36 -0700 Subject: [PATCH 1/2] update htr branch for CI --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index a377a04d47..446ddcdd31 100755 --- a/test.py +++ b/test.py @@ -511,7 +511,7 @@ def run_test_external2(launcher, root_dir, tmp_dir, bin_dir, env, thread_count, # clone_github('stanfordhpccenter', 'HTR-solver', htr_dir, tmp_dir) # NOTE: the legion-ci branch currently requires g++ (not clang) to build and # is REALLY slow unless you set DEBUG=0 - cmd(['git', 'clone', '-b', 'feature/newLegionPoints', 'git@gitlab.com:insieme1/htr/htr-solver.git', htr_dir]) + cmd(['git', 'clone', '-b', 'legion-ci', 'git@gitlab.com:insieme1/htr/htr-solver.git', htr_dir]) htr_env = dict(list(env.items()) + [ ('LEGION_DIR', root_dir), ('LD_LIBRARY_PATH', '%s:%s' % (env.get('LD_LIBRARY_PATH', ''), os.path.join(root_dir, 'bindings', 'regent'))), From ace3dcbdde000db8f575e76f05f6f2d8c89d8f8d Mon Sep 17 00:00:00 2001 From: Seema Mirchandaney Date: Tue, 25 Jun 2024 14:21:57 -0700 Subject: [PATCH 2/2] test fix for htr/ipc lock --- runtime/realm/cuda/cuda_internal.h | 2 +- runtime/realm/cuda/cuda_module.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/realm/cuda/cuda_internal.h b/runtime/realm/cuda/cuda_internal.h index 82d4026253..e1beb25b36 100644 --- a/runtime/realm/cuda/cuda_internal.h +++ b/runtime/realm/cuda/cuda_internal.h @@ -739,7 +739,7 @@ namespace Realm { }; std::vector cudaipc_mappings; std::map cudaipc_streams; - + Mutex alloc_mutex; const CudaIpcMapping *find_ipc_mapping(Memory mem) const; #ifdef REALM_USE_CUDART_HIJACK diff --git a/runtime/realm/cuda/cuda_module.cc b/runtime/realm/cuda/cuda_module.cc index b13357aad6..231f723d76 100644 --- a/runtime/realm/cuda/cuda_module.cc +++ b/runtime/realm/cuda/cuda_module.cc @@ -3608,6 +3608,7 @@ namespace Realm { GPUAllocation &GPU::add_allocation(GPUAllocation &&alloc) { + AutoLock<> al(alloc_mutex); assert(((!!alloc) && (alloc.get_dptr() != 0)) && "Given allocation is not valid!"); return allocations.emplace(std::make_pair(alloc.get_dptr(), std::move(alloc))) .first->second;