Commit 1c15fdba authored by David E. DeMarle's avatar David E. DeMarle Committed by Kitware Robot
Browse files

Merge topic 'bump-ospray-and-embree'

90647135 keep embree 2.17 but patch over ospray's findtbb like before
947ec0d9

 bump to ospray 1.4.0 and embree 2.17
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !379
parents 26dc3e21 90647135
Pipeline #78798 canceled with stage
......@@ -25,7 +25,3 @@ superbuild_add_project(embree
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")
From c7170143fae885fcb89b5ed9d9968bc3e454152e Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Tue, 1 Aug 2017 13:55:44 -0400
Subject: [PATCH] Remove relative paths in cmake pacakge-config
Using relative paths in the cmake config can result in broken
dependencies in downstream packaging when embree is a private
dependency. This converts the relative paths generated in
embree-config.cmake from /foo/bar/baz/../../libFoo.so to /foo/libFoo.so
---
common/cmake/embree-config.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/cmake/embree-config.cmake b/common/cmake/embree-config.cmake
index 689f6990e..b3d6793a0 100644
--- a/common/cmake/embree-config.cmake
+++ b/common/cmake/embree-config.cmake
@@ -15,6 +15,7 @@
## ======================================================================== ##
SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/@EMBREE_RELATIV_ROOT_DIR@)
+GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" ABSOLUTE)
SET(EMBREE_INCLUDE_DIRS ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_INCLUDEDIR@)
SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_NAME@)
--
2.13.3
--- 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
diff --git a/common/cmake/FindTBB.cmake b/common/cmake/FindTBB.cmake
index faa53ad16..839f82bce 100644
--- a/common/cmake/FindTBB.cmake
+++ b/common/cmake/FindTBB.cmake
@@ -14,13 +14,44 @@
## limitations under the License. ##
## ======================================================================== ##
+SET(TBB_MAJOR_VERSION_REQUIRED "3.0")
+SET(TBB_VERSION_REQUIRED "3.0")
+
+IF (NOT TBB_ROOT)
+ SET(TBB_ROOT $ENV{TBB_ROOT})
......@@ -49,7 +51,7 @@
IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(TBB_ARCH intel64)
@@ -32,79 +63,104 @@
@@ -32,96 +63,112 @@ IF (WIN32)
SET(TBB_VCVER vc10)
ELSEIF (MSVC11)
SET(TBB_VCVER vc11)
......@@ -62,8 +64,7 @@
- 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/)
+ SET(TBB_LIBDIR ${TBB_ROOT}/lib)
- IF (EMBREE_TBB_ROOT STREQUAL "")
- FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h)
......@@ -79,16 +80,24 @@
- 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}
+ PATHS
+ ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ ${TBB_LIBDIR}
+ NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_DEBUG tbb_debug
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ PATHS
+ ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ ${TBB_LIBDIR}
+ NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ PATHS
+ ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ ${TBB_LIBDIR}
+ NO_DEFAULT_PATH)
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC_DEBUG tbbmalloc_debug
+ PATHS ${TBB_LIBDIR} ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ PATHS
+ ${TBB_LIBDIR}/${TBB_ARCH}/${TBB_VCVER}
+ ${TBB_LIBDIR}
+ NO_DEFAULT_PATH)
ELSE ()
......@@ -103,13 +112,32 @@
+ ${PROJECT_SOURCE_DIR}/tbb
+ /opt/intel/composerxe/tbb
+ /opt/intel/compilers_and_libraries/tbb
+ /opt/intel/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)
-
- ELSEIF (EXISTS ${EMBREE_TBB_ROOT}/cmake/TBBBuild.cmake)
- OPTION(EMBREE_TBB_STATIC_LIB "Build TBB as a static library (building TBB as a static library is NOT recommended)")
- if (EMBREE_TBB_STATIC_LIB)
- include(${EMBREE_TBB_ROOT}/cmake/TBBBuild.cmake)
- tbb_build(TBB_ROOT ${EMBREE_TBB_ROOT} CONFIG_DIR TBB_DIR MAKE_ARGS extra_inc=big_iron.inc)
- SET(TBB_INCLUDE_DIR ${EMBREE_TBB_ROOT}/include)
- SET(TBB_LIBRARY ${PROJECT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir_release/libtbb.a)
- SET(TBB_LIBRARY_MALLOC ${PROJECT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir_release/libtbbmalloc.a)
- else()
- include(${EMBREE_TBB_ROOT}/cmake/TBBBuild.cmake)
- tbb_build(TBB_ROOT ${EMBREE_TBB_ROOT} CONFIG_DIR TBB_DIR)
- SET(TBB_INCLUDE_DIR ${EMBREE_TBB_ROOT}/include)
- SET(TBB_LIBRARY ${PROJECT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir_release/libtbb.so.2)
- SET(TBB_LIBRARY_MALLOC ${PROJECT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir_release/libtbbmalloc.so.2)
- endif()
-
+
+ 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)
......@@ -142,7 +170,7 @@
+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.
+ "Threading Building Blocks (TBB) with minimum version ${TBB_VERSION_REQUIRED} 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")
+
......@@ -163,7 +191,7 @@
+ 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)
+ IF (TBB_VERSION VERSION_LESS TBB_VERSION_REQUIRED)
+ MESSAGE(FATAL_ERROR ${TBB_ERROR_MESSAGE})
+ ENDIF()
+
......@@ -198,7 +226,7 @@
-
-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)
- INSTALL(PROGRAMS ${TBB_LIBDIR}/tbb.lib ${TBB_LIBDIR}/tbbmalloc.lib 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)
......
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