Differential D3850 Authored by Sebastián Barschkis (sebbas) on Oct 29 2018, 3:00 PM.
Tags None Subscribers Tokens "Love" token, awarded by ofuscado."Like" token, awarded by Schamph."Love" token, awarded by juang3d.
Details
Summary Includes preprocessed Mantaflow source files for both OpenMP and TBB (if OpenMP is not present, TBB files will be used instead). These files come directly from the Mantaflow repository. Future updates to the core fluid solver will take place by updating the files.
Diff Detail
Event TimelineComment Actions Updated pp files include fixes for outflow at domain walls (liquids in general and secondary particles). Comment Actions Not much to say here, besides that we try to get rid of OMP in Blender code, so might be better to default to tbb, unless there is a good reason not to do so? Also more a topic for @Sergey Sharybin (sergey), but iirc with tbb we should be able to integrate it to our threading management system at some point (to avoid having too much running threads, which is very inefficient), while that would not be possible with OMP?
Comment Actions Okay, it's actually very good that we talk about OpenMP & TBB. I made some tests and it appears that TBB generally performs much, much better (e.g. smoke scenes 50% faster with TBB, @Juan Gea (juang3d) had similar results). I would also say the default should be TBB. In the future we might remove OpenMP altogether. @Nils Thuerey (n_t) or would you say that some development will only take place in OpenMP, i.e. any drawbacks using just TBB? Comment Actions @Sebastián Barschkis (sebbas) yes, good idea - we're using TBB with mantaflow for a long time now, and it works very nicely. We also saw performance gains in the past, less than 50%, but gains nonetheless. So I don't see a reason not to focus on TBB. That way we could also get rid of the somewhat redundant code for OpenMP.
Comment Actions Would be nice if we could strip out the OMP part then if we do not use it, also not critical point imho, would help reduce size of the lib... This revision is now accepted and ready to land.Nov 18 2019, 3:31 PM Comment Actions Yes, there is no need to have the OMP source files lying around. The updated diff now only has TBB files. I also moved the files to extern/ which is much more suitable as we discussed. Comment Actions The following files have their own main() so they can not be used by Blender and i suggest to simply remove them:
Do we need *.reg files? Also, make sure all files have native EOL. dos2unix for the help! :) This revision now requires changes to proceed.Dec 10 2019, 2:26 PM Comment Actions Yes, the 2 files with main() are not needed and can be removed. Same is true for all the *.reg files. The manta update script (extern/mantaflow/UPDATE.sh) now also makes a call to dos2unix before copying over the source files. So they'll always be formatted correctly after updating them. I'll first commit everyting into fluid-mantaflow and then update the patches. fc557cdd138c has the updates for this diff. This revision is now accepted and ready to land.Dec 10 2019, 4:22 PM Closed by commit rB4ff7c5eed6b5: Mantaflow [Part 1]: Added preprocessed Mantaflow source files (authored by Sebastián Barschkis (sebbas)). · Explain WhyDec 16 2019, 4:27 PM This revision was automatically updated to reflect the committed changes. Large DiffThis large diff affects 278 files. Files without inline comments have been collapsed. Expand All Files
Revision Contents
Diff 12284 | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||