blender
/
blender
137
427
Fork 615
Code Issues 6.3k Pull Requests 792 Projects 19 Wiki Activity

WIP:Interleaved slices for better work distriubtion with a Multi-GPU setup #110348

Draft
William Leeson wants to merge 82 commits from leesonw/blender-cluster:work_sets_similar into main
pull from: leesonw/blender-cluster:work_sets_similar
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 8 Commits 82 Files Changed 22 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 155fd0991f - Show all commits

8
intern/cycles/integrator/path_trace.cpp
View File

@ -275,9 +275,9 @@ static void foreach_sliced_buffer_params(const vector<unique_ptr<PathTraceWork>>
slice_sizes[i] = slice_size;
slice_stride += slice_size;
}
/* Bake roughness is current broken this */
/* Bake roughness is currently broken this with interleaved scanlines this create 2 big slices without being interleaved
if(bake) {
/* enlarge slices so that there are only 2 big slices */
// enlarge slices so that there are only 2 big slices
int remaining_height = window_height - slice_stride;
for(int i = 0;i < num_works;i++) {
const double weight = work_balance_infos[i].weight;
@ -286,14 +286,14 @@ static void foreach_sliced_buffer_params(const vector<unique_ptr<PathTraceWork>>
slice_stride += slice_size;
VLOG_INFO << "<" << i << "> enlarge size:" << slice_size << " weight:" << work_balance_infos[i].weight;
}
/* if there are any remaining scanlines add them to the device with the highest weight */
// if there are any remaining scanlines add them to the device with the highest weight
int leftover_scanlines = window_height - slice_stride;
if(leftover_scanlines > 0) {
VLOG_INFO << "Left over scanlines:" << leftover_scanlines;
slice_sizes[largest_weight] += leftover_scanlines;
}
}
*/
int slices = window_height/slice_stride;
int current_y = 0;
for (int i = 0; i < num_works; ++i) {