[WIP][Cling] Refactor CIFactory and add incremental action support

.github/workflows/llvm-diff.yml

@@ -34,5 +34,9 @@ jobs:
           for f in $(ls -A); do
             [ -e ../root/interpreter/llvm-project/$f ] || rm -r $f
           done
+          # Only compare what is already there in third-party
+          for f in $(ls -A third-party); do
+            [ -e ../root/interpreter/llvm-project/third-party/$f ] || rm -r third-party/$f
+          done
       - name: Compare
         run: diff -ur llvm-project/ root/interpreter/llvm-project/

.github/workflows/root-ci-config/build_root.py

@@ -57,9 +57,9 @@ def main():
     if pull_request:
         # We check whether the PR is done from a branch that has the same name of
         # the target branch in the ROOT repository using base_ref and head_ref:
-        # - The base_ref is e.g. "master" or "v6-38-00-patches" 
+        # - The base_ref is e.g. "master" or "v6-38-00-patches"
         # - The head_ref for PRs is formatted as <PR branch>:<Fork branch> e.g. "refs/pull/20742/head:cppyy_fixup"
-        if not ":" in args.head_ref:
+        if ":" not in args.head_ref:
             build_utils.print_error(f"This has been identified as a PR build. However, the head-ref is {args.head_ref}.")
         branch_in_fork = args.head_ref.split(":")[-1]
         if branch_in_fork == args.base_ref:
@@ -85,7 +85,7 @@ def main():
 
     if "minimal" in platform_options and platform_options["minimal"] == "ON":
         options_dict = platform_options
-        print(f"Minimal build detected in the platform options. Ignoring global configuration.")
+        print("Minimal build detected in the platform options. Ignoring global configuration.")
     else:
         options_dict.update(platform_options)
         print(f"Build option overrides for {args.platform_config}:")
@@ -372,6 +372,12 @@ def run_ctest(extra_ctest_flags: str) -> int:
         {setupROOTEnv}
         ctest --output-on-failure --parallel {os.cpu_count()} --output-junit TestResults.xml {extra_ctest_flags}
     """)
+    if WINDOWS and ctest_result != 0:
+        ctest_result = subprocess_with_log(f"""
+            cd '{builddir}'
+            {setupROOTEnv}
+            ctest --output-on-failure --rerun-failed --output-junit TestResults.xml {extra_ctest_flags}
+        """)
 
     return ctest_result
 

.github/workflows/root-ci-config/buildconfig/fedora43.txt

@@ -1,5 +1,5 @@
 CMAKE_CXX_STANDARD=23
-experimental_adaptivecpp=ON
+experimental_adaptivecpp=OFF
 pythia8=ON
 roofit_multiprocess=ON
 test_distrdf_dask=OFF

.github/workflows/root-ci-config/buildconfig/fedora44.txt

@@ -1,5 +1,5 @@
 CMAKE_CXX_STANDARD=23
-experimental_adaptivecpp=ON
+experimental_adaptivecpp=OFF
 pythia8=ON
 roofit_multiprocess=ON
 test_distrdf_pyspark=OFF

.github/workflows/root-ci-config/buildconfig/ubuntu2404-cuda.txt

@@ -1,7 +1,7 @@
 CMAKE_BUILD_TYPE=RelWithDebInfo
 cuda=ON
-experimental_adaptivecpp=ON
-experimental_genvectorx=ON
+experimental_adaptivecpp=OFF
+experimental_genvectorx=OFF
 gdml=OFF
 spectrum=OFF
 sqlite=OFF

.github/workflows/root-ci-config/buildconfig/ubuntu2404.txt

@@ -1,2 +1,2 @@
-experimental_adaptivecpp=ON
-experimental_genvectorx=ON
+experimental_adaptivecpp=OFF
+experimental_genvectorx=OFF

.github/workflows/utilities/backport_pr.py

@@ -331,7 +331,7 @@ def principal():
                 thePR.postComment(prComment)
 
     if bpPRUrlBranch == []:
-        Exception('The PR was not ported to any branch!')
+        raise Exception('The PR was not ported to any branch!')
 
     # Let's write a clear message as a comment to communicate everything went well
     prComment = 'This PR has been backported to'

CMakeLists.txt

@@ -297,10 +297,8 @@ if(asan)
     set(ASAN_EXTRA_LD_PRELOAD "${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}ROOTSanitizerConfig${CMAKE_SHARED_LIBRARY_SUFFIX}:${ASAN_RUNTIME_LIBRARY}")
   endif()
 
-  foreach(item IN LISTS ASAN_EXTRA_CXX_FLAGS)
-    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:${item}>)
-  endforeach()
-  #add_link_options() not available in our CMake version:
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ASAN_EXTRA_CXX_FLAGS}")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ASAN_EXTRA_CXX_FLAGS}")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ASAN_EXTRA_SHARED_LINKER_FLAGS}")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ASAN_EXTRA_EXE_LINKER_FLAGS}")
 endif()
@@ -358,9 +356,6 @@ file(GLOB_RECURSE artifact_files RELATIVE ${CMAKE_SOURCE_DIR} etc/*)
 # Exclude the *.in files, just like in the install tree
 list(FILTER artifact_files EXCLUDE REGEX "\.(in)$")
 
-# Exclude etc/notebook/JsMVA
-list(FILTER artifact_files EXCLUDE REGEX "^etc/notebook/JsMVA/")
-
 foreach(artifact_file ${artifact_files})
   add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${artifact_file}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/${artifact_file} ${CMAKE_BINARY_DIR}/${artifact_file}
@@ -405,6 +400,9 @@ add_subdirectory (io)
 add_subdirectory (net)
 add_subdirectory (builtins/mathtext) # hard coded builtin for graf2d
 add_subdirectory (graf2d)
+if (opengl)
+  add_subdirectory (builtins/glad) # hard coded builtin for graf3d
+endif()
 add_subdirectory (graf3d)
 if(NOT minimal)
   add_subdirectory (gui)
@@ -529,7 +527,6 @@ install(
    PATTERN "*.pcm"
    PATTERN "modules.idx"
    PATTERN "JupyROOT" EXCLUDE
-   PATTERN "JsMVA" EXCLUDE
    PATTERN "python*" EXCLUDE
    PATTERN "cmake" EXCLUDE
    PATTERN "pkgconfig" EXCLUDE
@@ -605,7 +602,7 @@ add_custom_target(dist COMMAND cpack --config CPackConfig.cmake)
 get_cmake_property(variables CACHE_VARIABLES)
 foreach(var ${variables})
   if((var MATCHES "_(LIBRARIES|LIBRARY|INCLUDE|VERSION)") AND
-     (NOT ${${var}} STREQUAL "") AND
+     (NOT "${${var}}" STREQUAL "") AND
      (NOT ${var} MATCHES "NOTFOUND"))
     if (var MATCHES "^QT_")
       # filter out the very long list of Qt libraries and include dirs
@@ -636,7 +633,6 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
   endif()
   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
                          ${DIR_PERMISSIONS}
-                         PATTERN "notebook/JsMVA" EXCLUDE
                          PATTERN "system.rootrc" EXCLUDE
                          PATTERN "root.mimes" EXCLUDE
                          PATTERN "*.in" EXCLUDE)
@@ -691,6 +687,9 @@ if(pyroot)
   set(PYTESTS_WILLFAIL WILLFAIL)
 endif()
 
+#---Insert Python metadata for ROOT import package----------------------------------------------
+include(InstallPythonMetadata)
+
 #---Configure Testing using CTest----------------------------------------------------------------
 configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/CTestCustom.cmake ${CMAKE_BINARY_DIR} COPYONLY)
 if(testing)
@@ -728,6 +727,30 @@ if(LLVM_LINKER_IS_MOLD)
   endif()
 endif()
 
+if(asan)
+  # Now sanitize all executables that are not created with ROOT_EXECUTABLE()
+  # See core/sanitizer for details
+  function(sanitize_all_targets DIR_TO_SEARCH)
+    get_property(subdirs DIRECTORY "${DIR_TO_SEARCH}" PROPERTY SUBDIRECTORIES)
+    foreach(subdir IN LISTS subdirs)
+      sanitize_all_targets("${subdir}")
+    endforeach()
+
+    get_directory_property(directory_targets DIRECTORY "${DIR_TO_SEARCH}" BUILDSYSTEM_TARGETS)
+    if(NOT MSVC)
+      foreach(target IN LISTS directory_targets)
+        get_target_property(target_type ${target} TYPE)
+        get_target_property(target_libs ${target} LINK_LIBRARIES)
+        if(target_type STREQUAL EXECUTABLE AND NOT target STREQUAL ROOTStaticSanitizerConfig AND NOT target_libs MATCHES "ROOTStaticSanitizerConfig")
+          target_link_libraries(${target} PRIVATE ROOTStaticSanitizerConfig)
+          message(VERBOSE "Adding sanitizer library to ${target} (not created via a ROOT macro): ${target_libs}")
+        endif()
+      endforeach()
+    endif()
+  endfunction()
+  sanitize_all_targets(${CMAKE_CURRENT_SOURCE_DIR})
+endif()
+
 cmake_host_system_information(RESULT PROCESSOR QUERY PROCESSOR_DESCRIPTION)
 
 message(STATUS "ROOT Configuration \n

README/ReleaseNotes/v642/index.md

@@ -49,6 +49,8 @@ The following people have contributed to this new version:
 * Several enums that are redundant with `ROOT::ESTLType` are deprecated and will be removed in ROOT 6.44: `TClassEdit::ESTLType`, `TDictionary::ESTLType`, `TStreamerElement::ESTLType`. Please use `ROOT::ESTLType` instead.
 * The inclusion by external projects of Makefile templates contained within ROOT is deprecated in 6.42, a warning will be raised if you use them. These files will be removed in ROOT 7.
 * The conversion from Python set to **RooArgSet** is deprecated and won't work anymore in ROOT 6.44. The problem is that Python sets are unordered while RooArgSets are ordered, and this mismatch can lead to subtle problems later on. Prefer conversion from Python lists or tuples, which are ordered too.
+* The ROOT IO capability for the `TMVA::Experimental::SOFIE::RModel` has been removed. Users should not be encouraged to serialize models in experimental classes. For the serialization of ONNX models one can already use ONNX directly, and even serialize the ONNX bytes to a ROOT file if required.
+* The **JsMVA** feature for interactive TMVA training in Jupyter notebooks is now removed. It was not functional for years and was therefore already excluded from ROOT 6.38. This also removes the `TMVA::IPythonInteractive` class and the related interactive-training interfaces from the TMVA method and fitter classes, such as `MethodBase::ExitFromTraining()` or `FitterBase::SetIPythonInteractive()`.
 
 ## Python Interface
 
@@ -88,6 +90,21 @@ Users are strongly encouraged to switch to the vectorized CPU backend if they ar
 
 If the vectorized backend does not work for a given use case, **please report it by opening an issue on the ROOT GitHub repository**.
 
+### Default binning of RooFit variables changed to zero bins
+
+A freshly-constructed `RooRealVar` (or `RooErrorVar`) no longer has a default binning of 100 bins.
+Instead, `RooAbsRealLValue::getBins()` now returns `0` until a binning is explicitly set (e.g. via `RooRealVar::setBins()`).
+This makes it possible to distinguish a variable whose binning was deliberately chosen from one that was left at the default, which avoids
+writing redundant `nbins` fields when serializing workspaces to HS3 JSON.
+
+For the cases that previously relied on the default of 100 bins, that value is now injected by the relevant routine:
+unbinned-dataset plotting (`RooAbsRealLValue::frame()`), `RooAbsPdf::generateBinned()`, and `RooAbsRealLValue::createHistogram()`
+all fall back to `RooAbsRealLValue::DefaultNBins` (100) when the variable has no binning set.
+As a result, plotting, generating binned data and creating histograms from a default-constructed variable behave exactly as before.
+
+Code that reads `getBins()`/`numBins()` of a bare variable and expected the value `100` should either set the binning explicitly,
+or read the bin count from the relevant histogram or plot frame instead.
+
 ## Graphics and GUI
 
 ### Store canvas as HTML file
@@ -106,6 +123,10 @@ Such file can be loaded locally in any web browser or send as attachment in emai
 
 ## Geometry
 
+The [TGeometry](https://root.cern/doc/master/classTGeometry.html) classes (Geant 3 shapes) have been moved out of Graf3D into their own library.
+To link to these classes, use the cmake target `TGeometry` (preferred), `root-config --libs`, or link with `-lTGeometry`.
+When ROOT is configured with `-Dgeom=Off`, these classes are now off as well.
+
 ## Documentation and Examples
 
 ## Build, Configuration and Testing