Update to OSL 1.4.0 #37527

New Issue

Thomas Dinges · 2013-11-18T22:09:33+01:00

Thomas Dinges commented

2013-11-18 22:09:33 +01:00

Hi,
just a todo item for OSL 1.4.0.

Larry made a beta release, it would be great if we could check this and see if it runs fine with Cycles, so we can still report compile errors or bugs before they tag the official release. https://github.com/imageworks/OpenShadingLanguage/releases/tag/Release-1.4.0beta

I Will check this on Windows this week and report any possible problems here.

Hi, just a todo item for OSL 1.4.0. Larry made a beta release, it would be great if we could check this and see if it runs fine with Cycles, so we can still report compile errors or bugs before they tag the official release. https://github.com/imageworks/OpenShadingLanguage/releases/tag/Release-1.4.0beta I Will check this on Windows this week and report any possible problems here.

Thomas Dinges commented

2013-11-18 22:09:33 +01:00

Changed status to: 'Open'

Thomas Dinges commented

2013-11-18 22:09:33 +01:00

Added subscribers: @ThomasDinges, @brecht

Thomas Dinges commented

2013-11-24 23:38:42 +01:00

Ok, of course this doesn't work out of the box. Tested on Windows x64.

Changes to build config were needed:

CMakeLists has been moved 1 level up, so the line needs to be:
cmake -G "NMake Makefiles" ....\ ^
USE_TBB flag is deprecated and can be removed
We need to pass "USING_OIIO_PUGI=ON" somehow, and probably "USE_EXTERNAL_PUGIXML=OFF", although the latter seems to be off by default.
Otherwise we get namespace errors src\liboslexec\dictionary.cpp
Time to let msvc 2008 die...missing math defines in src\liboslexec\constfold.c.
The issue is, msvc 2008 doesn't know functions like "expm1f". So we either work around here and submit a patch upstream to use alternatives, or we update to vc2012 finally.

Ok, of course this doesn't work out of the box. Tested on Windows x64. Changes to build config were needed: 1) CMakeLists has been moved 1 level up, so the line needs to be: cmake -G "NMake Makefiles" ..\..\ ^ 2) USE_TBB flag is deprecated and can be removed 3) We need to pass "USING_OIIO_PUGI=ON" somehow, and probably "USE_EXTERNAL_PUGIXML=OFF", although the latter seems to be off by default. Otherwise we get namespace errors src\liboslexec\dictionary.cpp 4) Time to let msvc 2008 die...missing math defines in src\liboslexec\constfold.c. The issue is, msvc 2008 doesn't know functions like "expm1f". So we either work around here and submit a patch upstream to use alternatives, or we update to vc2012 finally.

Brecht Van Lommel commented

2013-11-25 00:46:20 +01:00

OIIO does contain a windows version of expm1f, it's used in llvm_ops.cpp, so should work in constfold.cpp as well, it's not clear to me why it doesn't work here.

I don't mind moving to vc2012 though.

OIIO does contain a windows version of expm1f, it's used in llvm_ops.cpp, so should work in constfold.cpp as well, it's not clear to me why it doesn't work here. I don't mind moving to vc2012 though.

Thomas Dinges commented

2013-11-28 10:04:56 +01:00

Ah I see, llvm_ops.cpp has a #ifdef _WIN32 block with OIIO math lines, will try to add that for constfold.cpp too.

Thomas Dinges commented

2013-11-28 18:08:05 +01:00

Ok I got it to compile now, added the #ifdef _WIN32 math block to constfold.cpp and also had to comment/remove the ASSERT_MSG from llvm_instance.cpp.
I think those 2 things should be pushed upstream.

Runtime wise, it works fine (no crashes or wrong renders) and I see a nice performance increase. Depends on the scene but it looks nice:

Cornell Box: From 54s to 48s.
Color Ramp: From 1.30 min to 1.08 min.

Ok I got it to compile now, added the #ifdef _WIN32 math block to constfold.cpp and also had to comment/remove the ASSERT_MSG from llvm_instance.cpp. I think those 2 things should be pushed upstream. Runtime wise, it works fine (no crashes or wrong renders) and I see a nice performance increase. Depends on the scene but it looks nice: Cornell Box: From 54s to 48s. Color Ramp: From 1.30 min to 1.08 min.

Brecht Van Lommel commented

2013-11-28 19:04:29 +01:00

That's a pretty great performance improvement.

Feel free to commit these libraries. I can look over the patches, or you can create a pull request yourself, whatever you prefer.

That's a pretty great performance improvement. Feel free to commit these libraries. I can look over the patches, or you can create a pull request yourself, whatever you prefer.

Thomas Dinges commented

2013-11-28 19:34:56 +01:00

I'd like to update together with a new OIIO (and new OpenEXR maybe), as suggested by Dalai.
He needs the new OIIO libs for the .psd support on Windows, so better to do it together.

I will doublecheck the OSL changes and create a diff, want to double check this PUGIXML thing. Still not entirely sure if it's just a issue in our build.bat or the actual code.

I'd like to update together with a new OIIO (and new OpenEXR maybe), as suggested by Dalai. He needs the new OIIO libs for the .psd support on Windows, so better to do it together. I will doublecheck the OSL changes and create a diff, want to double check this PUGIXML thing. Still not entirely sure if it's just a issue in our build.bat or the actual code.

Thomas Dinges commented

2013-12-06 17:43:16 +01:00

Changed status from 'Open' to: 'Resolved'

Thomas Dinges closed this issue

2013-12-06 17:43:16 +01:00

Thomas Dinges self-assigned this 2013-12-06 17:43:16 +01:00

Thomas Dinges commented

2013-12-06 17:43:16 +01:00

Commited new libs for x64 and x86 now (msvc 2008).
I also added the .patch file, it's a minor change, so no big deal. Would be nice to get those upstream nevertheless.

What bothers me more is a problem with a OIIO include. OpenImageIO\tinyformat. Line 273/274 cause errors on OSL lib compilation, I commented those during the compilation to fix it. Maybe this can be fixed upstream too, I am not sure what the exact issue here is , compiler complained about "DummyType".

Thanks for your advice on this Brecht, closing now. :)

Commited new libs for x64 and x86 now (msvc 2008). I also added the .patch file, it's a minor change, so no big deal. Would be nice to get those upstream nevertheless. What bothers me more is a problem with a OIIO include. OpenImageIO\tinyformat. Line 273/274 cause errors on OSL lib compilation, I commented those during the compilation to fix it. Maybe this can be fixed upstream too, I am not sure what the exact issue here is , compiler complained about "DummyType". Thanks for your advice on this Brecht, closing now. :)

Sign in to join this conversation.

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Update to OSL 1.4.0 #37527