Commit 947ec0d9 authored by David E. DeMarle's avatar David E. DeMarle
Browse files

bump to ospray 1.4.0 and embree 2.17

besides version numbers, remove the old patches as they
have been upstreamed.
parent 26dc3e21
......@@ -22,10 +22,3 @@ superbuild_add_project(embree
-DEMBREE_GEOMETRY_SUBDIV:BOOL=OFF
-DEMBREE_TUTORIALS:BOOL=OFF
-DCMAKE_INSTALL_LIBDIR:STRING=lib)
superbuild_apply_patch(embree improve-findtbb
"Improve FindTBB")
superbuild_apply_patch(embree fix-cray
"Fix compilation under Cray Wrapper")
superbuild_apply_patch(embree fix-package-config
"Remove relative paths from package config")
......@@ -33,8 +33,5 @@ superbuild_add_project(ospray
-DOSPRAY_MODULE_TACHYON:BOOL=OFF
-DCMAKE_INSTALL_LIBDIR:STRING=lib)
superbuild_apply_patch(ospray improve-findtbb
"Improve FindTBB")
superbuild_add_extra_cmake_args(
-DOSPRAY_INSTALL_DIR:PATH=<INSTALL_DIR>)
diff --git a/common/cmake/crayprgenv.cmake b/common/cmake/crayprgenv.cmake
index edfe3dc..c68132b 100644
--- a/common/cmake/crayprgenv.cmake
+++ b/common/cmake/crayprgenv.cmake
@@ -15,7 +15,11 @@
## ======================================================================== ##
SET(FLAGS_SSE2 "-target-cpu=xeon")
-SET(FLAGS_SSE42 "ERROR_ISA_NOT_SUPPORTED")
+IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+ SET(FLAGS_SSE42 "-target-cpu=xeon -msse4.2")
+ELSE()#Intel
+ SET(FLAGS_SSE42 "-target-cpu=xeon -xsse4.2 -fPIC")
+ENDIF()
SET(FLAGS_AVX "-target-cpu=sandybridge")
SET(FLAGS_AVX2 "-target-cpu=haswell")
SET(FLAGS_AVX512KNL "-target-cpu=mic-knl")
--- a/common/cmake/FindTBB.cmake 2017-06-28 09:11:17.000000000 -0400
+++ b/common/cmake/FindTBB.cmake 2017-07-12 15:09:32.171067259 -0400
@@ -14,13 +14,44 @@
## limitations under the License. ##
## ======================================================================== ##
+SET(TBB_MAJOR_VERSION_REQUIRED "3.0")
+
+IF (NOT TBB_ROOT)
+ SET(TBB_ROOT $ENV{TBB_ROOT})
+ENDIF()
+IF (NOT TBB_ROOT)
+ SET(TBB_ROOT $ENV{TBBROOT})
+ENDIF()
+
+# detect changed TBB_ROOT
+IF (NOT TBB_ROOT STREQUAL TBB_ROOT_LAST)
+ UNSET(TBB_INCLUDE_DIR CACHE)
+ UNSET(TBB_LIBRARY CACHE)
+ UNSET(TBB_LIBRARY_DEBUG CACHE)
+ UNSET(TBB_LIBRARY_MALLOC CACHE)
+ UNSET(TBB_LIBRARY_MALLOC_DEBUG CACHE)
+ENDIF()
+
IF (WIN32)
- FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h
+ # workaround for parentheses in variable name / CMP0053
+ SET(PROGRAMFILESx86 "PROGRAMFILES(x86)")
+ SET(PROGRAMFILES32 "$ENV{${PROGRAMFILESx86}}")
+ IF (NOT PROGRAMFILES32)
+ SET(PROGRAMFILES32 "$ENV{PROGRAMFILES}")
+ ENDIF()
+ IF (NOT PROGRAMFILES32)
+ SET(PROGRAMFILES32 "C:/Program Files (x86)")
+ ENDIF()
+ FIND_PATH(TBB_ROOT include/tbb/task_scheduler_init.h
DOC "Root of TBB installation"
- PATHS ${PROJECT_SOURCE_DIR}/tbb "C:/Program Files (x86)/Intel/Composer XE/tbb"
- NO_DEFAULT_PATH
+ HINTS ${TBB_ROOT}
+ PATHS
+ ${PROJECT_SOURCE_DIR}/tbb
+ ${PROJECT_SOURCE_DIR}/../tbb
+ "${PROGRAMFILES32}/IntelSWTools/compilers_and_libraries/windows/tbb"
+ "${PROGRAMFILES32}/Intel/Composer XE/tbb"
+ "${PROGRAMFILES32}/Intel/compilers_and_libraries/windows/tbb"
)
- FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h)
IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(TBB_ARCH intel64)
@@ -32,79 +63,104 @@
SET(TBB_VCVER vc10)
ELSEIF (MSVC11)
SET(TBB_VCVER vc11)
- ELSE()
+ ELSEIF (MSVC12)
SET(TBB_VCVER vc12)
+ ELSE()
+ SET(TBB_VCVER vc14)
ENDIF()
- SET(TBB_LIBDIR ${EMBREE_TBB_ROOT}/lib/${TBB_ARCH}/${TBB_VCVER})
- SET(TBB_BINDIR ${EMBREE_TBB_ROOT}/bin/${TBB_ARCH}/${TBB_VCVER})
+ SET(TBB_LIBDIR ${TBB_ROOT}/lib/)
+ SET(TBB_BINDIR ${TBB_ROOT}/bin/)
- IF (EMBREE_TBB_ROOT STREQUAL "")
- FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h)
- FIND_LIBRARY(TBB_LIBRARY tbb)
- FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc)
- ELSE()
- SET(TBB_INCLUDE_DIR TBB_INCLUDE_DIR-NOTFOUND)
- SET(TBB_LIBRARY TBB_LIBRARY-NOTFOUND)
- SET(TBB_LIBRARY_MALLOC TBB_LIBRARY_MALLOC-NOTFOUND)
- FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${EMBREE_TBB_ROOT}/include NO_DEFAULT_PATH)
- FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${TBB_LIBDIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_LIBDIR} NO_DEFAULT_PATH)
- ENDIF()
+ FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY tbb
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_DEBUG tbb_debug
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC_DEBUG tbbmalloc_debug
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ NO_DEFAULT_PATH)
ELSE ()
- FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h
+ FIND_PATH(TBB_ROOT include/tbb/task_scheduler_init.h
DOC "Root of TBB installation"
- PATHS ${PROJECT_SOURCE_DIR}/tbb /opt/intel/tbb
- NO_DEFAULT_PATH
+ HINTS ${TBB_ROOT}
+ PATHS
+ ${PROJECT_SOURCE_DIR}/tbb
+ /opt/intel/composerxe/tbb
+ /opt/intel/compilers_and_libraries/tbb
)
- FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h)
- IF (EMBREE_TBB_ROOT STREQUAL "")
- FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h)
- FIND_LIBRARY(TBB_LIBRARY tbb)
- FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc)
+ IF (APPLE)
+ FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_DEBUG tbb_debug PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC_DEBUG tbbmalloc_debug PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
ELSE()
- SET(TBB_INCLUDE_DIR TBB_INCLUDE_DIR-NOTFOUND)
- SET(TBB_LIBRARY TBB_LIBRARY-NOTFOUND)
- SET(TBB_LIBRARY_MALLOC TBB_LIBRARY_MALLOC-NOTFOUND)
- IF (APPLE)
- FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${EMBREE_TBB_ROOT}/include NO_DEFAULT_PATH)
- FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${EMBREE_TBB_ROOT}/lib NO_DEFAULT_PATH)
- FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${EMBREE_TBB_ROOT}/lib NO_DEFAULT_PATH)
- ELSE()
- FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${EMBREE_TBB_ROOT}/include NO_DEFAULT_PATH)
- FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4 ${EMBREE_TBB_ROOT}/lib ${EMBREE_TBB_ROOT}/lib64 /usr/libx86_64-linux-gnu/ NO_DEFAULT_PATH)
- FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4 ${EMBREE_TBB_ROOT}/lib ${EMBREE_TBB_ROOT}/lib64 /usr/libx86_64-linux-gnu/ NO_DEFAULT_PATH)
- ENDIF()
+ FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)
+ SET(TBB_HINTS HINTS ${TBB_ROOT}/lib/intel64/gcc4.4 ${TBB_ROOT}/lib ${TBB_ROOT}/lib64 PATHS /usr/libx86_64-linux-gnu/)
+ FIND_LIBRARY(TBB_LIBRARY libtbb.so.2 ${TBB_HINTS})
+ FIND_LIBRARY(TBB_LIBRARY_DEBUG libtbb_debug.so.2 ${TBB_HINTS})
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC libtbbmalloc.so.2 ${TBB_HINTS})
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC_DEBUG libtbbmalloc_debug.so.2 ${TBB_HINTS})
ENDIF()
-
ENDIF()
+SET(TBB_ROOT_LAST ${TBB_ROOT} CACHE INTERNAL "Last value of TBB_ROOT to detect changes")
+
+SET(TBB_ERROR_MESSAGE
+ "Threading Building Blocks (TBB) with minimum version ${TBB_MAJOR_VERSION_REQUIRED}.0 not found.
+OSPRay uses TBB as default tasking system. Please make sure you have the TBB headers installed as well (the package is typically named 'libtbb-dev' or 'tbb-devel') and/or hint the location of TBB in TBB_ROOT.
+Alternatively, you can try to use OpenMP as tasking system by setting OSPRAY_TASKING_SYSTEM=OpenMP")
+
INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG TBB_INCLUDE_DIR TBB_LIBRARY TBB_LIBRARY_MALLOC)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB
+ ${TBB_ERROR_MESSAGE}
+ TBB_INCLUDE_DIR TBB_LIBRARY TBB_LIBRARY_MALLOC
+)
+
+# check version
+IF (TBB_INCLUDE_DIR)
+ FILE(READ ${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h TBB_STDDEF_H)
+
+ STRING(REGEX MATCH "#define TBB_VERSION_MAJOR ([0-9]+)" DUMMY "${TBB_STDDEF_H}")
+ SET(TBB_VERSION_MAJOR ${CMAKE_MATCH_1})
+
+ STRING(REGEX MATCH "#define TBB_VERSION_MINOR ([0-9]+)" DUMMY "${TBB_STDDEF_H}")
+ SET(TBB_VERSION "${TBB_VERSION_MAJOR}.${CMAKE_MATCH_1}")
+
+ IF (TBB_VERSION_MAJOR VERSION_LESS TBB_VERSION_REQUIRED)
+ MESSAGE(FATAL_ERROR ${TBB_ERROR_MESSAGE})
+ ENDIF()
+
+ SET(TBB_VERSION ${TBB_VERSION} CACHE STRING "TBB Version")
+ MARK_AS_ADVANCED(TBB_VERSION)
+ENDIF()
IF (TBB_FOUND)
SET(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
- SET(TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_LIBRARY_MALLOC})
+ # NOTE(jda) - TBB found in CentOS 6/7 package manager does not have debug
+ # versions of the library...silently fall-back to using only the
+ # libraries which we actually found.
+ IF (NOT TBB_LIBRARY_DEBUG)
+ SET(TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_LIBRARY_MALLOC})
+ ELSE ()
+ SET(TBB_LIBRARIES
+ optimized ${TBB_LIBRARY} optimized ${TBB_LIBRARY_MALLOC}
+ debug ${TBB_LIBRARY_DEBUG} debug ${TBB_LIBRARY_MALLOC_DEBUG}
+ )
+ ENDIF()
ENDIF()
MARK_AS_ADVANCED(TBB_INCLUDE_DIR)
MARK_AS_ADVANCED(TBB_LIBRARY)
+MARK_AS_ADVANCED(TBB_LIBRARY_DEBUG)
MARK_AS_ADVANCED(TBB_LIBRARY_MALLOC)
-
-##############################################################
-# Install TBB
-##############################################################
-
-IF (WIN32)
- INSTALL(PROGRAMS ${TBB_BINDIR}/tbb.dll ${TBB_BINDIR}/tbbmalloc.dll DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
- INSTALL(PROGRAMS ${TBB_BINDIR}/tbb.dll ${TBB_BINDIR}/tbbmalloc.dll DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
-ELSEIF (EMBREE_ZIP_MODE)
- IF (APPLE)
- INSTALL(PROGRAMS ${EMBREE_TBB_ROOT}/lib/libtbb.dylib ${EMBREE_TBB_ROOT}/lib/libtbbmalloc.dylib DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
- ELSE()
- INSTALL(PROGRAMS ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4/libtbb.so.2 ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4/libtbbmalloc.so.2 DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
- ENDIF()
-ENDIF()
+MARK_AS_ADVANCED(TBB_LIBRARY_MALLOC_DEBUG)
diff --git a/components/ospcommon/cmake/FindTBB.cmake b/components/ospcommon/cmake/FindTBB.cmake
--- a/components/ospcommon/cmake/FindTBB.cmake
+++ b/components/ospcommon/cmake/FindTBB.cmake
@@ -69,14 +69,22 @@
SET(TBB_VCVER vc14)
ENDIF()
- SET(TBB_LIBDIR ${TBB_ROOT}/lib/${TBB_ARCH}/${TBB_VCVER})
- SET(TBB_BINDIR ${TBB_ROOT}/bin/${TBB_ARCH}/${TBB_VCVER})
+ SET(TBB_LIBDIR ${TBB_ROOT}/lib/)
+ SET(TBB_BINDIR ${TBB_ROOT}/bin/)
FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)
- FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${TBB_LIBDIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(TBB_LIBRARY_DEBUG tbb_debug PATHS ${TBB_LIBDIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_LIBDIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(TBB_LIBRARY_MALLOC_DEBUG tbbmalloc_debug PATHS ${TBB_LIBDIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY tbb
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_DEBUG tbb_debug
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC_DEBUG tbbmalloc_debug
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ NO_DEFAULT_PATH)
ELSE ()
diff --git a/ospray/CMakeLists.txt b/ospray/CMakeLists.txt
--- a/ospray/CMakeLists.txt
+++ b/ospray/CMakeLists.txt
@@ -32,6 +32,7 @@
${TBB_ROOT}/../redist/${TBB_ARCH}_win/tbb/${TBB_VCVER}
${TBB_ROOT}/../redist/${TBB_ARCH}/tbb/${TBB_VCVER}
${TBB_ROOT}/bin/${TBB_ARCH}/${TBB_VCVER}
+ ${TBB_ROOT}/bin
)
FIND_FILE(TBB_DLL tbb.dll HINTS ${TBB_DLL_HINTS})
FIND_FILE(TBB_DLL_MALLOC tbbmalloc.dll PATHS HINTS ${TBB_DLL_HINTS})
......@@ -97,12 +97,12 @@ superbuild_set_revision(ispc
URL_MD5 "${ispc_md5}")
superbuild_set_revision(embree
URL "http://www.paraview.org/files/dependencies/embree-2.16.4.tar.gz"
URL_MD5 3d9674024198f2944a13dd0a476ff43c)
URL "http://www.paraview.org/files/dependencies/embree-2.17.0.tar.gz"
URL_MD5 3ea7a72546baee497ae8098bc12f3de6)
superbuild_set_revision(ospray
URL "http://www.paraview.org/files/dependencies/ospray-1.3.0.tar.gz"
URL_MD5 d4d4505ec949d3e88242e9fc8243d50f)
URL "http://www.paraview.org/files/dependencies/ospray-1.4.0.tar.gz"
URL_MD5 2a3a4895c5ec2a42c7af86a51727fb53)
superbuild_set_revision(openvr
URL "http://www.paraview.org/files/dependencies/openvr_1.0.10_win_thin.zip"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment