Commit eff25540 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'add-visrtx'

d72ed6ce visrtx: bundle the library into the packages
dbb80392 paraview: fix variable spelling
0c9d9702 paraview: hook up raytracing options
e98a214e visrtx: add project
efcdc901 nvidiaoptix: add project
5043f18b nvidiamdl: add project
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Tested-by: Tim Biedert's avatarTim Biedert <tbiedert@nvidia.com>
Merge-request: !570
parents a3a1ddd2 d72ed6ce
Pipeline #135885 failed with stage
in 0 seconds
......@@ -123,6 +123,17 @@ function (superbuild_find_projects var)
if (USE_NONFREE_COMPONENTS)
# add non-free projects here.
if (WIN32 OR (UNIX AND NOT APPLE))
# These are publicly available, but are behind logins or license
# acceptances. Rehosted internally at Kitware for build machines.
list(APPEND projects
nvidiamdl
nvidiaoptix)
# These are open source, but require closed SDKs.
list(APPEND projects
visrtx)
endif ()
endif ()
if (WIN32)
......
superbuild_add_project(nvidiamdl
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND
${CMAKE_COMMAND}
-Dsource_location:PATH=<SOURCE_DIR>
-Dinstall_location:PATH=<INSTALL_DIR>
-Dlibdir:STRING=${nvidiamdl_libdir}
-Dlibsuffix:STRING=${CMAKE_SHARED_MODULE_SUFFIX}
-Dlibdest:STRING=${nvidiamdl_libdest}
${nvidiamdl_install_args}
-P "${CMAKE_CURRENT_LIST_DIR}/scripts/nvidiamdl.install.cmake")
superbuild_add_extra_cmake_args(
-DMDL_INSTALL_DIR:PATH=<INSTALL_DIR>)
superbuild_add_project(nvidiaoptix
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND
${CMAKE_COMMAND}
-Dsource_location:PATH=<SOURCE_DIR>
-Dinstall_location:PATH=<INSTALL_DIR>
-Dlibdir:STRING=${nvidiaoptix_libdir}
-Dlibsuffix:STRING=${nvidiaoptix_libsuffix}
-Dlibdest:STRING=${nvidiaoptix_libdest}
-Dbindir:STRING=${nvidiaoptix_bindir}
-Dbinsuffix:STRING=${nvidiaoptix_binsuffix}
-Dbindest:STRING=${nvidiaoptix_bindest}
${nvidiaoptix_install_args}
-P "${CMAKE_CURRENT_LIST_DIR}/scripts/nvidiaoptix.install.cmake")
superbuild_add_extra_cmake_args(
-DOptiX_ROOT:PATH=<INSTALL_DIR>)
......@@ -98,12 +98,17 @@ if (WIN32)
openvr)
endif ()
if (USE_NONFREE_COMPONENTS AND (WIN32 OR (UNIX AND NOT APPLE)))
list(APPEND paraviews_platform_dependencies
visrtx)
endif ()
set(PARAVIEW_ENABLE_PYTHON ${python_enabled})
if (python_enabled AND USE_SYSTEM_python AND NOT python_FIND_LIBRARIES)
set(PARAVIEW_ENABLE_PYTHON OFF)
endif()
if (expat_ENABLED)
if (expat_enabled)
list(APPEND paraviews_platform_dependencies expat)
endif ()
......@@ -126,6 +131,11 @@ else()
set(adios_module_flag "NO")
endif()
set(paraview_use_raytracing OFF)
if (ospray_enabled OR visrtx_enabled)
set(paraview_use_raytracing ON)
endif ()
superbuild_add_project(paraview
DEBUGGABLE
DEFAULT_ON
......@@ -157,8 +167,6 @@ superbuild_add_project(paraview
-DPARAVIEW_ENABLE_LAS:BOOL=${las_enabled}
-DPARAVIEW_ENABLE_MOTIONFX:BOOL=${PARAVIEW_ENABLE_MOTIONFX}
-DPARAVIEW_USE_MPI:BOOL=${mpi_enabled}
-DPARAVIEW_USE_OSPRAY:BOOL=${ospray_enabled}
-DVTKOSPRAY_ENABLE_DENOISER:BOOL=${openimagedenoise_enabled}
-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=${visitbridge_enabled}
-DVISIT_BUILD_READER_Silo:BOOL=${silo_enabled}
-DVISIT_BUILD_READER_Boxlib3D:BOOL=${boxlib_enabled}
......@@ -184,6 +192,12 @@ superbuild_add_project(paraview
-DPARAVIEW_BUILD_MESA_LAUNCHER:BOOL=${mesa_enabled}
-DPARAVIEW_MESA_LIBDIR:STRING=${paraview_mesa_libdir}
# raytracing flags
-DPARAVIEW_USE_RAYTRACING:BOOL=${paraview_use_raytracing}
-DVTKOSPRAY_ENABLE_DENOISER:BOOL=${openimagedenoise_enabled}
-DVTK_ENABLE_OSPRAY:BOOL=${ospray_enabled}
-DVTK_ENABLE_VISRTX:BOOL=${visrtx_enabled}
# IndeX
-DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX:BOOL=${nvidiaindex_enabled}
......
# Install headers
file(INSTALL
"${source_location}/include/"
DESTINATION "${install_location}/include")
# Install libraries
file(INSTALL
"${source_location}/${libdir}/"
DESTINATION "${install_location}/${libdest}"
FILES_MATCHING
PATTERN "*${libsuffix}")
# Install headers
file(INSTALL
"${source_location}/include/"
DESTINATION "${install_location}/include")
# Install libraries
file(INSTALL
"${source_location}/${libdir}/"
DESTINATION "${install_location}/${libdest}"
FILES_MATCHING
PATTERN "*${libsuffix}*")
if (bindir)
# Install binaries
file(INSTALL
"${source_location}/${bindir}/"
DESTINATION "${install_location}/${bindest}"
FILES_MATCHING
PATTERN "*${binsuffix}*")
endif ()
set(nvidiamdl_libdir linux-x86-64/lib)
set(nvidiamdl_libdest lib)
include(nvidiamdl.common)
set(nvidiaoptix_libdir lib64)
set(nvidiaoptix_libdest lib)
set(nvidiaoptix_libsuffix .so)
include(nvidiaoptix.common)
......@@ -110,6 +110,30 @@ if (ospray_enabled)
endforeach ()
endif ()
if (visrtx_enabled)
set(visrtxextra_libraries
libVisRTX
dds
nv_freeimage
libmdl_sdk)
foreach (visrtxextra_library IN LISTS visrtxextra_libraries)
file(GLOB lib_filenames
RELATIVE "${superbuild_install_location}/lib"
"${superbuild_install_location}/lib/${visrtxextra_library}.so*")
foreach (lib_filename IN LISTS lib_filenames)
superbuild_unix_install_plugin("${lib_filename}"
"lib"
"lib"
LOADER_PATHS "${library_paths}"
LOCATION "lib"
SEARCH_DIRECTORIES "/usr/lib64/libglvnd" "/usr/lib/libglvnd"
EXCLUDE_REGEXES ".*/libGLX.so.*")
endforeach ()
endforeach ()
endif ()
if (python_enabled)
file(GLOB egg_dirs
"${superbuild_install_location}/lib/python2.7/site-packages/*.egg/")
......
superbuild_add_project(visrtx
DEPENDS nvidiamdl nvidiaoptix
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_MACOSX_RPATH:BOOL=FALSE
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
-DCMAKE_INSTALL_LIBDIR:STRING=lib)
set(nvidiamdl_libdir nt-x86-64/lib)
set(nvidiamdl_libdest bin)
include(nvidiamdl.common)
set(nvidiaoptix_libdir lib64)
set(nvidiaoptix_libdest lib)
set(nvidiaoptix_libsuffix .lib)
set(nvidiaoptix_bindir bin64)
set(nvidiaoptix_bindest bin)
set(nvidiaoptix_binsuffix .dll)
include(nvidiaoptix.common)
......@@ -98,6 +98,20 @@ if (ospray_enabled)
endforeach ()
endif ()
if (visrtx_enabled)
set(visrtxextra_libraries
VisRTX
dds
nv_freeimage
mdl_sdk)
foreach (visrtxextra_library IN LISTS visrtxextra_libraries)
superbuild_windows_install_plugin("${visrtxextra_library}.dll"
"bin" "bin"
SEARCH_DIRECTORIES "${superbuild_install_location}/bin")
endforeach ()
endif ()
if (python_enabled)
include(python.functions)
superbuild_install_superbuild_python()
......
......@@ -167,3 +167,22 @@ superbuild_set_selectable_source(nvidiaindex
SELECT 2.1
URL "http://www.paraview.org/files/dependencies/nvidia-index-libs-2.1.20180314-${nvidiaindex_platform}.tar.bz2"
URL_MD5 "${nvidiaindex_2_1_md5}")
if (WIN32)
set(nvidiaoptix_platform "win64")
set(nvidiaoptix_md5 "1cc3026f4a1fc945e7158e8a66f8f9bd")
elseif (UNIX AND NOT APPLE)
set(nvidiaoptix_platform "linux64")
set(nvidiaoptix_md5 "b5e9cdcb691ad7813e4e24986579a1ef")
endif ()
superbuild_set_revision(nvidiaoptix
URL "http://www.paraview.org/files/dependencies/internal/NVIDIA-OptiX-SDK-6.0.0-${nvidiaoptix_platform}-25650775.tar.gz"
URL_MD5 "${nvidiaoptix_md5}")
superbuild_set_revision(nvidiamdl
URL "http://www.paraview.org/files/dependencies/internal/mdl-sdk-314800.830.tar.bz2"
URL_MD5 "d500a122918741eb418887d66e03325b")
superbuild_set_revision(visrtx
GIT_REPOSITORY "https://github.com/NVIDIA/VisRTX.git"
GIT_TAG "44fb1a93e44e3af4312f5ee20ba38ab138948acc") # 0.1.5 + patches
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