Attachment 239297 Details for Bug 268779 – Patch for the port directory.

[patch] Patch for the port directory.

fix_openmp_build.diff (text/plain), 2.59 KB, created by Matthieu Volat on 2023-01-06 07:53:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Volat

Created: 2023-01-06 07:53:24 UTC

Size: 2.59 KB

patch

obsolete

>diff --git a/graphics/openpgl/files/patch-openpgl_spatial_KNN.h b/graphics/openpgl/files/patch-openpgl_spatial_KNN.h
>new file mode 100644
>index 000000000000..9c9c7d0965c5
>--- /dev/null
>+++ b/graphics/openpgl/files/patch-openpgl_spatial_KNN.h
>@@ -0,0 +1,18 @@
>+--- openpgl/spatial/KNN.h.orig	2023-01-06 07:38:35 UTC
>++++ openpgl/spatial/KNN.h
>+@@ -217,7 +217,7 @@ struct KNearestRegionsSearchTree
>+         }
>+         neighbours = (RN*) alignedMalloc(num_points*sizeof(RN), 32);
>+ #if defined(OPENPGL_USE_OMP_THREADING)
>+-        #pragma omp parallel for num_threads(this->m_nCores) schedule(dynamic)
>++        #pragma omp parallel for schedule(dynamic)
>+         for (size_t n=0; n < num_points; n++)
>+ #else
>+         tbb::parallel_for( tbb::blocked_range<int>(0,num_points), [&](tbb::blocked_range<int> r)
>+@@ -410,4 +410,4 @@ struct KNearestRegionsSearchTree
>+     bool _isBuildNeighbours{false};
>+ };
>+ 
>+-}
>+\ No newline at end of file
>++}
>diff --git a/graphics/openpgl/files/patch-openpgl_spatial_kdtree_KDTreeBuilder.h b/graphics/openpgl/files/patch-openpgl_spatial_kdtree_KDTreeBuilder.h
>new file mode 100644
>index 000000000000..37f8b2748037
>--- /dev/null
>+++ b/graphics/openpgl/files/patch-openpgl_spatial_kdtree_KDTreeBuilder.h
>@@ -0,0 +1,20 @@
>+--- openpgl/spatial/kdtree/KDTreeBuilder.h.orig	2023-01-06 07:33:35 UTC
>++++ openpgl/spatial/kdtree/KDTreeBuilder.h
>+@@ -250,8 +250,8 @@ struct KDTreePartitionBuilder (private)
>+ 
>+ #ifdef OPENPGL_USE_OMP_THREADING
>+     #pragma omp task mergeable
>+-        updateTreeNode(kdTree, kdTree->getNode(nodeIdsLeftRight[0]), depth + 1, sampleRangeLeftRight[0], sampleStatsLeftRight[0], dataStorage, buildSettings);
>+-        updateTreeNode(kdTree, kdTree->getNode(nodeIdsLeftRight[1]), depth + 1, sampleRangeLeftRight[1], sampleStatsLeftRight[1], dataStorage, buildSettings);
>++        updateTreeNode(kdTree, kdTree->getNode(nodeIdsLeftRight[0]), depth + 1, samples, sampleRangeLeftRight[0], sampleStatsLeftRight[0], dataStorage, buildSettings);
>++        updateTreeNode(kdTree, kdTree->getNode(nodeIdsLeftRight[1]), depth + 1, samples, sampleRangeLeftRight[1], sampleStatsLeftRight[1], dataStorage, buildSettings);
>+ #else
>+     tbb::parallel_invoke(
>+         [&]{updateTreeNode(kdTree, kdTree->getNode(nodeIdsLeftRight[0]), depth + 1, samples, sampleRangeLeftRight[0], sampleStatsLeftRight[0], dataStorage, buildSettings);},
>+@@ -299,4 +299,4 @@ inline void KDTreePartitionBuilder<TRegion, TContainer
>+         stream.read(reinterpret_cast<char*>(&maxSamples), sizeof(size_t));
>+         stream.read(reinterpret_cast<char*>(&maxDepth), sizeof(size_t));
>+     }
>+-}
>+\ No newline at end of file
>++}

Actions: View | Diff

Attachments on bug 268779: 239297 | 239298 | 239368