Add missing include

STEllAR-GROUP · Jun 8, 2017 · 80a3d61 · 80a3d61
1 parent df67d48
commit 80a3d61
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/hpx/compute/cuda/default_executor.hpp b/hpx/compute/cuda/default_executor.hpp
@@ -182,7 +182,7 @@ namespace hpx { namespace compute { namespace cuda
         }
 
         template <typename F, typename ... Ts>
-        void sync_execute(F && f, Ts &&... ts) const
+        void execute(F && f, Ts &&... ts) const
         {
             apply_execute(std::forward<F>(f), std::forward<Ts>(ts)...);
             target_.synchronize();

diff --git a/hpx/parallel/algorithms/for_each.hpp b/hpx/parallel/algorithms/for_each.hpp
@@ -127,8 +127,10 @@ namespace hpx { namespace parallel { inline namespace v1
             void operator()(Iter part_begin, std::size_t part_size,
                 std::size_t /*part_index*/)
             {
+#if !defined(__NVCC__) && !defined(__CUDACC__)
                 hpx::util::annotate_function annotate(f_);
                 (void)annotate;     // suppress warning about unused variable
+#endif
                 execute(part_begin, part_size);
             }
         };

diff --git a/hpx/parallel/algorithms/for_loop.hpp b/hpx/parallel/algorithms/for_loop.hpp
@@ -146,8 +146,10 @@ namespace hpx { namespace parallel { inline namespace v2
             void operator()(B part_begin, std::size_t part_steps,
                 std::size_t part_index)
             {
+#if !defined(__NVCC__) && !defined(__CUDACC__)
                 hpx::util::annotate_function annotate(f_);
                 (void)annotate;     // suppress warning about unused variable
+#endif
                 execute(part_begin, part_steps, part_index);
             }
         };

diff --git a/src/compute/cuda/cuda_target.cpp b/src/compute/cuda/cuda_target.cpp
@@ -10,6 +10,7 @@
 #include <hpx/exception.hpp>
 #include <hpx/runtime_fwd.hpp>
 #include <hpx/runtime/find_here.hpp>
+#include <hpx/runtime/naming/id_type_impl.hpp>
 #include <hpx/runtime/threads/thread_helpers.hpp>
 #include <hpx/util/assert.hpp>