remove queue submits from cpp files

fix CUDA and HIP
lattice · Nov 2, 2023 · 2918ed9 · 2918ed9
1 parent 922692d
commit 2918ed9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/include/targets/cuda/special_ops_target.h b/include/targets/cuda/special_ops_target.h
@@ -6,24 +6,21 @@ namespace quda {
   // SpecialOps
   template <typename ...T>
   struct SpecialOps : SpecialOps_Base<T...> {
-    template <typename ...U> constexpr void setSpecialOps(const SpecialOps<U...> &ops) {
+    template <typename ...U> constexpr void setSpecialOps(const SpecialOps<U...> &) {
       static_assert(std::is_same_v<SpecialOps<T...>,SpecialOps<U...>>);
     }
   };
 
   // op implementations
-  struct op_blockSync : op_BaseT<void> {
-    //using dependencies = depFullBlock;
+  struct op_blockSync {
     template <typename ...Arg>
-    static constexpr unsigned int shared_mem_size(dim3 block, Arg &...arg) { return 0; }
+    static constexpr unsigned int shared_mem_size(dim3, Arg &...) { return 0; }
   };
 
   template <typename T>
-  struct op_warp_combine : op_BaseT<T> {
-    //using dependencies = depNone;
-    //using dependencies = depFullBlock;
+  struct op_warp_combine {
     template <typename ...Arg>
-    static constexpr unsigned int shared_mem_size(dim3, Arg &...arg) { return 0; }
+    static constexpr unsigned int shared_mem_size(dim3, Arg &...) { return 0; }
   };
 
 }
diff --git a/include/targets/hip/special_ops_target.h b/include/targets/hip/special_ops_target.h
@@ -12,13 +12,13 @@ namespace quda {
   };
 
   // op implementations
-  struct op_blockSync : op_BaseT<void> {
+  struct op_blockSync {
     template <typename ...Arg>
     static constexpr unsigned int shared_mem_size(dim3, Arg &...) { return 0; }
   };
 
   template <typename T>
-  struct op_warp_combine : op_BaseT<T> {
+  struct op_warp_combine {
     template <typename ...Arg>
     static constexpr unsigned int shared_mem_size(dim3, Arg &...) { return 0; }
   };

diff --git a/lib/targets/sycl/device.cpp b/lib/targets/sycl/device.cpp
@@ -291,6 +291,7 @@ namespace quda
 	argBufD[i] = nullptr;
 	argBufSizeD[i] = 0;
       }
+#if 0
       printfQuda("Testing submit...");
       auto q = streams[Nstream-1];
       q.submit([&](sycl::handler& h) {
@@ -300,6 +301,7 @@ namespace quda
 				   });
       });
       printfQuda(" done\n");
+#endif
     }
 
     void destroy()

diff --git a/lib/targets/sycl/quda_api.cpp b/lib/targets/sycl/quda_api.cpp
@@ -395,11 +395,12 @@ namespace quda
     auto q = device::get_target_stream(stream);
     pe->stream = stream;
     pe->eventIdx = device::getEventIdx(stream);
-    pe->event = q.submit([&](sycl::handler& cgh) {
-      cgh.single_task<class EventRecord>([=](){});
-      //cgh.host_task([=](){});
-    });
+    //pe->event = q.submit([&](sycl::handler& cgh) {
+    //cgh.single_task<class EventRecord>([=](){});
+    //cgh.host_task([=](){});
+    //});
     //*pe = q.submit_barrier();
+    pe->event = q.ext_oneapi_submit_barrier();
   }
 
   //void qudaStreamWaitEvent_(qudaStream_t stream, qudaEvent_t quda_event, unsigned int flags,