[arrayfire] 59/284: Merge remote-tracking branch 'upstream/master' into devel
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sun Feb 7 18:59:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.
commit b9e113b5126423b46a0f8c0ecfc7343074e2b6ba
Merge: 72b71e8 f263db0
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date: Sat Dec 5 15:23:19 2015 -0500
Merge remote-tracking branch 'upstream/master' into devel
Conflicts:
CMakeModules/Version.cmake
test/CMakeLists.txt
.gitignore | 1 +
CMakeLists.txt | 13 ++
CMakeModules/AFInstallDirs.cmake | 2 +-
CMakeModules/build_forge.cmake | 2 +-
CMakeModules/examples.dox.in | 3 +
assets | 2 +-
docs/CMakeLists.txt | 36 +++-
docs/arrayfire.css | 6 +
docs/details/array.dox | 21 --
docs/doxygen.mk | 4 +-
docs/layout.xml | 4 +
docs/pages/INSTALL.md | 2 +-
docs/pages/forge_visualization.md | 160 ++++++++++++++++
docs/pages/getting_started.md | 4 +-
docs/pages/interop_cuda.md | 163 ++++++++++++++++
docs/pages/interop_opencl.md | 189 ++++++++++++++++++
docs/pages/matrix_manipulation.md | 150 +++++++++------
docs/pages/release_notes.md | 51 ++++-
docs/pages/timing.md | 6 +-
docs/pages/unified_backend.md | 4 +-
docs/pages/vectorization.md | 212 +++++++++++++++++++++
examples/CMakeLists.txt | 122 ++++++------
examples/unified/basic.cpp | 1 +
include/af/array.h | 80 +++++---
include/af/graphics.h | 2 +-
include/af/seq.h | 170 ++++++++++++++++-
include/arrayfire.h | 51 -----
src/api/c/moddims.cpp | 3 +-
src/api/cpp/array.cpp | 27 +--
src/api/unified/CMakeLists.txt | 2 +
src/backend/cpu/Array.cpp | 8 +-
src/backend/cpu/Array.hpp | 20 +-
src/backend/cpu/platform.cpp | 4 +-
src/backend/cuda/Array.cpp | 12 +-
src/backend/cuda/Array.hpp | 20 +-
src/backend/cuda/homography.cu | 4 +-
src/backend/cuda/kernel/homography.hpp | 91 +++++----
src/backend/opencl/Array.cpp | 14 +-
src/backend/opencl/Array.hpp | 21 +-
src/backend/opencl/homography.cpp | 6 +-
src/backend/opencl/kernel/homography.cl | 87 +++++----
src/backend/opencl/kernel/homography.hpp | 8 +-
test/CMakeLists.txt | 169 +++++++++++-----
test/CMakeModules/FindOpenCL.cmake | 190 ++++++++++++++++++
.../CMakeModules}/build_gtest.cmake | 15 +-
test/array.cpp | 45 +++++
test/gfor.cpp | 34 ++++
test/index.cpp | 95 +++++++++
48 files changed, 1891 insertions(+), 445 deletions(-)
diff --cc test/CMakeLists.txt
index 3ae6ec0,e312e62..6a41432
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@@ -86,43 -112,89 +112,90 @@@ INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIR
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
FILE(GLOB FILES "*.cpp" "*.c")
- IF(${BUILD_CPU})
- MESSAGE(STATUS "TESTS: CPU backend is ON")
- CREATE_TESTS(cpu cpu "${GTEST_LIBRARIES}" "")
+ # Next we build each example using every backend.
+ IF(${ArrayFire_CPU_FOUND}) # variable defined by FIND(ArrayFire ...)
+ MESSAGE(STATUS "TESTS: CPU backend is ON.")
+ CREATE_TESTS(cpu ${ArrayFire_CPU_LIBRARIES} "${GTEST_LIBRARIES}" "")
+ ELSEIF(TARGET afcpu) # variable defined by the ArrayFire build tree
+ MESSAGE(STATUS "TESTS: CPU backend is ON.")
+ CREATE_TESTS(cpu afcpu "${GTEST_LIBRARIES}" "")
ELSE()
- MESSAGE(STATUS "TESTS: CPU backend is OFF")
+ MESSAGE(STATUS "TESTS: CPU backend is OFF. afcpu was not found.")
ENDIF()
- IF(${BUILD_CUDA} AND ${CUDA_FOUND})
- MESSAGE(STATUS "TESTS: CUDA backend is ON")
- IF("${APPLE}" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND ${CUDA_VERSION_MAJOR} VERSION_LESS 7)
- CREATE_TESTS(cuda cuda "${GTEST_LIBRARIES_STDLIB}" "")
- FOREACH(FILE ${FILES})
- GET_FILENAME_COMPONENT(FNAME ${FILE} NAME_WE)
- SET(TEST_NAME ${FNAME}_cuda)
- SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES COMPILE_FLAGS -stdlib=libstdc++)
- SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES LINK_FLAGS -stdlib=libstdc++)
- ENDFOREACH()
- ELSE("${APPLE}" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND ${CUDA_VERSION_MAJOR} VERSION_LESS 7)
- CREATE_TESTS(cuda cuda "${GTEST_LIBRARIES}" "")
- ENDIF("${APPLE}" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND ${CUDA_VERSION_MAJOR} VERSION_LESS 7)
+ # Next we build each example using every backend.
+ IF(${ArrayFire_Unified_FOUND}) # variable defined by FIND(ArrayFire ...)
+ MESSAGE(STATUS "TESTS: UNIFIED backend is ON.")
+ CREATE_TESTS(unified ${ArrayFire_Unified_LIBRARIES} "${GTEST_LIBRARIES}" "${CMAKE_DL_LIBS}")
+ ELSEIF(TARGET af) # variable defined by the ArrayFire build tree
+ MESSAGE(STATUS "TESTS: UNIFIED backend is ON.")
+ CREATE_TESTS(unified af "${GTEST_LIBRARIES}" "${CMAKE_DL_LIBS}")
ELSE()
- MESSAGE(STATUS "TESTS: CUDA backend is OFF")
+ MESSAGE(STATUS "TESTS: UNIFIED backend is OFF. af was not found.")
ENDIF()
- IF(${BUILD_OPENCL} AND ${OpenCL_FOUND})
- MESSAGE(STATUS "TESTS: OPENCL backend is ON")
- INCLUDE_DIRECTORIES(${OpenCL_INCLUDE_DIRS})
- CREATE_TESTS(opencl opencl "${GTEST_LIBRARIES}" "${OpenCL_LIBRARIES}")
+ IF (${CUDA_FOUND})
+ IF(${ArrayFire_CUDA_FOUND}) # variable defined by FIND(ArrayFire ...)
+ FIND_LIBRARY( CUDA_NVVM_LIBRARY
+ NAMES "nvvm"
+ PATH_SUFFIXES "nvvm/lib64" "nvvm/lib"
+ PATHS ${CUDA_TOOLKIT_ROOT_DIR}
+ DOC "CUDA NVVM Library"
+ )
+ MESSAGE(STATUS "TESTS: CUDA backend is ON.")
+ # If OSX && CLANG && CUDA < 7
+ IF("${APPLE}" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND ${CUDA_VERSION_MAJOR} VERSION_LESS 7)
+ CREATE_TESTS(cuda ${ArrayFire_CUDA_LIBRARIES} "${GTEST_LIBRARIES_STDLIB}" "${CUDA_CUBLAS_LIBRARIES};${CUDA_LIBRARIES};${CUDA_cusolver_LIBRARY};${CUDA_CUFFT_LIBRARIES};${CUDA_NVVM_LIBRARY};${CUDA_CUDA_LIBRARY}")
+
+ FOREACH(FILE ${FILES})
+ GET_FILENAME_COMPONENT(FNAME ${FILE} NAME_WE)
+ SET(TEST_NAME ${FNAME}_cuda)
+ SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES COMPILE_FLAGS -stdlib=libstdc++)
+ SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES LINK_FLAGS -stdlib=libstdc++)
+ ENDFOREACH()
+
+ # ELSE OSX && CLANG && CUDA < 7
+ ELSE("${APPLE}" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND ${CUDA_VERSION_MAJOR} VERSION_LESS 7)
+ CREATE_TESTS(cuda ${ArrayFire_CUDA_LIBRARIES} "${GTEST_LIBRARIES}" "${CUDA_CUBLAS_LIBRARIES};${CUDA_LIBRARIES};${CUDA_cusolver_LIBRARY};${CUDA_CUFFT_LIBRARIES};${CUDA_NVVM_LIBRARY};${CUDA_CUDA_LIBRARY}")
+
+ ENDIF("${APPLE}" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND ${CUDA_VERSION_MAJOR} VERSION_LESS 7)
+
+ ELSEIF(TARGET afcuda) # variable defined by the ArrayFire build tree
+ MESSAGE(STATUS "TESTS: CUDA backend is ON.")
+ # If OSX && CLANG && CUDA < 7
+ IF("${APPLE}" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND ${CUDA_VERSION_MAJOR} VERSION_LESS 7)
+ CREATE_TESTS(cuda afcuda "${GTEST_LIBRARIES_STDLIB}" "${CUDA_CUBLAS_LIBRARIES};${CUDA_LIBRARIES};${CUDA_cusolver_LIBRARY};${CUDA_CUFFT_LIBRARIES};${CUDA_NVVM_LIBRARY};${CUDA_CUDA_LIBRARY}")
+
+ FOREACH(FILE ${FILES})
+ GET_FILENAME_COMPONENT(FNAME ${FILE} NAME_WE)
+ SET(TEST_NAME ${FNAME}_cuda)
+ SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES COMPILE_FLAGS -stdlib=libstdc++)
+ SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES LINK_FLAGS -stdlib=libstdc++)
+ ENDFOREACH()
+
+ # ELSE OSX && CLANG && CUDA < 7
+ ELSE("${APPLE}" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND ${CUDA_VERSION_MAJOR} VERSION_LESS 7)
+ CREATE_TESTS(cuda afcuda "${GTEST_LIBRARIES}" "${CUDA_CUBLAS_LIBRARIES};${CUDA_LIBRARIES};${CUDA_cusolver_LIBRARY};${CUDA_CUFFT_LIBRARIES};${CUDA_NVVM_LIBRARY};${CUDA_CUDA_LIBRARY}")
+
+ ENDIF("${APPLE}" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND ${CUDA_VERSION_MAJOR} VERSION_LESS 7)
+ ELSE()
+ MESSAGE(STATUS "TESTS: CUDA backend is OFF. afcuda was not found")
+ ENDIF()
ELSE()
- MESSAGE(STATUS "TESTS: OPENCL backend is OFF")
+ MESSAGE(STATUS "TESTS: CUDA backend is OFF. CUDA was not found")
ENDIF()
- IF(${BUILD_UNIFIED})
- MESSAGE(STATUS "TESTS: Unified backends is ON")
- IF(WIN32)
- CREATE_TESTS(unified "" "${GTEST_LIBRARIES}" "")
+ IF (${OpenCL_FOUND})
++ INCLUDE_DIRECTORIES(${OpenCL_INCLUDE_DIRS})
+ IF(${ArrayFire_OpenCL_FOUND}) # variable defined by FIND(ArrayFire ...)
+ MESSAGE(STATUS "TESTS: OpenCL backend is ON.")
+ CREATE_TESTS(opencl ${ArrayFire_OpenCL_LIBRARIES} "${GTEST_LIBRARIES}" "${OpenCL_LIBRARIES}")
+ ELSEIF(TARGET afopencl) # variable defined by the ArrayFire build tree
+ MESSAGE(STATUS "TESTS: OpenCL backend is ON.")
+ CREATE_TESTS(opencl afopencl "${GTEST_LIBRARIES}" "${OpenCL_LIBRARIES}")
ELSE()
- CREATE_TESTS(unified "" "${GTEST_LIBRARIES}" dl)
+ MESSAGE(STATUS "TESTS: OpenCL backend is OFF. afopencl was not found")
ENDIF()
+ ELSE()
+ MESSAGE(STATUS "TESTS: OpenCL backend is OFF. OpenCL was not found")
ENDIF()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list