Commit 6e7215ac authored by David E. DeMarle's avatar David E. DeMarle Committed by Cory Quammen
Browse files

changes to fix ospray under cray toolchain

bump embree to latest release to get most of the fixes.
Apply a patch corresponding to embree commit 7c0f6fc for another.
With this it should work.

Now update and reapply the findtbb patch to apply to newer embree.
The patch is really copying over ospray's findtbb, which we modify
to work with pv superbuild's install layout.

(cherry picked from commit 645aa3b1)
parent 7c510fe9
......@@ -12,3 +12,5 @@ superbuild_add_project(embree
superbuild_apply_patch(embree improve-findtbb
"Improve FindTBB")
superbuild_apply_patch(embree fix-cray
"Fix compilation under Cray Wrapper")
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")
diff --git a/common/cmake/FindTBB.cmake b/common/cmake/FindTBB.cmake
--- a/common/cmake/FindTBB.cmake
+++ b/common/cmake/FindTBB.cmake
--- 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. ##
## ======================================================================== ##
......@@ -50,7 +49,7 @@ diff --git a/common/cmake/FindTBB.cmake b/common/cmake/FindTBB.cmake
IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(TBB_ARCH intel64)
@@ -32,79 +63,103 @@
@@ -32,79 +63,104 @@
SET(TBB_VCVER vc10)
ELSEIF (MSVC11)
SET(TBB_VCVER vc11)
......@@ -97,7 +96,7 @@ diff --git a/common/cmake/FindTBB.cmake b/common/cmake/FindTBB.cmake
- 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/composerxe/tbb
- PATHS ${PROJECT_SOURCE_DIR}/tbb /opt/intel/tbb
- NO_DEFAULT_PATH
+ HINTS ${TBB_ROOT}
+ PATHS
......@@ -131,10 +130,11 @@ diff --git a/common/cmake/FindTBB.cmake b/common/cmake/FindTBB.cmake
- 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)
+ FIND_LIBRARY(TBB_LIBRARY libtbb.so.2 HINTS ${TBB_ROOT}/lib/intel64/gcc4.4)
+ FIND_LIBRARY(TBB_LIBRARY_DEBUG libtbb_debug.so.2 HINTS ${TBB_ROOT}/lib/intel64/gcc4.4)
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC libtbbmalloc.so.2 HINTS ${TBB_ROOT}/lib/intel64/gcc4.4)
+ FIND_LIBRARY(TBB_LIBRARY_MALLOC_DEBUG libtbbmalloc_debug.so.2 HINTS ${TBB_ROOT}/lib/intel64/gcc4.4)
+ 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()
......
......@@ -109,8 +109,8 @@ superbuild_set_selectable_source(vtkm
GIT_TAG "origin/master")
superbuild_set_revision(embree
URL "http://www.paraview.org/files/dependencies/embree-2.15.0.tar.gz"
URL_MD5 4e77e6f30f1ea99ee40be49b68f9f8cc)
URL "http://www.paraview.org/files/dependencies/embree-2.16.4.tar.gz"
URL_MD5 3d9674024198f2944a13dd0a476ff43c)
superbuild_set_revision(ospray
URL "http://www.paraview.org/files/dependencies/ospray-1.3.0.tar.gz"
......
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