Merge pull request #2688 from atrantan/master

Make Cuda Clang builds pass
STEllAR-GROUP · Jun 19, 2017 · e853e98 · e853e98
2 parents 30b37b9 + 3602f33
commit e853e98
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
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>
 

diff --git a/tests/performance/compute/cuda/synchronize.cpp b/tests/performance/compute/cuda/synchronize.cpp
@@ -40,7 +40,7 @@ int hpx_main(boost::program_options::variables_map& vm)
         hpx::util::high_resolution_timer timer;
         for (std::size_t i = 0; i != iterations; ++i)
         {
-            executor.execute([] HPX_DEVICE (){});
+            executor.sync_execute([] HPX_DEVICE (){});
         }
         double elapsed = timer.elapsed();
         std::cout << "executor.execute([](){}):                            "