Skip to content

Commit 0dc047e

Browse files
hageboeckpcanal
andcommitted
[CMake] Improve parallelism of RDF 10[0-9] tutorials.
In addition to correctly specifying the number of CPUs in CMake, the tutorials were also setting a resource lock, which prevented them from running in parallel with other RDF tutorials. Since ROOT honours ROOT_MAX_THREADS, this resource lock can be removed. Co-authored-by: Philippe Canal <[email protected]>
1 parent daf52bf commit 0dc047e

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

tutorials/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,10 +1030,9 @@ if(ROOT_pyroot_FOUND)
10301030
${py_will_fail})
10311031

10321032
if(${t} IN_LIST multithreaded)
1033-
# Makes sure that this doesn't run in parallel with other multithreaded tutorials, and that cmake doesn't start too
1034-
# many other tests. That we use 4 processors is actually a lie, because IMT takes whatever it finds.
1035-
# However, even this poor indication of MT behaviour is a good hint for cmake to reduce congestion.
1036-
set_tests_properties(${tutorial_name} PROPERTIES RESOURCE_LOCK multithreaded PROCESSORS ${NProcessors})
1033+
# Makes sure that this doesn't run in parallel with too many other multithreaded tutorials.
1034+
# The number of threads used by the tutorials is limited by setting ROOT_MAX_THREADS (see above).
1035+
set_tests_properties(${tutorial_name} PROPERTIES PROCESSORS ${NProcessors})
10371036
endif()
10381037

10391038
if(${t} IN_LIST distrdf_spark_tutorials)

0 commit comments

Comments
 (0)