From 06a3ca14953c3931af008a418e5c52229b58bc56 Mon Sep 17 00:00:00 2001 From: Vishwajeet Narwal Date: Fri, 28 Apr 2023 23:42:18 -0700 Subject: [PATCH 1/5] Added ospTutorialGLM from ospray/apps/ospTutorial --- .../Tutorial/ospTutorialGLM/CMakeLists.txt | 51 ++ .../cmake/dependencies/glm.cmake | 55 ++ .../ospTutorialGLM/cmake/ospray_macros.cmake | 531 ++++++++++++++++++ .../ospTutorialGLM/ospTutorialGLM.cpp | 144 +++++ 4 files changed, 781 insertions(+) create mode 100644 RenderingToolkit/Tutorial/ospTutorialGLM/CMakeLists.txt create mode 100644 RenderingToolkit/Tutorial/ospTutorialGLM/cmake/dependencies/glm.cmake create mode 100644 RenderingToolkit/Tutorial/ospTutorialGLM/cmake/ospray_macros.cmake create mode 100644 RenderingToolkit/Tutorial/ospTutorialGLM/ospTutorialGLM.cpp diff --git a/RenderingToolkit/Tutorial/ospTutorialGLM/CMakeLists.txt b/RenderingToolkit/Tutorial/ospTutorialGLM/CMakeLists.txt new file mode 100644 index 0000000000..8e4953d4ea --- /dev/null +++ b/RenderingToolkit/Tutorial/ospTutorialGLM/CMakeLists.txt @@ -0,0 +1,51 @@ +cmake_minimum_required(VERSION 3.16) +project(OSPRAY_TUTORIAL_GLM LANGUAGES CXX) + +include(CMakePrintHelpers) +include(GNUInstallDirs) + + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) + +list(APPEND CMAKE_MODULE_PATH + ${PROJECT_SOURCE_DIR}/cmake/dependencies +) + + +set(INSTALL_DIR_ABSOLUTE "Release") +set(ONEAPI_ROOT "") +if(DEFINED ENV{ONEAPI_ROOT}) + set(ONEAPI_ROOT "$ENV{ONEAPI_ROOT}") + message(STATUS "ONEAPI_ROOT FROM ENVIRONMENT: ${ONEAPI_ROOT}") +else() + if(WIN32) + set(ONEAPI_ROOT "C:/Program Files (x86)/Intel/oneAPI") + else() + set(ONEAPI_ROOT /opt/intel/oneapi) + endif() + message(STATUS "ONEAPI_ROOT DEFAULT: ${ONEAPI_ROOT}") +endif(DEFINED ENV{ONEAPI_ROOT}) + +list(APPEND CMAKE_PREFIX_PATH "${ONEAPI_ROOT}/rkcommon/latest") +find_package(ospray REQUIRED PATHS ${ONEAPI_ROOT}) + +if(MSVC) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) +else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +endif(MSVC) + +include_directories(${OSPRAY_INCLUDE_DIR} ${RKCOMMON_INCLUDE_DIRS}) +link_directories(${OSPRAY_ROOT}/lib ${ONEAPI_ROOT}/rkcommon/latest/lib) + +include(cmake/ospray_macros.cmake) +include(cmake/dependencies/glm.cmake) + +link_libraries(ospray rkcommon) + +add_executable(ospTutorialGLM ${OSPRAY_RESOURCE} ospTutorialGLM.cpp) +target_link_libraries(ospTutorialGLM PRIVATE ospray glm) diff --git a/RenderingToolkit/Tutorial/ospTutorialGLM/cmake/dependencies/glm.cmake b/RenderingToolkit/Tutorial/ospTutorialGLM/cmake/dependencies/glm.cmake new file mode 100644 index 0000000000..eb464c79a5 --- /dev/null +++ b/RenderingToolkit/Tutorial/ospTutorialGLM/cmake/dependencies/glm.cmake @@ -0,0 +1,55 @@ +## Copyright 2020 Intel Corporation +## SPDX-License-Identifier: Apache-2.0 + +if(glm_FOUND) + return() +endif() + +if(NOT DEFINED GLM_VERSION) + set(GLM_VERSION 0.9.9.8) +endif() + +## Look for any available version +message(STATUS "Looking for glm ${GLM_VERSION}") +find_package(glm ${GLM_VERSION} QUIET) + +if(glm_FOUND) + message(STATUS "Found glm") +else() + ## Download and build if not found + set(_ARCHIVE_EXT "zip") + + if(NOT DEFINED GLM_URL) + set(GLM_URL "https://github.com/g-truc/glm/releases/download/${GLM_VERSION}/glm-${GLM_VERSION}.${_ARCHIVE_EXT}") + endif() + + message(STATUS "Downloading glm ${GLM_URL}...") + + include(FetchContent) + + FetchContent_Declare( + glm + URL "${GLM_URL}" + # `patch` is not available on all systems, so use `git apply` instead.Note + # that we initialize a Git repo in the GLM download directory to allow the + # Git patching approach to work.Also note that we don't want to actually + # check out the GLM Git repo, since we want our GLM_HASH security checks + # to still function correctly. + PATCH_COMMAND git init -q . && git apply --ignore-whitespace -v -p1 < ${CMAKE_CURRENT_LIST_DIR}/glm.patch + ) + ## Bypass FetchContent_MakeAvailable() shortcut to disable install + FetchContent_GetProperties(glm) + if(NOT glm_POPULATED) + FetchContent_Populate(glm) + message(STATUS "Adding subdirectory for glm ${glm_SOURCE_DIR} and ${glm_BINARY_DIR}") + + ## the subdir will still be built since targets depend on it, but it won't be installed + add_subdirectory(${glm_SOURCE_DIR} ${glm_BINARY_DIR} EXCLUDE_FROM_ALL) + endif() + message(STATUS "Adding glm Library") + + add_library(glm::glm ALIAS glm) + + unset(${_ARCHIVE_EXT}) + +endif() diff --git a/RenderingToolkit/Tutorial/ospTutorialGLM/cmake/ospray_macros.cmake b/RenderingToolkit/Tutorial/ospTutorialGLM/cmake/ospray_macros.cmake new file mode 100644 index 0000000000..f581f3ecf3 --- /dev/null +++ b/RenderingToolkit/Tutorial/ospTutorialGLM/cmake/ospray_macros.cmake @@ -0,0 +1,531 @@ +## Copyright 2009 Intel Corporation +## SPDX-License-Identifier: Apache-2.0 + +include(CMakeFindDependencyMacro) + +## Macro for printing CMake variables ## +macro(print var) + message("${var} = ${${var}}") +endmacro() + +## Get a list of subdirectories (single level) under a given directory +macro(get_subdirectories result curdir) + file(GLOB children RELATIVE ${curdir} ${curdir}/*) + set(dirlist "") + foreach(child ${children}) + if(IS_DIRECTORY ${curdir}/${child}) + list(APPEND dirlist ${child}) + endif() + endforeach() + set(${result} ${dirlist}) +endmacro() + +## Get all subdirectories and call add_subdirectory() if it has a CMakeLists.txt +macro(add_all_subdirectories_except except) + set(e ${except}) + file(GLOB dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ *) + foreach(dir ${dirs}) + if (NOT "${dir}X" STREQUAL "${except}X" AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/CMakeLists.txt) + add_subdirectory(${dir}) + endif() + endforeach() +endmacro() +macro(add_all_subdirectories) + add_all_subdirectories_except("") +endmacro() + +## Setup CMAKE_BUILD_TYPE to have a default + cycle between options in UI +macro(ospray_configure_build_type) + set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo") + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the build type." FORCE) + endif() + if (WIN32) + if (NOT OSPRAY_DEFAULT_CMAKE_CONFIGURATION_TYPES_SET) + set(CMAKE_CONFIGURATION_TYPES "${CONFIGURATION_TYPES}" + CACHE STRING "List of generated configurations." FORCE) + set(OSPRAY_DEFAULT_CMAKE_CONFIGURATION_TYPES_SET ON + CACHE INTERNAL "Default CMake configuration types set.") + endif() + else() + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CONFIGURATION_TYPES}) + endif() + + if (${CMAKE_BUILD_TYPE} STREQUAL "Release") + set(OSPRAY_BUILD_RELEASE TRUE ) + set(OSPRAY_BUILD_DEBUG FALSE) + set(OSPRAY_BUILD_RELWITHDEBINFO FALSE) + elseif (${CMAKE_BUILD_TYPE} STREQUAL "Debug") + set(OSPRAY_BUILD_RELEASE FALSE) + set(OSPRAY_BUILD_DEBUG TRUE ) + set(OSPRAY_BUILD_RELWITHDEBINFO FALSE) + else() + set(OSPRAY_BUILD_RELEASE FALSE) + set(OSPRAY_BUILD_DEBUG FALSE) + set(OSPRAY_BUILD_RELWITHDEBINFO TRUE ) + endif() +endmacro() + +# workaround link issues to Embree ISPC exports +# ISPC only adds the ISA suffix during name mangling (and dynamic dispatch +# code) when compiling for multiple targets. Thus, when only one OSPRay ISA is +# selected, but Embree was compiled for multiple ISAs, we need to add a +# second, different, supported dummy target. +macro(ospray_fix_ispc_target_list) + list(LENGTH OSPRAY_ISPC_TARGET_LIST NUM_TARGETS) + if (NUM_TARGETS EQUAL 1 + AND NOT OSPRAY_ISPC_TARGET_LIST STREQUAL "neon-i32x4" + AND NOT OSPRAY_ISPC_TARGET_LIST STREQUAL "neon-i32x8") + if (EMBREE_ISA_SUPPORTS_SSE4 AND + NOT OSPRAY_ISPC_TARGET_LIST STREQUAL "sse4") + list(APPEND OSPRAY_ISPC_TARGET_LIST sse4) + elseif (EMBREE_ISA_SUPPORTS_AVX AND + NOT OSPRAY_ISPC_TARGET_LIST STREQUAL "avx") + list(APPEND OSPRAY_ISPC_TARGET_LIST avx) + elseif (EMBREE_ISA_SUPPORTS_AVX2 AND + NOT OSPRAY_ISPC_TARGET_LIST STREQUAL "avx2") + list(APPEND OSPRAY_ISPC_TARGET_LIST avx2) + elseif (EMBREE_ISA_SUPPORTS_AVX512SKX AND + NOT OSPRAY_ISPC_TARGET_LIST STREQUAL "avx512skx-i32x16") + list(APPEND OSPRAY_ISPC_TARGET_LIST avx512skx-i32x16) + elseif (EMBREE_ISA_SUPPORTS_NEON AND + NOT OSPRAY_ISPC_TARGET_LIST STREQUAL "neon-i32x4") + list(APPEND OSPRAY_ISPC_TARGET_LIST neon-i32x4) + elseif (EMBREE_ISA_SUPPORTS_NEON2X AND + NOT OSPRAY_ISPC_TARGET_LIST STREQUAL "neon-i32x8") + list(APPEND OSPRAY_ISPC_TARGET_LIST neon-i32x8) + endif() + endif() +endmacro() + +## Macro configure ISA targets for ispc ## +macro(ospray_configure_ispc_isa) + + set(OSPRAY_BUILD_ISA "ALL" CACHE STRING + "Target ISA (SSE4, AVX, AVX2, AVX512SKX, NEON, NEON2X, or ALL)") + string(TOUPPER ${OSPRAY_BUILD_ISA} OSPRAY_BUILD_ISA) + + if(EMBREE_ISA_SUPPORTS_SSE4 AND OPENVKL_ISA_SSE4) + set(OSPRAY_SUPPORTED_ISAS ${OSPRAY_SUPPORTED_ISAS} SSE4) + endif() + if(EMBREE_ISA_SUPPORTS_AVX AND OPENVKL_ISA_AVX) + set(OSPRAY_SUPPORTED_ISAS ${OSPRAY_SUPPORTED_ISAS} AVX) + endif() + if(EMBREE_ISA_SUPPORTS_AVX2 AND OPENVKL_ISA_AVX2) + set(OSPRAY_SUPPORTED_ISAS ${OSPRAY_SUPPORTED_ISAS} AVX2) + endif() + if(EMBREE_ISA_SUPPORTS_AVX512SKX AND OPENVKL_ISA_AVX512SKX) + set(OSPRAY_SUPPORTED_ISAS ${OSPRAY_SUPPORTED_ISAS} AVX512SKX) + endif() + if(EMBREE_ISA_SUPPORTS_NEON AND OPENVKL_ISA_NEON) + set(OSPRAY_SUPPORTED_ISAS ${OSPRAY_SUPPORTED_ISAS} NEON) + endif() + if(EMBREE_ISA_SUPPORTS_NEON2X AND OPENVKL_ISA_NEON2X) + set(OSPRAY_SUPPORTED_ISAS ${OSPRAY_SUPPORTED_ISAS} NEON2X) + endif() + + set_property(CACHE OSPRAY_BUILD_ISA PROPERTY STRINGS + ALL ${OSPRAY_SUPPORTED_ISAS}) + + unset(OSPRAY_ISPC_TARGET_LIST) + if (OSPRAY_BUILD_ISA STREQUAL "ALL") + + if(EMBREE_ISA_SUPPORTS_SSE4 AND OPENVKL_ISA_SSE4) + set(OSPRAY_ISPC_TARGET_LIST ${OSPRAY_ISPC_TARGET_LIST} sse4) + message(STATUS "OSPRay SSE4 ISA target enabled.") + endif() + if(EMBREE_ISA_SUPPORTS_AVX AND OPENVKL_ISA_AVX) + set(OSPRAY_ISPC_TARGET_LIST ${OSPRAY_ISPC_TARGET_LIST} avx) + message(STATUS "OSPRay AVX ISA target enabled.") + endif() + if(EMBREE_ISA_SUPPORTS_AVX2 AND OPENVKL_ISA_AVX2) + set(OSPRAY_ISPC_TARGET_LIST ${OSPRAY_ISPC_TARGET_LIST} avx2) + message(STATUS "OSPRay AVX2 ISA target enabled.") + endif() + if(EMBREE_ISA_SUPPORTS_AVX512SKX AND OPENVKL_ISA_AVX512SKX) + set(OSPRAY_ISPC_TARGET_LIST ${OSPRAY_ISPC_TARGET_LIST} avx512skx-i32x16) + message(STATUS "OSPRay AVX512SKX ISA target enabled.") + endif() + if(EMBREE_ISA_SUPPORTS_NEON AND OPENVKL_ISA_NEON) + set(OSPRAY_ISPC_TARGET_LIST ${OSPRAY_ISPC_TARGET_LIST} neon-i32x4) + message(STATUS "OSPRay NEON ISA target enabled.") + endif() + if(EMBREE_ISA_SUPPORTS_NEON2X AND OPENVKL_ISA_NEON2X) + set(OSPRAY_ISPC_TARGET_LIST ${OSPRAY_ISPC_TARGET_LIST} neon-i32x8) + message(STATUS "OSPRay NEON2X ISA target enabled.") + endif() + + elseif (OSPRAY_BUILD_ISA STREQUAL "AVX512SKX") + + if(NOT EMBREE_ISA_SUPPORTS_AVX512SKX) + message(FATAL_ERROR "Your Embree build does not support AVX512SKX!") + endif() + if(NOT OPENVKL_ISA_AVX512SKX) + message(FATAL_ERROR "Your Open VKL build does not support AVX512SKX!") + endif() + set(OSPRAY_ISPC_TARGET_LIST avx512skx-i32x16) + + elseif (OSPRAY_BUILD_ISA STREQUAL "AVX2") + + if(NOT EMBREE_ISA_SUPPORTS_AVX2) + message(FATAL_ERROR "Your Embree build does not support AVX2!") + endif() + if(NOT OPENVKL_ISA_AVX2) + message(FATAL_ERROR "Your Open VKL build does not support AVX2!") + endif() + set(OSPRAY_ISPC_TARGET_LIST avx2) + + elseif (OSPRAY_BUILD_ISA STREQUAL "AVX") + + if(NOT EMBREE_ISA_SUPPORTS_AVX) + message(FATAL_ERROR "Your Embree build does not support AVX!") + endif() + if(NOT OPENVKL_ISA_AVX) + message(FATAL_ERROR "Your Open VKL build does not support AVX!") + endif() + set(OSPRAY_ISPC_TARGET_LIST avx) + + elseif (OSPRAY_BUILD_ISA STREQUAL "SSE4") + + if(NOT EMBREE_ISA_SUPPORTS_SSE4) + message(FATAL_ERROR "Your Embree build does not support SSE4!") + endif() + if(NOT OPENVKL_ISA_SSE4) + message(FATAL_ERROR "Your Open VKL build does not support SSE4!") + endif() + set(OSPRAY_ISPC_TARGET_LIST sse4) + + elseif (OSPRAY_BUILD_ISA STREQUAL "NEON") + + if (NOT EMBREE_ISA_SUPPORTS_NEON) + message(FATAL_ERROR "Your Embree build does not support NEON!") + endif() + if (NOT OPENVKL_ISA_NEON) + message(FATAL_ERROR "Your OpenVKL build does not support NEON!") + endif() + set(OSPRAY_ISPC_TARGET_LIST neon-i32x4) + + elseif (OSPRAY_BUILD_ISA STREQUAL "NEON2X") + + if (NOT EMBREE_ISA_SUPPORTS_NEON2X) + message(FATAL_ERROR "Your Embree build does not support NEON2X!") + endif() + if (NOT OPENVKL_ISA_NEON2X) + message(FATAL_ERROR "Your OpenVKL build does not support NEON2X!") + endif() + set(OSPRAY_ISPC_TARGET_LIST neon-i32x8) + + else() + message(FATAL_ERROR "Invalid OSPRAY_BUILD_ISA value. " + "Please select one of ${OSPRAY_SUPPORTED_ISAS}, or ALL.") + endif() + + ospray_fix_ispc_target_list() +endmacro() + +macro(ospray_configure_dpcpp_target) + set(OSPRAY_SYCL_AOT_DEVICES ${EMBREE_SYCL_AOT_DEVICES}) + + # TODO: Is this revision info going to be visible to end users? + # In the end the public release + # of the code should probably just have one revision it targets right? + # The final consumer release rev. + if (OSPRAY_SYCL_AOT_DEVICES STREQUAL "dg2") + set(OSPRAY_SYCL_AOT_DEVICE_REVISION 8) + elseif (OSPRAY_SYCL_AOT_DEVICES STREQUAL "pvc") + # What final rev to pick here? + set(OSPRAY_SYCL_AOT_DEVICE_REVISION 5) + endif() + + if (OSPRAY_SYCL_AOT_DEVICES STREQUAL "none") + set(OSPRAY_SYCL_TARGET spir64) + else() + set(OSPRAY_SYCL_TARGET spir64_gen) + endif() +endmacro() + +## Target creation macros ## + +set(OSPRAY_SIGN_FILE_ARGS -q) +if (APPLE) + list(APPEND OSPRAY_SIGN_FILE_ARGS -o runtime -e ${CMAKE_SOURCE_DIR}/scripts/release/ospray.entitlements) +endif() + +macro(ospray_sign_target name) + if (OSPRAY_SIGN_FILE) + if (APPLE) + # on OSX we strip manually before signing instead of setting CPACK_STRIP_FILES + add_custom_command(TARGET ${name} POST_BUILD + COMMAND ${CMAKE_STRIP} -x $ + COMMAND ${OSPRAY_SIGN_FILE} ${OSPRAY_SIGN_FILE_ARGS} $ + COMMENT "Stripping and signing target" + VERBATIM + ) + else() + add_custom_command(TARGET ${name} POST_BUILD + COMMAND ${OSPRAY_SIGN_FILE} ${OSPRAY_SIGN_FILE_ARGS} $ + COMMENT "Signing target" + VERBATIM + ) + endif() + endif() +endmacro() + +macro(ospray_install_library name component) + set_target_properties(${name} + PROPERTIES VERSION ${OSPRAY_VERSION} SOVERSION ${OSPRAY_SOVERSION}) + ospray_install_target(${name} ${component}) + ospray_sign_target(${name}) +endmacro() + +macro(ospray_install_target name component) + install(TARGETS ${name} + EXPORT ospray_Exports + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT ${component} + NAMELINK_SKIP + # on Windows put the dlls into bin + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${component} + # ... and the import lib into the devel package + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT devel + ) + + install(EXPORT ospray_Exports + DESTINATION ${OSPRAY_CMAKECONFIG_DIR} + NAMESPACE ospray:: + COMPONENT devel + ) + + # Install the namelink in the devel component. This command also includes the + # RUNTIME and ARCHIVE components a second time to prevent an "install TARGETS + # given no ARCHIVE DESTINATION for static library target" error. Installing + # these components twice doesn't hurt anything. + install(TARGETS ${name} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT devel + NAMELINK_ONLY + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT ${component} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT devel + ) +endmacro() + +## Compiler configuration macros ## + +macro(ospray_configure_compiler) + if (WIN32) + set(OSPRAY_PLATFORM_WIN 1) + set(OSPRAY_PLATFORM_UNIX 0) + else() + set(OSPRAY_PLATFORM_WIN 0) + set(OSPRAY_PLATFORM_UNIX 1) + endif() + + # unhide compiler to make it easier for users to see what they are using + mark_as_advanced(CLEAR CMAKE_CXX_COMPILER) + + option(OSPRAY_STRICT_BUILD "Build with additional warning flags" ON) + mark_as_advanced(OSPRAY_STRICT_BUILD) + + option(OSPRAY_WARN_AS_ERRORS "Treat warnings as errors" OFF) + mark_as_advanced(OSPRAY_WARN_AS_ERRORS) + + set(OSPRAY_COMPILER_ICC FALSE) + set(OSPRAY_COMPILER_GCC FALSE) + set(OSPRAY_COMPILER_CLANG FALSE) + set(OSPRAY_COMPILER_MSVC FALSE) + set(OSPRAY_COMPILER_DPCPP FALSE) + + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "IntelLLVM" OR OSPRAY_MODULE_GPU) + set(OSPRAY_COMPILER_DPCPP TRUE) + if(WIN32) # icx on Windows behaves like msvc + # workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/18311 + set(CMAKE_NINJA_CMCLDEPS_RC OFF) + include(msvc) + else() + include(dpcpp) + endif() + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") + set(OSPRAY_COMPILER_ICC TRUE) + if(WIN32) # icc on Windows behaves like msvc + include(msvc) + else() + include(icc) + endif() + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + set(OSPRAY_COMPILER_GCC TRUE) + include(gcc) + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR + "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") + set(OSPRAY_COMPILER_CLANG TRUE) + include(clang) + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + set(OSPRAY_COMPILER_MSVC TRUE) + include(msvc) + else() + message(FATAL_ERROR + "Unsupported compiler specified: '${CMAKE_CXX_COMPILER_ID}'") + endif() + + set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG ${CMAKE_CXX_FLAGS_DEBUG}") + + if (WIN32) + # increase stack to 8MB (the default size of 1MB is too small for our apps) + # note: linker options are independent of compiler (icc or MSVC) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:8388608") + endif() +endmacro() + +macro(ospray_disable_compiler_warnings) + if (NOT OSPRAY_COMPILER_MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") + endif() +endmacro() + +## Embree functions/macros ## + +function(ospray_check_embree_feature FEATURE DESCRIPTION) + set(FEATURE EMBREE_${FEATURE}) + if(NOT ${ARGN}) + if (${FEATURE}) + message(FATAL_ERROR "OSPRay requires Embree to be compiled " + "without ${DESCRIPTION} (${FEATURE}=OFF).") + endif() + else() + if (NOT ${FEATURE}) + message(FATAL_ERROR "OSPRay requires Embree to be compiled " + "with support for ${DESCRIPTION} (${FEATURE}=ON).") + endif() + endif() +endfunction() + +function(ospray_verify_embree_features) + ospray_check_embree_feature(ISPC_SUPPORT ISPC) + ospray_check_embree_feature(FILTER_FUNCTION "intersection filter") + ospray_check_embree_feature(GEOMETRY_TRIANGLE "triangle geometries") + ospray_check_embree_feature(GEOMETRY_CURVE "spline curve geometries") + ospray_check_embree_feature(GEOMETRY_USER "user geometries") + ospray_check_embree_feature(RAY_PACKETS "ray packets") + ospray_check_embree_feature(BACKFACE_CULLING "backface culling" OFF) + if (OSPRAY_MODULE_GPU) + ospray_check_embree_feature(SYCL_SUPPORT "DPC++/SYCL support") + endif() +endfunction() + +macro(ospray_find_embree EMBREE_VERSION_REQUIRED FIND_AS_DEPENDENCY) + if (${FIND_AS_DEPENDENCY}) + find_dependency(embree ${EMBREE_VERSION_REQUIRED}) + else() + find_package(embree ${EMBREE_VERSION_REQUIRED}) + endif() + if (NOT embree_FOUND) + message(FATAL_ERROR + "We did not find Embree installed on your system. OSPRay requires" + " an Embree installation >= v${EMBREE_VERSION_REQUIRED}, please" + " download and extract Embree (or compile Embree from source), then" + " set the 'embree_DIR' variable to the installation (or build)" + " directory.") + endif() + # Get Embree CPU info + get_target_property(EMBREE_INCLUDE_DIRS embree + INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(CONFIGURATIONS embree IMPORTED_CONFIGURATIONS) + list(GET CONFIGURATIONS 0 CONFIGURATION) + get_target_property(EMBREE_LIBRARY embree + IMPORTED_LOCATION_${CONFIGURATION}) + # Get Embree SYCL info if DPCPP was enabled + if (EMBREE_SYCL_SUPPORT) + get_target_property(CONFIGURATIONS embree_sycl IMPORTED_CONFIGURATIONS) + list(GET CONFIGURATIONS 0 CONFIGURATION) + get_target_property(EMBREE_SYCL_LIBRARY embree_sycl + IMPORTED_LOCATION_${CONFIGURATION}) + endif() + message(STATUS "Found Embree v${embree_VERSION}: ${EMBREE_LIBRARY}") +endmacro() + +macro(ospray_determine_embree_isa_support) + if (EMBREE_MAX_ISA STREQUAL "DEFAULT" OR + EMBREE_MAX_ISA STREQUAL "NONE") + set(EMBREE_ISA_SUPPORTS_SSE2 ${EMBREE_ISA_SSE2}) + set(EMBREE_ISA_SUPPORTS_SSE4 ${EMBREE_ISA_SSE42}) + set(EMBREE_ISA_SUPPORTS_AVX ${EMBREE_ISA_AVX}) + set(EMBREE_ISA_SUPPORTS_AVX2 ${EMBREE_ISA_AVX2}) + set(EMBREE_ISA_SUPPORTS_AVX512SKX ${EMBREE_ISA_AVX512SKX}) + set(EMBREE_ISA_SUPPORTS_NEON ${EMBREE_ISA_NEON}) + if(EMBREE_ISA_NEON2X) + set(EMBREE_ISA_SUPPORTS_NEON2X ${EMBREE_ISA_NEON2X}) + else() # workaround missing config in Embree v4.0.0 + if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64|aarch64" AND NOT EMBREE_ISA_SUPPORTS_NEON) + set(EMBREE_ISA_SUPPORTS_NEON2X TRUE) + else() + set(EMBREE_ISA_SUPPORTS_NEON2X FALSE) + endif() + endif() + else() + set(EMBREE_ISA_SUPPORTS_SSE2 FALSE) + set(EMBREE_ISA_SUPPORTS_SSE4 FALSE) + set(EMBREE_ISA_SUPPORTS_AVX FALSE) + set(EMBREE_ISA_SUPPORTS_AVX2 FALSE) + set(EMBREE_ISA_SUPPORTS_AVX512SKX FALSE) + set(EMBREE_ISA_SUPPORTS_NEON FALSE) + set(EMBREE_ISA_SUPPORTS_NEON2X FALSE) + + if (EMBREE_MAX_ISA STREQUAL "SSE2") + set(EMBREE_ISA_SUPPORTS_SSE2 TRUE) + elseif (EMBREE_MAX_ISA MATCHES "SSE4\\.[12]$") + set(EMBREE_ISA_SUPPORTS_SSE2 TRUE) + set(EMBREE_ISA_SUPPORTS_SSE4 TRUE) + elseif (EMBREE_MAX_ISA STREQUAL "AVX") + set(EMBREE_ISA_SUPPORTS_SSE2 TRUE) + set(EMBREE_ISA_SUPPORTS_SSE4 TRUE) + set(EMBREE_ISA_SUPPORTS_AVX TRUE) + elseif (EMBREE_MAX_ISA STREQUAL "AVX2") + set(EMBREE_ISA_SUPPORTS_SSE2 TRUE) + set(EMBREE_ISA_SUPPORTS_SSE4 TRUE) + set(EMBREE_ISA_SUPPORTS_AVX TRUE) + set(EMBREE_ISA_SUPPORTS_AVX2 TRUE) + elseif (EMBREE_MAX_ISA STREQUAL "AVX512SKX") + set(EMBREE_ISA_SUPPORTS_SSE2 TRUE) + set(EMBREE_ISA_SUPPORTS_SSE4 TRUE) + set(EMBREE_ISA_SUPPORTS_AVX TRUE) + set(EMBREE_ISA_SUPPORTS_AVX2 TRUE) + set(EMBREE_ISA_SUPPORTS_AVX512SKX TRUE) + elseif (EMBREE_MAX_ISA STREQUAL "NEON") + set(EMBREE_ISA_SUPPORTS_NEON TRUE) + elseif (EMBREE_MAX_ISA STREQUAL "NEON2X") + set(EMBREE_ISA_SUPPORTS_NEON2X TRUE) + endif() + endif() + + if (NOT (EMBREE_ISA_SUPPORTS_SSE4 + OR EMBREE_ISA_SUPPORTS_AVX + OR EMBREE_ISA_SUPPORTS_AVX2 + OR EMBREE_ISA_SUPPORTS_AVX512SKX + OR EMBREE_ISA_SUPPORTS_NEON + OR EMBREE_ISA_SUPPORTS_NEON2X)) + message(FATAL_ERROR + "Your Embree build needs to support at least one ISA >= SSE4.1 or NEON!") + endif() +endmacro() + +macro(ospray_find_openvkl OPENVKL_VERSION_REQUIRED FIND_AS_DEPENDENCY) + if (${FIND_AS_DEPENDENCY}) + find_dependency(openvkl ${OPENVKL_VERSION_REQUIRED}) + else() + find_package(openvkl ${OPENVKL_VERSION_REQUIRED}) + endif() + if (openvkl_FOUND) + get_target_property(OPENVKL_INCLUDE_DIRS openvkl::openvkl + INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(OPENVKL_CPU_DEVICE_INCLUDE_DIRS openvkl::openvkl_module_cpu_device + INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(CONFIGURATIONS openvkl::openvkl IMPORTED_CONFIGURATIONS) + list(GET CONFIGURATIONS 0 CONFIGURATION) + get_target_property(OPENVKL_LIBRARY openvkl::openvkl + IMPORTED_LOCATION_${CONFIGURATION}) + message(STATUS "Found Open VKL v${openvkl_VERSION}: ${OPENVKL_LIBRARY}") + endif() +endmacro() diff --git a/RenderingToolkit/Tutorial/ospTutorialGLM/ospTutorialGLM.cpp b/RenderingToolkit/Tutorial/ospTutorialGLM/ospTutorialGLM.cpp new file mode 100644 index 0000000000..afcd0548d3 --- /dev/null +++ b/RenderingToolkit/Tutorial/ospTutorialGLM/ospTutorialGLM.cpp @@ -0,0 +1,144 @@ +// Copyright 2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 + +/* This is a small example tutorial how to use OSPRay in an application using + GLM instead of rkcommon for math types. + */ + +#include +#include +#include +#ifdef _WIN32 +#define NOMINMAX +#include +#else +#include +#endif + +#include + +#include +#include + +#include "ospray/ospray_cpp.h" +#define OSPRAY_GLM_DEFINITIONS +#include "ospray/ospray_cpp/ext/glm.h" +#include "rkcommon/utility/SaveImage.h" + +int main(int argc, const char **argv) +{ + // image size + glm::ivec2 imgSize; + imgSize.x = 1024; // width + imgSize.y = 768; // height + + // camera + glm::vec3 cam_pos{0.f, 0.f, 0.f}; + glm::vec3 cam_up{0.f, 1.f, 0.f}; + glm::vec3 cam_view{0.1f, 0.f, 1.f}; + + // triangle mesh data + std::vector vertex = {glm::vec3(-1.0f, -1.0f, 3.0f), + glm::vec3(-1.0f, 1.0f, 3.0f), + glm::vec3(1.0f, -1.0f, 3.0f), + glm::vec3(0.1f, 0.1f, 0.3f)}; + + std::vector color = {glm::vec4(0.9f, 0.5f, 0.5f, 1.0f), + glm::vec4(0.8f, 0.8f, 0.8f, 1.0f), + glm::vec4(0.8f, 0.8f, 0.8f, 1.0f), + glm::vec4(0.5f, 0.9f, 0.5f, 1.0f)}; + + std::vector index = {glm::uvec3(0, 1, 2), glm::uvec3(1, 2, 3)}; + + // initialize OSPRay; OSPRay parses (and removes) its commandline parameters, + // e.g. "--osp:debug" + OSPError init_error = ospInit(&argc, argv); + if (init_error != OSP_NO_ERROR) + return init_error; + + // use scoped lifetimes of wrappers to release everything before ospShutdown() + { + // create and setup camera + ospray::cpp::Camera camera("perspective"); + camera.setParam("aspect", imgSize.x / (float)imgSize.y); + camera.setParam("position", cam_pos); + camera.setParam("direction", cam_view); + camera.setParam("up", cam_up); + camera.commit(); // commit each object to indicate modifications are done + + // create and setup model and mesh + ospray::cpp::Geometry mesh("mesh"); + mesh.setParam("vertex.position", ospray::cpp::CopiedData(vertex)); + mesh.setParam("vertex.color", ospray::cpp::CopiedData(color)); + mesh.setParam("index", ospray::cpp::CopiedData(index)); + mesh.commit(); + + // put the mesh into a model + ospray::cpp::GeometricModel model(mesh); + model.commit(); + + // put the model into a group (collection of models) + ospray::cpp::Group group; + group.setParam("geometry", ospray::cpp::CopiedData(model)); + group.commit(); + + // put the group into an instance (give the group a world transform) + ospray::cpp::Instance instance(group); + instance.commit(); + + // put the instance in the world + ospray::cpp::World world; + world.setParam("instance", ospray::cpp::CopiedData(instance)); + + // create and setup light for Ambient Occlusion + ospray::cpp::Light light("ambient"); + light.commit(); + + world.setParam("light", ospray::cpp::CopiedData(light)); + world.commit(); + + // create renderer, choose Scientific Visualization renderer + ospray::cpp::Renderer renderer("scivis"); + + // complete setup of renderer + renderer.setParam("aoSamples", 1); + renderer.setParam("backgroundColor", 1.0f); // white, transparent + renderer.commit(); + + // create and setup framebuffer + ospray::cpp::FrameBuffer framebuffer( + imgSize.x, imgSize.y, OSP_FB_SRGBA, OSP_FB_COLOR | OSP_FB_ACCUM); + framebuffer.clear(); + + // render one frame + framebuffer.renderFrame(renderer, camera, world); + + // access framebuffer and write its content as PPM file + uint32_t *fb = (uint32_t *)framebuffer.map(OSP_FB_COLOR); + rkcommon::utility::writePPM("firstFrameCpp.ppm", imgSize.x, imgSize.y, fb); + framebuffer.unmap(fb); + + // render 10 more frames, which are accumulated to result in a better + // converged image + for (int frames = 0; frames < 10; frames++) + framebuffer.renderFrame(renderer, camera, world); + + fb = (uint32_t *)framebuffer.map(OSP_FB_COLOR); + rkcommon::utility::writePPM( + "accumulatedFrameCpp.ppm", imgSize.x, imgSize.y, fb); + framebuffer.unmap(fb); + + ospray::cpp::PickResult res = + framebuffer.pick(renderer, camera, world, 0.5f, 0.5f); + + if (res.hasHit) { + std::cout << "Picked geometry [inst: " << res.instance.handle() + << ", model: " << res.model.handle() << ", prim: " << res.primID + << "]" << std::endl; + } + } + + ospShutdown(); + + return 0; +} From 5a4138a5b5c0784fffd9c7b5a498c4c6e4f68d4d Mon Sep 17 00:00:00 2001 From: Vishwajeet Narwal Date: Sat, 29 Apr 2023 00:07:51 -0700 Subject: [PATCH 2/5] Added blank readme --- RenderingToolkit/Tutorial/ospTutorialGLM/README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 RenderingToolkit/Tutorial/ospTutorialGLM/README.md diff --git a/RenderingToolkit/Tutorial/ospTutorialGLM/README.md b/RenderingToolkit/Tutorial/ospTutorialGLM/README.md new file mode 100644 index 0000000000..e69de29bb2 From 0198932390c5e443410192c6040dcd20c2cebff1 Mon Sep 17 00:00:00 2001 From: Vishwajeet Narwal <110259679+vnarwal95@users.noreply.github.com> Date: Sat, 29 Apr 2023 00:24:25 -0700 Subject: [PATCH 3/5] Update README.md --- .../Tutorial/ospTutorialGLM/README.md | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/RenderingToolkit/Tutorial/ospTutorialGLM/README.md b/RenderingToolkit/Tutorial/ospTutorialGLM/README.md index e69de29bb2..e0e439c414 100644 --- a/RenderingToolkit/Tutorial/ospTutorialGLM/README.md +++ b/RenderingToolkit/Tutorial/ospTutorialGLM/README.md @@ -0,0 +1,45 @@ +# ospTutorialGLM + +## Build and Run + +### Windows + +1. Run a new **x64 Native Tools Command Prompt for MSVS 2019**. + +``` +call \setvars.bat +cd \RenderingToolkit\Tutorial\ospTutorialGLM +mkdir build +cd build +cmake .. +cmake --build . +cd Debug +ospTutorialGLM.exe +``` + +### Linux + +1. Start a new Terminal session. +``` +source /setvars.sh +cd /RenderingToolkit/Tutorial/ospTutorialGLM +mkdir build +cd build +cmake .. +cmake --build . +./ospTutorialGLM +``` + +### macOS + +1. Start a new Terminal session. + +``` +source /setvars.sh +cd /RenderingToolkit/Tutorial/ospTutorialGLM +mkdir build +cd build +cmake .. +cmake --build . +./ospTutorialGLM +``` From fcab1906d77c1c5aa94a5d5508f28e42f7d5ed9c Mon Sep 17 00:00:00 2001 From: Vishwajeet Narwal <110259679+vnarwal95@users.noreply.github.com> Date: Sat, 29 Apr 2023 00:35:25 -0700 Subject: [PATCH 4/5] Update README.md --- RenderingToolkit/Tutorial/ospTutorialGLM/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RenderingToolkit/Tutorial/ospTutorialGLM/README.md b/RenderingToolkit/Tutorial/ospTutorialGLM/README.md index e0e439c414..6a59b43a39 100644 --- a/RenderingToolkit/Tutorial/ospTutorialGLM/README.md +++ b/RenderingToolkit/Tutorial/ospTutorialGLM/README.md @@ -43,3 +43,9 @@ cmake .. cmake --build . ./ospTutorialGLM ``` + +### Additional Notes + +oneAPI Rendering Toolkit 2023.1 version's cmake file contains an errata. The errata will produce an error while building the example. Please apply the following workaround described in the following page. 2023.1.1 version will address the issue. + +https://community.intel.com/t5/Intel-oneAPI-Rendering-Toolkit/2023-1-troubleshoot-errata-CMake-Error/m-p/1476040#M98 From 1fdf810f6056a4c14042b418408d0ea7ac44c0ae Mon Sep 17 00:00:00 2001 From: Vishwajeet Narwal <110259679+vnarwal95@users.noreply.github.com> Date: Sat, 29 Apr 2023 00:37:36 -0700 Subject: [PATCH 5/5] Update README.md --- RenderingToolkit/Tutorial/ospTutorialGLM/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RenderingToolkit/Tutorial/ospTutorialGLM/README.md b/RenderingToolkit/Tutorial/ospTutorialGLM/README.md index 6a59b43a39..a5b314695a 100644 --- a/RenderingToolkit/Tutorial/ospTutorialGLM/README.md +++ b/RenderingToolkit/Tutorial/ospTutorialGLM/README.md @@ -1,5 +1,5 @@ # ospTutorialGLM - + This is a small example tutorial how to use OSPRay in an application using GLM instead of rkcommon for math types. ## Build and Run ### Windows