mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use multithreaded FFT

metadata
Wenzel Jakob 2013-10-28 11:28:37 +01:00
parent 5ea0546e41
commit b962a3db57
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/config-linux-gcc-debug.py
View File

@ -21,7 +21,7 @@ GLFLAGS = ['-DGLEW_MX']
BOOSTLIB = ['boost_system', 'boost_filesystem', 'boost_thread'] BOOSTLIB = ['boost_system', 'boost_filesystem', 'boost_thread']
COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4'] COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4']
COLLADALIB = ['collada14dom', 'xml2'] COLLADALIB = ['collada14dom', 'xml2']
FFTWLIB = ['fftw3'] FFTWLIB = ['fftw3_threads']
# The following assumes that the Mitsuba bindings should be built for the # The following assumes that the Mitsuba bindings should be built for the
# "default" Python version. It is also possible to build bindings for multiple # "default" Python version. It is also possible to build bindings for multiple

2
build/config-linux-gcc.py
View File

@ -21,7 +21,7 @@ GLFLAGS = ['-DGLEW_MX']
BOOSTLIB = ['boost_system', 'boost_filesystem', 'boost_thread'] BOOSTLIB = ['boost_system', 'boost_filesystem', 'boost_thread']
COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4'] COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4']
COLLADALIB = ['collada14dom', 'xml2'] COLLADALIB = ['collada14dom', 'xml2']
FFTWLIB = ['fftw3'] FFTWLIB = ['fftw3_threads']
# The following assumes that the Mitsuba bindings should be built for the # The following assumes that the Mitsuba bindings should be built for the
# "default" Python version. It is also possible to build bindings for multiple # "default" Python version. It is also possible to build bindings for multiple

2
build/config-linux-icl.py
View File

@ -21,7 +21,7 @@ GLFLAGS = ['-DGLEW_MX']
BOOSTLIB = ['boost_system', 'boost_filesystem', 'boost_thread'] BOOSTLIB = ['boost_system', 'boost_filesystem', 'boost_thread']
COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4'] COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4']
COLLADALIB = ['collada14dom', 'xml2'] COLLADALIB = ['collada14dom', 'xml2']
FFTWLIB = ['fftw3'] FFTWLIB = ['fftw3_threads']
# The following assumes that the Mitsuba bindings should be built for the # The following assumes that the Mitsuba bindings should be built for the
# "default" Python version. It is also possible to build bindings for multiple # "default" Python version. It is also possible to build bindings for multiple

12
src/libcore/bitmap.cpp
View File

@ -1903,7 +1903,8 @@ void Bitmap::writePNG(Stream *stream, int compression) const {
png_text *text = NULL; png_text *text = NULL;
Properties metadata(m_metadata); Properties metadata(m_metadata);
metadata.setString("generatedBy", "Mitsuba version " MTS_VERSION); if (!metadata.hasProperty("generatedBy"))
metadata.setString("generatedBy", "Mitsuba version " MTS_VERSION);
std::vector<std::string> keys = metadata.getPropertyNames(); std::vector<std::string> keys = metadata.getPropertyNames();
std::vector<std::string> values(keys.size()); std::vector<std::string> values(keys.size());
@ -2473,7 +2474,8 @@ void Bitmap::writeOpenEXR(Stream *stream,
#endif #endif
Properties metadata(m_metadata); Properties metadata(m_metadata);
metadata.setString("generatedBy", "Mitsuba version " MTS_VERSION); if (!metadata.hasProperty("generatedBy"))
metadata.setString("generatedBy", "Mitsuba version " MTS_VERSION);
std::vector<std::string> keys = metadata.getPropertyNames(); std::vector<std::string> keys = metadata.getPropertyNames();
@ -3145,6 +3147,12 @@ void Bitmap::staticInitialization() {
/* Initialize the Bitmap format conversion */ /* Initialize the Bitmap format conversion */
FormatConverter::staticInitialization(); FormatConverter::staticInitialization();
#if defined(MTS_HAS_FFTW)
/* Initialize FFTW if enabled */
fftw_init_threads();
fftw_plan_with_nthreads(getCoreCount());
#endif
} }
void Bitmap::staticShutdown() { void Bitmap::staticShutdown() {