From 7bc0166c1c1648b4961f4fa5c46294c3f8084cff Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Mon, 25 May 2020 08:34:19 -0700
Subject: [PATCH] SYCLL maknig happy - must avoid non ttrivial copy
 constructors

---
 Grid/lattice/Lattice_base.h |  4 ++--
 Grid/lattice/Lattice_view.h | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Grid/lattice/Lattice_base.h b/Grid/lattice/Lattice_base.h
index 17f84d44..9aae3333 100644
--- a/Grid/lattice/Lattice_base.h
+++ b/Grid/lattice/Lattice_base.h
@@ -217,8 +217,8 @@ public:
   }
 
   template<class sobj> inline Lattice<vobj> & operator = (const sobj & r){
-    auto me  = View(AcceleratorWriteDiscard);
-    accelerator_for(ss,me.size(),1,{
+    auto me  = View(CpuWrite);
+    thread_for(ss,me.size(),{
 	me[ss]= r;
     });
     return *this;
diff --git a/Grid/lattice/Lattice_view.h b/Grid/lattice/Lattice_view.h
index 183423f7..b5887d50 100644
--- a/Grid/lattice/Lattice_view.h
+++ b/Grid/lattice/Lattice_view.h
@@ -107,10 +107,18 @@ class MemViewDeleter {
 template<class vobj> 
 class LatticeView : public LatticeExprView<vobj>
 {
+#ifndef GRID_UVM
   std::shared_ptr<MemViewDeleter> Deleter;
+#endif
 public:
-  LatticeView(const LatticeView<vobj> &orig) : LatticeExprView<vobj>(orig) {  }
-  LatticeView(const LatticeAccelerator<vobj> &refer_to_me,ViewMode mode) : 
+#ifdef GRID_UVM
+ LatticeView(const LatticeAccelerator<vobj> &refer_to_me,ViewMode mode) : 
+    LatticeExprView<vobj> (refer_to_me)
+  {
+  }
+#else
+ LatticeView(const LatticeView<vobj> &orig) : LatticeExprView<vobj>(orig) {  }
+ LatticeView(const LatticeAccelerator<vobj> &refer_to_me,ViewMode mode) : 
     LatticeExprView<vobj> (refer_to_me), Deleter(new MemViewDeleter)
   {
     //    std::cout << "FIXME - copy shared pointer? View Open in LatticeView"<<std::hex<<this->_odata<<std::dec<<" mode "<<mode <<std::endl;
@@ -118,6 +126,7 @@ public:
     Deleter->cpu_ptr = this->cpu_ptr;
     Deleter->mode    = mode;
   }
+#endif
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////