Initial version of HPX backend

ddemidov · Dec 21, 2014 · 971b60f · 971b60f
1 parent 3ba9666
commit 971b60f
Show file tree

Hide file tree

Showing 5 changed files with 830 additions and 35 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,6 +5,41 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib)
 
+#----------------------------------------------------------------------------
+# Find OpenMP
+#----------------------------------------------------------------------------
+find_package(OpenMP)
+if (OpenMP_CXX_FLAGS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+endif ()
+
+#----------------------------------------------------------------------------
+# Find Eigen
+#----------------------------------------------------------------------------
+find_path(EIGEN_INCLUDE Eigen/SparseCore PATH_SUFFIXES eigen3)
+if (EIGEN_INCLUDE)
+    include_directories(${EIGEN_INCLUDE})
+    add_definitions(-DAMGCL_HAVE_EIGEN)
+endif()
+
+#----------------------------------------------------------------------------
+# Find Blaze
+#----------------------------------------------------------------------------
+find_path(BLAZE_INCLUDE blaze/Math.h)
+if (BLAZE_INCLUDE)
+    include_directories(${BLAZE_INCLUDE})
+    add_definitions(-DAMGCL_HAVE_BLAZE)
+endif()
+
+#----------------------------------------------------------------------------
+# Find HPX
+#----------------------------------------------------------------------------
+option(HAVE_HPX "Build HPX examples" OFF)
+if (HAVE_HPX)
+    find_package(HPX)
+    set(BOOST_COMPONENTS serialization)
+endif()
+
 #----------------------------------------------------------------------------
 # Find Boost
 #----------------------------------------------------------------------------
@@ -25,7 +60,7 @@ else ()
     endif()
 endif ()
 
-set(BOOST_COMPONENTS
+set(BOOST_COMPONENTS ${BOOST_COMPONENTS}
     chrono
     program_options
     system
@@ -36,33 +71,6 @@ set(BOOST_COMPONENTS
 find_package(Boost COMPONENTS ${BOOST_COMPONENTS})
 include_directories( ${Boost_INCLUDE_DIRS} )
 
-#----------------------------------------------------------------------------
-# Find OpenMP
-#----------------------------------------------------------------------------
-find_package(OpenMP)
-
-if (OpenMP_CXX_FLAGS)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif ()
-
-#----------------------------------------------------------------------------
-# Find Eigen
-#----------------------------------------------------------------------------
-find_path(EIGEN_INCLUDE Eigen/SparseCore PATH_SUFFIXES eigen3)
-if (EIGEN_INCLUDE)
-    include_directories(${EIGEN_INCLUDE})
-    add_definitions(-DAMGCL_HAVE_EIGEN)
-endif()
-
-#----------------------------------------------------------------------------
-# Find Blaze
-#----------------------------------------------------------------------------
-find_path(BLAZE_INCLUDE blaze/Math.h)
-if (BLAZE_INCLUDE)
-    include_directories(${BLAZE_INCLUDE})
-    add_definitions(-DAMGCL_HAVE_BLAZE)
-endif()
-
 #----------------------------------------------------------------------------
 # Find VexCL
 #----------------------------------------------------------------------------
@@ -103,11 +111,19 @@ endif()
 #----------------------------------------------------------------------------
 # Find CUDA
 #----------------------------------------------------------------------------
-find_package(CUDA QUIET)
-if (CUDA_FOUND)
-    set(CUDA_COMPUTE_CAPABILITY "35" CACHE STRING "CUDA Compute Capability")
-    add_definitions(-DAMGCL_HAVE_CUDA)
-    add_definitions(-DBOOST_DISABLE_ASSERTS)
+option(HAVE_CUDA "Compile examples for CUDA backend" ON)
+if (HAVE_CUDA AND HAVE_HPX)
+    message(FATAL_ERROR
+        "HPX examples and CUDA examples can not be compiled simultaneously"
+        )
+endif()
+if (HAVE_CUDA)
+    find_package(CUDA QUIET)
+    if (CUDA_FOUND)
+        set(CUDA_COMPUTE_CAPABILITY "35" CACHE STRING "CUDA Compute Capability")
+        add_definitions(-DAMGCL_HAVE_CUDA)
+        add_definitions(-DBOOST_DISABLE_ASSERTS)
+    endif ()
 endif ()
 
 #----------------------------------------------------------------------------

diff --git a/amgcl/backend/builtin.hpp b/amgcl/backend/builtin.hpp
@@ -371,7 +371,7 @@ struct builtin {
 
     /// Copy vector to builtin backend.
     static boost::shared_ptr<vector>
-    copy_vector(const vector x, const params&)
+    copy_vector(const vector &x, const params&)
     {
         return boost::make_shared<vector>(x);
     }
@@ -415,7 +415,7 @@ template <class T>
 struct is_builtin_vector : boost::false_type {};
 
 template <class V>
-struct is_builtin_vector< std::vector<V> > : boost::true_type {};
+struct is_builtin_vector< std::vector<V> > : boost::is_arithmetic<V> {};
 
 template <class Iterator>
 struct is_builtin_vector< boost::iterator_range<Iterator> > : boost::true_type {};