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

Merge topic 'ospray-with-denoiser'

9cf07d5e work around compiler issue seen on our mac machine
f92a2fd4

 package and turn on denoiser for ospray builds
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Michael Migliore's avatarMichael Migliore <michael.migliore@kitware.com>
Merge-request: !556
parents 4d542fc5 9cf07d5e
Pipeline #134929 failed with stage
in 0 seconds
......@@ -53,6 +53,7 @@ function (superbuild_find_projects var)
netcdf
numpy
ospray
openimagedenoise
paraviewweb
paraviewwebglance
paraviewweblite
......
superbuild_add_project(openimagedenoise
DEPENDS tbb cxx11
)
superbuild_apply_patch(openimagedenoise fix-openmpsimd
"Fix missing compiler flag in openimagedenoise")
......@@ -10,7 +10,7 @@ mark_as_advanced(ospray_BUILD_ISA)
set_property(CACHE ospray_BUILD_ISA PROPERTY STRINGS SSE AVX AVX2 AVX512KNL AVX512SKX ALL)
superbuild_add_project(ospray
DEPENDS ispc tbb cxx11 embree ospraymaterials
DEPENDS ispc tbb cxx11 embree ospraymaterials openimagedenoise
CMAKE_ARGS
-DTBB_ROOT:PATH=<INSTALL_DIR>
-DOSPRAY_ISPC_DIRECTORY:PATH=<INSTALL_DIR>/bin
......
......@@ -158,6 +158,7 @@ superbuild_add_project(paraview
-DPARAVIEW_ENABLE_MOTIONFX:BOOL=${PARAVIEW_ENABLE_MOTIONFX}
-DPARAVIEW_USE_MPI:BOOL=${mpi_enabled}
-DPARAVIEW_USE_OSPRAY:BOOL=${ospray_enabled}
-DVTKOSPRAY_ENABLE_DENOISER:BOOL=${ospray_enabled}
-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=${visitbridge_enabled}
-DVISIT_BUILD_READER_Silo:BOOL=${silo_enabled}
-DVISIT_BUILD_READER_Boxlib3D:BOOL=${boxlib_enabled}
......
diff --git a/mkl-dnn/cmake/OpenMP.cmake b/mkl-dnn/cmake/OpenMP.cmake
index dc0c3db..8609d58 100644
--- a/mkl-dnn/cmake/OpenMP.cmake
+++ b/mkl-dnn/cmake/OpenMP.cmake
@@ -17,6 +17,8 @@
# Manage OpenMP-related compiler flags
#===============================================================================
+include(CheckCXXCompilerFlag)
+
if(OpenMP_cmake_included)
return()
endif()
@@ -38,8 +40,11 @@ if (NOT MKLDNN_THREADING MATCHES "OMP")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qopenmp-simd")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qopenmp-simd")
else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp-simd")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp-simd")
+ check_cxx_compiler_flag("-fopenmp-simd" openmp_simd_avail)
+ if (openmp_simd_avail)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp-simd")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp-simd")
+ endif()
endif()
return()
endif()
......@@ -114,6 +114,10 @@ superbuild_set_revision(ospraymaterials
URL "https://www.paraview.org/files/data/OSPRayMaterials-0.1.tar.gz"
URL_MD5 0b95d2ad4fa79d457278c48125f3d111)
superbuild_set_revision(openimagedenoise
URL "https://www.paraview.org/files/dependencies/oidn-0.8.1.src.tar.gz"
URL_MD5 4951edc5422682b639595c9fc8dbadcc)
superbuild_set_revision(openvr
URL "https://www.paraview.org/files/dependencies/openvr_1.0.10_win_thin.zip"
URL_MD5 062a029869423808aebc32f85edf38e2)
......
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