Skip to content

Rendering toolkit oidn code sample PR #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
8e0bdb3
ONSAM-1414 Broken Link in Headers (#685)
JoeOster Sep 29, 2021
4bed52e
fix deprecation notice (#682)
ericlars Sep 29, 2021
b23d63a
initial commit for RenderingToolkit GSG sample proposal
MichaelRoyceCarroll Oct 9, 2021
f0a1b50
signed inital commit for RenderingToolkit GSG intro samples
MichaelRoyceCarroll Oct 9, 2021
9fa62ea
Added generated GUIDS to .repo-tools/Docs_Automation/guids.json (sign…
MichaelRoyceCarroll Oct 9, 2021
be21e94
Update README.md
MichaelRoyceCarroll Oct 14, 2021
78b2bff
Order samples folders
MichaelRoyceCarroll Oct 15, 2021
8990739
Update README.md
MichaelRoyceCarroll Oct 15, 2021
fb7dcf2
Adding per sample component README.md files
MichaelRoyceCarroll Oct 15, 2021
002b232
Merge branch 'RenderingToolkit' of https://github.com/MichaelRoyceCar…
MichaelRoyceCarroll Oct 15, 2021
d85d358
Update README.md
MichaelRoyceCarroll Oct 15, 2021
507eb04
Adding percomponent LICENSE placeholder files (to be reviewed)
MichaelRoyceCarroll Oct 15, 2021
b738b26
Adding converted .pfm input file. This file could help users if they …
MichaelRoyceCarroll Oct 15, 2021
5f91694
Updating sample.json files per Joseph Oster guidance
MichaelRoyceCarroll Oct 15, 2021
a3461c3
Updates to oidn README.md for linux and macos
MichaelRoyceCarroll Oct 15, 2021
86c8200
Update README for library requirements
MichaelRoyceCarroll Oct 18, 2021
2c6f167
New branch for just oidn sample
MichaelRoyceCarroll Oct 18, 2021
6c7e27c
Add description to base README.md
MichaelRoyceCarroll Oct 18, 2021
506c255
Merge branch 'development' into RenderingToolkit-oidn
MichaelRoyceCarroll Oct 19, 2021
e5b18de
.repo-tools/Docs_Automation/guids.json merge fixes
MichaelRoyceCarroll Oct 19, 2021
4701fed
Attempting to merge all .repo-tools/Docs_Automation/guids.json
MichaelRoyceCarroll Oct 19, 2021
f02d1af
removing overlapping content. overlap to RenderingToolkit-ospray branch
MichaelRoyceCarroll Oct 21, 2021
c01aebb
Updates for the oidn README.md
MichaelRoyceCarroll Oct 21, 2021
6a15448
clang-format for source
MichaelRoyceCarroll Oct 21, 2021
2447c98
README.md update
MichaelRoyceCarroll Oct 21, 2021
f52b67d
Triage samples.json for CI process. Hopefully this unblocks!
MichaelRoyceCarroll Oct 21, 2021
1d70632
Escape the spaces for CI in sample.json
MichaelRoyceCarroll Oct 22, 2021
a6b6aeb
Escape extra quotes for CI in sample.json
MichaelRoyceCarroll Oct 22, 2021
06b7b55
Should be no Release folder for sample.json on macos or lin. It has b…
MichaelRoyceCarroll Oct 22, 2021
186d13c
Escapes for sample.json input files and exe invoke
MichaelRoyceCarroll Oct 22, 2021
1ada59d
README.md updates for better pathing and simplified build
MichaelRoyceCarroll Oct 26, 2021
3bdf3cb
CMakeLists convenience updates
MichaelRoyceCarroll Oct 26, 2021
339b71f
Changing paths for better CI
MichaelRoyceCarroll Oct 26, 2021
2c6f568
Nameing in CMakeLists for global variables build fix
MichaelRoyceCarroll Oct 26, 2021
4e069ba
Update sample.json to take our oneapi env... check paths to input ima…
MichaelRoyceCarroll Oct 26, 2021
c754c49
fix typo/text ommission in sample.json to unblock CI
MichaelRoyceCarroll Oct 26, 2021
636c00b
Update sample.json
MichaelRoyceCarroll Oct 27, 2021
896b376
sample.json to match for macos (env vars)
MichaelRoyceCarroll Oct 29, 2021
9f483f6
Healthier CMakeLists for macos and c++11 on all platforms
MichaelRoyceCarroll Oct 29, 2021
c19a921
Merge branch 'RenderingToolkit-oidn' of https://github.com/MichaelRoy…
MichaelRoyceCarroll Oct 30, 2021
0b20e73
Update samples.json for better Macos env vars... (CI Only)
MichaelRoyceCarroll Nov 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions RenderingToolkit/GettingStarted/04_oidn_gsg/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
cmake_minimum_required(VERSION 3.16)
project(OIDN_GSG LANGUAGES C CXX)

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})
set(OIDN_ROOT ${ONEAPI_ROOT}/oidn/latest)
set(OIDN_INCLUDE_DIR ${OIDN_ROOT}/include)
set(OIDN_LIB_DIR ${OIDN_ROOT}/lib)

find_package(OpenImageDenoise REQUIRED PATHS ${ONEAPI_ROOT})
find_package(TBB 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)

add_subdirectory(src/common)
add_subdirectory(src/apps/utils)

include_directories(${OIDN_INCLUDE_DIR} ${OIDN_ROOT} ${OIDN_GSG_SOURCE_DIR}/src)
link_directories(${OIDN_ROOT}/lib)

add_executable(oidnDenoise src/apps/oidnDenoise.cpp)
target_link_libraries(oidnDenoise PRIVATE common utils OpenImageDenoise)

install(TARGETS oidnDenoise
DESTINATION ${CMAKE_INSTALL_BINDIR}
)
202 changes: 202 additions & 0 deletions RenderingToolkit/GettingStarted/04_oidn_gsg/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
140 changes: 140 additions & 0 deletions RenderingToolkit/GettingStarted/04_oidn_gsg/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
# Getting Started Sample for Intel oneAPI Rendering Toolkit: Intel Open Image Denoise


Intel Open Image Denoise is an open source library of high-performance, high-quality, denoising filters for images rendered with ray tracing. Significantly reduce rendering times in ray tracing based rendering applications.

| Minimum Requirements | Description
|:--- |:---
| OS | Linux* Ubuntu* 18.04, CentOS 8 (or compatible); Windows 10; MacOS 10.15+
| Hardware | Intel 64 Penryn or newer with SSE4.1 extensions, ARM64 with NEON extensions
| Compiler Toolchain | Windows* OS: MSVS 2019 installed with Windows* SDK and CMake*; Other platforms: C++11 compiler, a C99 compiler (ex: gcc/c++/clang), and CMake*
| Libraries | Install Intel oneAPI Rendering Toolkit including OSPRay, Embree, Open Volume Kernel Library, Intel Open Image Denoise
| Image Display Tool | A .ppm filetype viewer. Ex: [ImageMagick](https://www.imagemagick.org)
| Image Conversion Tool | A converter for .ppm, .pfm, and endian conversions. Ex: [ImageMagick](https://www.imagemagick.org)

| Optimized Requirements | Description
| :--- | :---
| Hardware | Intel 64 Skylake or newer with AVX512 extentions, ARM64 with NEON extensions

| Objective | Description
|:--- |:---
| What you will learn | How to build and run a basic rendering program using the Open Image Denoise API from the Render Kit.
| Time to complete | 5 minutes


## Purpose

This getting started sample program, `oidnDenoise`, denoises a raytraced image. The output is written to disk as a .pfm image file.


## Key Implementation Details

- The program input is a noisy image. In this example, the `accumulatedFrameCpp` image is used for input. Recall, this image was originally generated from the Intel OSPRay getting started sample, `ospTutorial`.
- The program writes a denoised .pfm image file to disk.
- Of course, oidnDenoise can denoise other, user-provided noisy input images. Along with the input image, the program can take in albedo and normal buffers corresponding to the same pixels of the input image. Inclusion of such auxialiary feature images can significantly improve denoising quality. See
- The Intel OSPRay Studio showcase application demonstrates in-source denoising with the Intel OSPRay library. The noisy image buffer and auxiliary buffers are readily emitted from the OSPRay API. All buffers are fed through the denoiser for a higher quality interactive experience.

## License

This code sample is licensed under the Apache 2.0 license. See
[LICENSE.txt](LICENSE.txt) for details.

Third party program Licenses can be found here: [third-party-programs.txt](https://github.com/oneapi-src/oneAPI-samples/blob/master/third-party-programs.txt)

## Build and Run

First, build and run the sample Intel OSPRay getting started sample, `ospTutorial`, to generate input. Find it in the [01_ospray_gsg](../01_ospray_gsg) folder of this samples repository.

### Windows OS:


Run a new **x64 Native Tools Command Prompt for MSVS 2019**

```
call <path-to-oneapi-folder>\setvars.bat
cd <path-to-oneAPI-samples>\RenderingToolkit\GettingStarted\04_oidn_gsg
mkdir build
cd build
cmake ..
cmake --build . --config Release
cd Release
```

Convert the accumulatedFrameCpp.ppm image to LSB data ordering and .pfm format. Example conversion with ImageMagick convert:

```
<path-to-ImageMagick>\magick.exe convert <path-to-gsg>\01_ospray_gsg\build\Release\accumulatedFrameCpp.ppm -endian LSB PFM:accumulatedFrameCpp.pfm
```

Denoise the image:

```
oidnDenoise.exe -hdr accumulatedFrameCpp.pfm -o denoised.pfm
```

Review the output for visual comparison to the input. Example view with ImageMagick display:

```
<path-to-ImageMagick>\imdisplay.exe denoised.pfm
```

### Linux OS:

Start a new Terminal session
```
source <path-to-oneapi-folder>/setvars.sh
cd <path-to-oneAPI-samples>/RenderingToolkit/GettingStarted/04_oidn_gsg
mkdir build
cd build
cmake ..
cmake --build .
```

Convert the accumulatedFrameCpp.ppm image to LSB data ordering and .pfm format. Example conversion with ImageMagick convert:
```
<path-to-ImageMagick>/convert-im6 <path-to-gsg>/01_ospray_gsg/build/accumulatedFrameCpp.ppm -endian LSB PFM:accumulatedFrameCpp.pfm
```

Denoise the image:

```
./oidnDenoise -hdr accumulatedFrameCpp.pfm -o denoised.pfm
```

Review the output for visual comparison to the input. Example view with ImageMagick display:

```
<path-to-ImageMagick>/display-im6 denoised.pfm
```



### MacOS:

Start a new Terminal session

```
source <path-to-oneapi-folder>/setvars.sh
cd <path-to-oneAPI-samples>/RenderingToolkit/GettingStarted/04_oidn_gsg
mkdir build
cd build
cmake ..
cmake --build .
```

Convert the accumulatedFrameCpp.ppm image to LSB data ordering and .pfm format. Example conversion with ImageMagick convert:
```
<path-to-ImageMagick>/magick convert <path-to-gsg>/01_ospray_gsg/build/accumulatedFrameCpp.ppm -endian LSB PFM:accumulatedFrameCpp.pfm
```

Denoise the image:

```
./oidnDenoise -hdr accumulatedFrameCpp.pfm -o denoised.pfm
```

Review the output for visual comparison to the input. Example view with ImageMagick display:

```
<path-to-ImageMagick>/imdisplay denoised.pfm
```
Binary file not shown.
Loading