Skip to content

Commit f7bef96

Browse files
committed
OpenImageDenoise + ISPC added
1 parent 6b94642 commit f7bef96

File tree

4 files changed

+125
-2
lines changed

4 files changed

+125
-2
lines changed

Changes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
- MaterialX : Added version 1.38.4.
99
- USD : Updated to version 23.05.
1010
- Xerces : Removed.
11+
- ISPC : Added version 1.20.0.
12+
- OpenImageDenoise : Added version 1.4.3.
1113

1214
7.0.0a2 (relative to 7.0.0a1)
1315
-------

Cycles/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
"license" : "LICENSE",
1212

13-
"dependencies" : [ "Boost", "OpenJPEG", "OpenImageIO", "TBB", "Alembic", "Embree", "OpenColorIO", "OpenVDB", "OpenShadingLanguage", "OpenSubdiv", "OpenPGL" ],
13+
"dependencies" : [ "Boost", "OpenJPEG", "OpenImageIO", "TBB", "Alembic", "Embree", "OpenColorIO", "OpenVDB", "OpenShadingLanguage", "OpenSubdiv", "OpenPGL", "OpenImageDenoise" ],
1414

1515
"commands" : [
1616

@@ -20,7 +20,7 @@
2020
" -D CMAKE_INSTALL_PREFIX={buildDir}/cycles"
2121
" -D CMAKE_PREFIX_PATH={buildDir}"
2222
" -D CMAKE_BUILD_TYPE=Release"
23-
" -D WITH_CYCLES_OPENIMAGEDENOISE=OFF"
23+
" -D WITH_CYCLES_OPENIMAGEDENOISE=ON"
2424
" -D WITH_CYCLES_PATH_GUIDING=ON"
2525
" -D WITH_CYCLES_DEVICE_CUDA=OFF"
2626
" -D WITH_CYCLES_DEVICE_OPTIX=OFF"

ISPC/config.py

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
3+
"url" : "https://ispc.github.io/",
4+
5+
"license" : "LICENSE.txt",
6+
7+
"dependencies" : [],
8+
9+
"commands" : [
10+
11+
"cp bin/ispc {buildDir}/bin/ispc",
12+
13+
],
14+
15+
"platform:linux" : {
16+
17+
"downloads" : {
18+
19+
"https://github.com/ispc/ispc/releases/download/v1.20.0/ispc-v1.20.0-linux.tar.gz"
20+
21+
},
22+
23+
24+
},
25+
26+
"platform:macos" : {
27+
28+
"downloads" : {
29+
30+
"https://github.com/ispc/ispc/releases/download/v1.20.0/ispc-v1.20.0-macOS.tar.gz"
31+
32+
},
33+
34+
},
35+
36+
"platform:windows" : {
37+
38+
"downloads" : {
39+
40+
"https://github.com/ispc/ispc/releases/download/v1.20.0/ispc-v1.20.0-windows.zip"
41+
42+
},
43+
44+
},
45+
46+
}

OpenImageDenoise/config.py

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
3+
"downloads" : [
4+
5+
"https://github.com/OpenImageDenoise/oidn/releases/download/v1.4.3/oidn-1.4.3.src.tar.gz"
6+
7+
],
8+
9+
"url" : "https://www.openimagedenoise.org/",
10+
11+
"license" : "LICENSE.txt",
12+
13+
"dependencies" : ["ISPC"],
14+
15+
"environment" : {
16+
17+
"PATH" : "{buildDir}/bin:$PATH",
18+
"LD_LIBRARY_PATH" : "{buildDir}/lib:$LD_LIBRARY_PATH",
19+
20+
},
21+
22+
"commands" : [
23+
24+
"mkdir gafferBuild",
25+
"cd gafferBuild &&"
26+
" cmake"
27+
" -G {cmakeGenerator}"
28+
" -D CMAKE_INSTALL_PREFIX={buildDir}"
29+
" -D CMAKE_PREFIX_PATH={buildDir}"
30+
" -D CMAKE_BUILD_TYPE=Release"
31+
" -D CMAKE_INSTALL_LIBDIR={buildDir}/lib"
32+
" ..",
33+
"cd gafferBuild && cmake --build . --config Release --target install -- -j {jobs}",
34+
35+
],
36+
37+
"manifest" : [
38+
39+
"cmake/OpenImageDenoise*",
40+
"include/OpenImageDenoise*",
41+
"lib/*OpenImageDenoise*",
42+
43+
],
44+
45+
"platform:linux" : {
46+
47+
"environment" : {
48+
49+
"LD_LIBRARY_PATH" : "{buildDir}/lib:$LD_LIBRARY_PATH",
50+
51+
},
52+
53+
},
54+
55+
"platform:osx" : {
56+
57+
"environment" : {
58+
59+
"LD_LIBRARY_PATH" : "{buildDir}/lib:$LD_LIBRARY_PATH",
60+
61+
},
62+
63+
},
64+
65+
"platform:windows" : {
66+
67+
"environment" : {
68+
69+
"PATH" : "{buildDir}/lib;%PATH%",
70+
71+
},
72+
73+
},
74+
75+
}

0 commit comments

Comments
 (0)