Merge pull request #75 from MultithreadCorner/update-thrust-dev

Update thrust to version 1.9.6

Author: AAAlvesJr

CMakeLists.txt

@@ -27,17 +27,17 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 
  MESSAGE(STATUS "Setting Clang flags")
  set(CMAKE_CXX_FLAGS " --std=c++11 -W -march=native -fPIC -O3 -ldl" CACHE STRING "compile flags" FORCE)
-  
+
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 
  MESSAGE(STATUS "Setting GCC flags")
  set(CMAKE_CXX_FLAGS " --std=c++11 -W -march=native -fPIC -O4 -ldl" CACHE STRING "compile flags" FORCE)
 
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
- 
+
  MESSAGE(STATUS "Setting ICC flags")
  set(CMAKE_CXX_FLAGS " --std=c++11 -W -march=native -fPIC -O4 -ldl" CACHE STRING "compile flags" FORCE)
-  
+
 #elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
  #MESSAGE(STATUS "===> Compiling with MSVC")
 endif()
@@ -83,7 +83,7 @@ endif(FFTW_FOUND)
 
 #-----------------------
 #get CUDA
-find_package(CUDA 8.0) 
+find_package(CUDA 8.0)
 if(CUDA_FOUND)
 link_directories( ${CUDA_TOOLKIT_ROOT_DIR}/lib64/)
 
@@ -96,7 +96,7 @@ SET(CUDA_SEPARABLE_COMPILATION OFF)
 SET(CUDA_VERBOSE_BUILD OFF)
 
 if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8)
-   LIST(APPEND CUDA_NVCC_FLAGS " -Xcompiler -D_MWAITXINTRIN_H_INCLUDED ")
+  # LIST(APPEND CUDA_NVCC_FLAGS " -Xcompiler -D_MWAITXINTRIN_H_INCLUDED ")
 endif()
 
 if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.4)
@@ -109,7 +109,7 @@ INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindCudaArch.cmake)
 SELECT_NVCC_ARCH_FLAGS(NVCC_FLAGS_EXTRA)
 
 LIST(APPEND CUDA_NVCC_FLAGS ${NVCC_FLAGS_EXTRA})
-        
+
 endif(CUDA_FOUND)
 
 #-----------------------
@@ -128,35 +128,35 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif(OPENMP_CXX_FOUND OR OPENMP_FOUND)
 
 #generate API documentation with Doxygen
-find_package(Doxygen)
+#find_package(Doxygen)
 option(BUILD_DOCUMENTATION "Create and install the HTML based API documentation (requires Doxygen)" NO)
 
 # examples etc
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 #always on
-SET(BUILD_CPP_TARGETS  ON)
+SET(BUILD_CPP_TARGETS  TRUE)
 
 #crucial for clang build, where openmp support is not embeded in the compiler
 if( OPENMP_CXX_FOUND OR OPENMP_FOUND)
 
-        SET(BUILD_OMP_TARGETS  ON)
+        SET(BUILD_OMP_TARGETS  TRUE)
 else()
-        SET(BUILD_OMP_TARGETS  OFF)
+        SET(BUILD_OMP_TARGETS  FALSE)
 endif()
 
-#not every computer has a GPU and/or cuda installed or 
+#not every computer has a GPU and/or cuda installed or
 if( CUDA_FOUND )
-	SET(BUILD_CUDA_TARGETS  ON)
+	SET(BUILD_CUDA_TARGETS  TRUE)
 else()
-	SET(BUILD_CUDA_TARGETS  OFF)
+	SET(BUILD_CUDA_TARGETS  FALSE)
 endif()
 
 # to enable tbb builds
 if(TBB_FOUND)
-    SET(BUILD_TBB_TARGETS  ON)
+    SET(BUILD_TBB_TARGETS  TRUE)
 else()
-    SET(BUILD_TBB_TARGETS  OFF)
+    SET(BUILD_TBB_TARGETS  FALSE)
 endif(TBB_FOUND)
 
 # messages
@@ -198,8 +198,8 @@ add_subdirectory(examples/random)
 add_subdirectory(examples/histograming)
 add_subdirectory(examples/async)
 add_subdirectory(examples/misc)
-add_subdirectory(examples/convolution)
 if(Minuit2_FOUND)
+add_subdirectory(examples/convolution)
 add_subdirectory(examples/phys)
 add_subdirectory(examples/fit)
 endif(Minuit2_FOUND)
@@ -213,7 +213,7 @@ enable_testing()
 add_custom_target(tests)
 add_subdirectory(testing)
 
-#add_dependencies(tests 
+#add_dependencies(tests
 #Hydra_Test_Host_OMP_Device_CUDA
 #Hydra_Test_Host_CPP_Device_CUDA
 #Hydra_Test_Host_OMP_Device_OMP
@@ -225,7 +225,7 @@ add_subdirectory(testing)
 #+++++++++++++++++++++++++++
 
 if(BUILD_DOXYGEN_DOCUMENTATION)
-
+find_package(Doxygen)
     if(NOT DOXYGEN_FOUND)
         message(FALTAL_ERROR "Doxygen documentation generation requested ( BUILD_DOXYGEN_DOCUMENTATION=ON) but Doxygen is not installed.")
     endif()
@@ -242,7 +242,7 @@ if(BUILD_DOXYGEN_DOCUMENTATION)
         VERBATIM)
 
    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION hydra/doc/doxygen)
-    
+
 endif(BUILD_DOXYGEN_DOCUMENTATION)
 
 #+++++++++++++++++++++++++++
@@ -257,24 +257,24 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hydra
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs
   DESTINATION hydra/docs)
 
-#install examples executables  
+#install examples executables
 if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/examples/")
 install(DIRECTORY  ${CMAKE_CURRENT_BINARY_DIR}/examples
   DESTINATION hydra/bin/examples)
 endif(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/examples/")
 
-#install performance executables  
+#install performance executables
 if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/performance/")
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/performance
   DESTINATION hydra/bin/performance)
 endif(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/performance/")
 
-#install test executables  
+#install test executables
 if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/tests/")
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests
   DESTINATION hydra/bin/tests)
 endif(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/tests/")
 
-#install source  
+#install source
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  DESTINATION hydra/dist) 
+  DESTINATION hydra/dist)

Doxyfile

@@ -1,14 +1,14 @@
 #PROJECT_NAME          = "Hydra_examples_and_documentation"
 PROJECT_NUMBER         =  2.3.2
 
-STRIP_FROM_PATH        = /home/augalves/Development/Release/Hydra_Official_Repo/Hydra
+STRIP_FROM_PATH        = /home/augalves/Development/Release/Hydra
 
-INPUT                  = /home/augalves/Development/Release/Hydra_Official_Repo/Hydra/hydra /home/augalves/Development/Release/Hydra_Official_Repo/Hydra/doxydefs /home/augalves/Development/Release/Hydra_Official_Repo/Hydra/examples /home/augalves/Development/Release/Hydra_Official_Repo/Hydra/README.md
+INPUT                  = /home/augalves/Development/Release/Hydra/hydra /home/augalves/Development/Release/Hydra/doxydefs /home/augalves/Development/Release/Hydra/examples /home/augalves/Development/Release/Hydra/README.md
 
 
-USE_MDFILE_AS_MAINPAGE = /home/augalves/Development/Release/Hydra_Official_Repo/Hydra/doxydefs/README.md
-#PROJECT_LOGO          = /home/augalves/Development/Release/Hydra_Official_Repo/Hydra/logo_Hydra.png
-OUTPUT_DIRECTORY       = /home/augalves/Development/Release/Hydra_Official_Repo/EclipseProj/doc
+USE_MDFILE_AS_MAINPAGE = /home/augalves/Development/Release/Hydra/doxydefs/README.md
+#PROJECT_LOGO          = /home/augalves/Development/Release/Hydra/logo_Hydra.png
+OUTPUT_DIRECTORY       = /home/augalves/Development/Release/HydraEclipseProj/doc
 
 # Doxyfile 1.8.11
 
@@ -173,10 +173,10 @@ EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = *detail/external*
 EXCLUDE_SYMBOLS        = 
-EXAMPLE_PATH           = /home/augalves/Development/Release/Hydra_Official_Repo/Hydra/examples
+EXAMPLE_PATH           = /home/augalves/Development/Release/Hydra/examples
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = YES
-IMAGE_PATH             = /home/augalves/Development/Release/Hydra_Official_Repo/Hydra, /home/augalves/Development/Release/Hydra_Official_Repo/EclipseProj/plots
+IMAGE_PATH             = /home/augalves/Development/Release/Hydra, /home/augalves/Development/Release/HydraEclipseProj/plots
 INPUT_FILTER           = 
 FILTER_PATTERNS        = 
 FILTER_SOURCE_FILES    = NO

cmake/AddHydraExample.cmake

@@ -3,20 +3,21 @@ function(ADD_HYDRA_EXAMPLE target_name build_cuda build_tbb build_omp build_cpp
         #+++++++++++++++++++++++++
         # CUDA TARGETS           |
         #+++++++++++++++++++++++++
-        if(${${build_cuda}} )
+        if( ${${build_cuda}} )
+
                   message(STATUS "Adding target ${target_name} to CUDA backend. Executable file name: ${target_name}_cuda")
-                  
+
                   cuda_add_executable("${target_name}_cuda"
-                   #EXCLUDE_FROM_ALL 
-                   "${target_name}.cu"    
+                   #EXCLUDE_FROM_ALL
+                   "${target_name}.cu"
                     OPTIONS -Xcompiler -DHYDRA_DEVICE_SYSTEM=CUDA -DHYDRA_HOST_SYSTEM=CPP)
-                    
+
                   target_link_libraries("${target_name}_cuda" ${ROOT_LIBRARIES} ${TBB_LIBRARIES}  ${GSL_LIBRARIES}  ${CUDA_CUFFT_LIBRARIES} -lm)
-                 
+
                   add_dependencies(examples      "${target_name}_cuda")
-                
-        endif(${${build_cuda}})
-    
+                  
+        endif( ${${build_cuda}} )
+        
         #+++++++++++++++++++++++++
         # TBB TARGETS            |
         #+++++++++++++++++++++++++
@@ -25,51 +26,50 @@ function(ADD_HYDRA_EXAMPLE target_name build_cuda build_tbb build_omp build_cpp
                  add_executable("${target_name}_tbb"
                  # EXCLUDE_FROM_ALL
                  "${target_name}.cpp" )
-                    
-                 set_target_properties( "${target_name}_tbb" 
+
+                 set_target_properties( "${target_name}_tbb"
                   PROPERTIES COMPILE_FLAGS "-DHYDRA_HOST_SYSTEM=CPP -DHYDRA_DEVICE_SYSTEM=TBB")
-                    
+
                  target_link_libraries( "${target_name}_tbb" ${ROOT_LIBRARIES} ${TBB_LIBRARIES}  ${GSL_LIBRARIES} ${FFTW_LIBRARIES} -lm)
-                   
+
                  add_dependencies(examples "${target_name}_tbb")
-                       
-         endif(${${build_tbb}})
-         
+
+         endif( ${${build_tbb}} )
+
         #+++++++++++++++++++++++++
         # CPP TARGETS            |
         #+++++++++++++++++++++++++
-        if(${${build_cpp}})
+        if( ${${build_cpp}} )
+
                  message(STATUS "Adding target ${target_name} to CPP backend. Executable file name: ${target_name}_cpp")
                  add_executable("${target_name}_cpp"
-                 # EXCLUDE_FROM_ALL 
+                 # EXCLUDE_FROM_ALL
                  "${target_name}.cpp" )
-                    
-                 set_target_properties( "${target_name}_cpp" 
+
+                 set_target_properties( "${target_name}_cpp"
                   PROPERTIES COMPILE_FLAGS "-DHYDRA_HOST_SYSTEM=CPP -DHYDRA_DEVICE_SYSTEM=CPP")
-                    
+
                  target_link_libraries( "${target_name}_cpp" ${ROOT_LIBRARIES} ${TBB_LIBRARIES} ${GSL_LIBRARIES} ${FFTW_LIBRARIES} -lm)
-                   
+
                  add_dependencies(examples "${target_name}_cpp")
-                       
-         endif(${${build_cpp}})
-         
-          
+
+         endif( ${${build_cpp}} )
         #+++++++++++++++++++++++++
         # OMP TARGETS            |
         #+++++++++++++++++++++++++
         if(${${build_omp}})
                  message(STATUS "Adding target ${target_name} to OMP backend. Executable file name: ${target_name}_omp")
-                 add_executable("${target_name}_omp" 
+                 add_executable("${target_name}_omp"
                  #EXCLUDE_FROM_ALL
                  "${target_name}.cpp" )
-                    
-                 set_target_properties( "${target_name}_omp" 
+
+                 set_target_properties( "${target_name}_omp"
                   PROPERTIES COMPILE_FLAGS "-DHYDRA_HOST_SYSTEM=CPP -DHYDRA_DEVICE_SYSTEM=OMP ${OpenMP_CXX_FLAGS}")
-                    
+
                  target_link_libraries( "${target_name}_omp" ${ROOT_LIBRARIES} ${OpenMP_CXX_LIBRARIES} ${GSL_LIBRARIES} ${FFTW_LIBRARIES} -lm)
-                   
+
                  add_dependencies(examples "${target_name}_omp")
-                       
+
          endif(${${build_omp}})
-         
-endfunction(ADD_HYDRA_EXAMPLE)  
+
+endfunction(ADD_HYDRA_EXAMPLE)

examples/fit/basic_fit.inl

@@ -150,7 +150,7 @@ int main(int argv, char** argc)
 
 		//filtering
 		auto filter = hydra::wrap_lambda(
-				[=] __hydra_dual__ (unsigned int n, double* x){
+				[=] __hydra_dual__ (unsigned int n, const double* x){
 				return (x[0] > min) && (x[0] < max );
 		});
 

examples/fit/basic_fit_range_semantics.inl

@@ -135,6 +135,7 @@ int main(int argv, char** argc)
 
 #endif //_ROOT_AVAILABLE_
 
+
 	//begin raii scope
 	{
 
@@ -151,7 +152,7 @@ int main(int argv, char** argc)
 
 		//filtering
 		auto filter = hydra::wrap_lambda(
-				[=] __hydra_dual__ (unsigned int n, double* x){
+				[=] __hydra_dual__ (unsigned int n, const double* x){
 				return (x[0] > min) && (x[0] < max );
 		});
 

examples/fit/extended_logLL_fit.inl

@@ -190,7 +190,7 @@ int main(int argv, char** argc)
 
 		//filtering
 		auto filter = hydra::wrap_lambda(
-				[=] __hydra_dual__ (unsigned int n, double* x){
+				[=] __hydra_dual__ (unsigned int n, const double* x){
 					return (x[0] > min) && (x[0] < max );
 			});
 

examples/fit/fractional_logLL_fit.inl

@@ -197,7 +197,7 @@ int main(int argv, char** argc)
 
 		//filtering
 		auto filter = hydra::wrap_lambda(
-			[=] __hydra_dual__ (unsigned int n, double* x){
+			[=] __hydra_dual__ (unsigned int n, const double* x){
 				return (x[0] > min) && (x[0] < max );
 		});
 

examples/fit/multidimensional_fit.inl

@@ -169,7 +169,7 @@ int main(int argv, char** argc) {
 	//fit function
 
 	auto gaussian = hydra::wrap_lambda(
-		[=] __hydra_dual__ 	(unsigned int npar, const hydra::Parameter* params, unsigned int narg, double* x ){
+		[=] __hydra_dual__ 	(unsigned int npar, const hydra::Parameter* params, unsigned int narg,  const double* x ){
 
 		double g = 1.0;