Merge branch 'master' into rc

Author: elliottslaughter

runtime/realm/cuda/cuda_internal.h

@@ -739,7 +739,7 @@ namespace Realm {
       };
       std::vector<CudaIpcMapping> cudaipc_mappings;
       std::map<NodeID, GPUStream *> cudaipc_streams;
-
+      Mutex alloc_mutex;
       const CudaIpcMapping *find_ipc_mapping(Memory mem) const;
 
 #ifdef REALM_USE_CUDART_HIJACK

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;

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', '[email protected]:insieme1/htr/htr-solver.git', htr_dir])
+    cmd(['git', 'clone', '-b', 'legion-ci', '[email protected]: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'))),