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

Merge topic 'WIP-test-5.6.1-binary-build' into release

b9175f9f bump the default version to 5.6.1
c3711476 make the sdk package the public ospray includes
27ce1c85 boxlib: fix with 3.14 build
f3bbdc1d

 make AVX minimum default instruction set for embree
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Merge-request: !590
parents ac2320ce b9175f9f
......@@ -10,7 +10,7 @@ macro (superbuild_setup_variables)
if (paraview_SOURCE_SELECTION STREQUAL "git")
# Assuming master; just use the latest version, but let the user set their
# own version in case it is actually a branch from some other version.
set(PARAVIEW_VERSION_DEFAULT "5.6.0"
set(PARAVIEW_VERSION_DEFAULT "5.6.1"
CACHE STRING "The default version of ParaView to use if it cannot be detected")
mark_as_advanced(PARAVIEW_VERSION_DEFAULT)
set(paraview_default_version "${PARAVIEW_VERSION_DEFAULT}")
......
set(embree_BUILD_ISA "DEFAULT" CACHE STRING "ISAs to build Embree for")
mark_as_advanced(embree_BUILD_ISA)
#by default, turn off very old and very new SIMD instruction sets
#because they are problematic on our dashboards
set(embree_allow_sse2 "-DEMBREE_ISA_SSE2:BOOL=OFF")
set(embree_allow_sse42 "-DEMBREE_ISA_SSE42:BOOL=OFF")
set(embree_allow_skx "-DEMBREE_ISA_AVX512SKX:BOOL=OFF")
#build the list of SIMD instruction sets we will enable
set(embree_isa_args)
set(embree_allow_skx "-DEMBREE_ISA_AVX512SKX:BOOL=OFF") #default off due to flaky trycompile
if(NOT (embree_BUILD_ISA STREQUAL "DEFAULT"))
if(embree_BUILD_ISA STREQUAL "ALL")
set(embree_BUILD_ISA SSE2 SSE42 AVX AVX2 AVX512KNL AVX512SKX)
......@@ -9,6 +16,12 @@ if(NOT (embree_BUILD_ISA STREQUAL "DEFAULT"))
list(APPEND embree_isa_args -DEMBREE_MAX_ISA:BOOL=NONE)
foreach(isa IN LISTS embree_BUILD_ISA)
list(APPEND embree_isa_args -DEMBREE_ISA_${isa}:BOOL=ON)
if (isa MATCHES "SSE2")
set(embree_allow_sse2)
endif()
if (isa MATCHES "SSE42")
set(embree_allow_sse42)
endif()
if (isa MATCHES "AVX512SKX")
set(embree_allow_skx)
endif()
......@@ -19,6 +32,8 @@ superbuild_add_project(embree
DEPENDS ispc tbb cxx11
CMAKE_ARGS
${embree_isa_args}
${embree_allow_sse2}
${embree_allow_sse42}
${embree_allow_skx}
-DBUILD_TESTING:BOOL=OFF
-DEMBREE_ISPC_EXECUTABLE:PATH=<INSTALL_DIR>/bin/ispc
......
......@@ -14,6 +14,19 @@ else ()
set(sed_cmd_suffix -i)
endif ()
foreach (cmake_file IN LISTS cmake_files)
execute_process(
COMMAND
${sed_cmd_prefix}
-e "s|${install_location}/include/ospray|\${_IMPORT_PREFIX}/include/paraview-${paraview_version}/ospray|g"
${sed_cmd_suffix}
"${cmake_file}"
RESULT_VARIABLE RES)
if (NOT RES EQUAL 0)
message(FATAL_ERROR "Failed to patch ${cmake_file}")
endif ()
endforeach ()
foreach (cmake_file IN LISTS cmake_files)
execute_process(
COMMAND
......
......@@ -8,5 +8,6 @@ superbuild_add_project(boxlib
DEPENDS_OPTIONAL mpi
CMAKE_ARGS
-DBL_SPACEDIM:STRING=3
-DBL_USE_PARTICLES:STRING=1
-DENABLE_POSITION_INDEPENDENT_CODE:BOOL=TRUE
-DENABLE_MPI:BOOL=${boxlib_mpi_flag})
......@@ -64,6 +64,15 @@ if (tbb_built_by_superbuild)
USE_SOURCE_PERMISSIONS)
endif ()
# Extra ospray headers that are in the public interface
if (ospray_built_by_superbuild)
install(
DIRECTORY "${superbuild_install_location}/include/ospray"
DESTINATION "include/paraview-${paraview_version}"
COMPONENT superbuild
USE_SOURCE_PERMISSIONS)
endif ()
############################################################
# The rest of this deals with installing dependencies
############################################################
......
......@@ -47,9 +47,9 @@ superbuild_set_revision(paraviewtutorialdata
# on this assumption.
superbuild_set_selectable_source(paraview
# NOTE: When updating this selection, also update `README.md` and CMakeLists.txt.
SELECT 5.6.0 DEFAULT
URL "http://www.paraview.org/files/v5.6/ParaView-v5.6.0.tar.xz"
URL_MD5 eefb05c36ba2c3a6b25991b73f699981
SELECT 5.6.1 DEFAULT
URL "http://www.paraview.org/files/v5.6/ParaView-v5.6.1.tar.xz"
URL_MD5 e3b63c972df3d06da92fedb79370d16c
SELECT git CUSTOMIZABLE
GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"
GIT_TAG "origin/master"
......
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