iucar / rpms / root

Forked from rpms/root 3 years ago
Clone
aff214e
diff -ur root-6.18.00.orig/bindings/pyroot/ROOT.py root-6.18.00/bindings/pyroot/ROOT.py
aff214e
--- root-6.18.00.orig/bindings/pyroot/ROOT.py	2019-06-25 10:52:11.000000000 +0200
aff214e
+++ root-6.18.00/bindings/pyroot/ROOT.py	2019-06-26 15:14:34.684257765 +0200
aff214e
@@ -449,9 +449,7 @@
aff214e
 # This function is injected as method to the respective classes in Pythonize.cxx.
aff214e
 _root._RDataFrameAsNumpy = _RDataFrameAsNumpy
b8c8500
 
b8c8500
-# This Pythonisation is there only for 64 bits builds
b8c8500
-if (sys.maxsize > 2**32): # https://docs.python.org/3/library/platform.html#cross-platform
b8c8500
-    _root.CreateScopeProxy( "TTree" ).AsMatrix = _TTreeAsMatrix
b8c8500
+_root.CreateScopeProxy( "TTree" ).AsMatrix = _TTreeAsMatrix
b8c8500
 
b8c8500
 
b8c8500
 ### RINT command emulation ------------------------------------------------------
aff214e
diff -ur root-6.18.00.orig/bindings/pyroot/test/CMakeLists.txt root-6.18.00/bindings/pyroot/test/CMakeLists.txt
aff214e
--- root-6.18.00.orig/bindings/pyroot/test/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
aff214e
+++ root-6.18.00/bindings/pyroot/test/CMakeLists.txt	2019-06-26 15:22:03.843577496 +0200
aff214e
@@ -4,10 +4,7 @@
b8c8500
 ROOT_ADD_PYUNITTEST(pyroot_rvec rvec.py)
b8c8500
 if(NUMPY_FOUND)
b8c8500
   ROOT_ADD_PYUNITTEST(pyroot_array_interface array_interface.py)
b8c8500
-  # this excludes RDF for 32 bits builds because of clang/gcc abi issues
b8c8500
-  if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
aff214e
-    ROOT_ADD_PYUNITTEST(pyroot_rdataframe_asnumpy rdataframe_asnumpy.py)
b8c8500
-    ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
b8c8500
-  endif()
aff214e
+  ROOT_ADD_PYUNITTEST(pyroot_rdataframe_asnumpy rdataframe_asnumpy.py)
b8c8500
+  ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
b8c8500
 endif()
b8c8500
 
aff214e
diff -ur root-6.18.00.orig/build/unix/makepchinput.py root-6.18.00/build/unix/makepchinput.py
aff214e
--- root-6.18.00.orig/build/unix/makepchinput.py	2019-06-25 10:52:11.000000000 +0200
aff214e
+++ root-6.18.00/build/unix/makepchinput.py	2019-06-26 15:14:34.760256972 +0200
aff214e
@@ -263,9 +263,6 @@
b8c8500
                            "math/vdt",
b8c8500
                            "tmva/rmva"]
b8c8500
 
b8c8500
-   if (sys.platform != 'win32' and sys.maxsize <= 2**32): # https://docs.python.org/3/library/platform.html#cross-platform
b8c8500
-      PCHPatternsBlacklist.append("tree/dataframe")
b8c8500
-
b8c8500
    accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
b8c8500
                not isAnyPatternInString(PCHPatternsBlacklist,dirName)
b8c8500
 
aff214e
diff -ur root-6.18.00.orig/cmake/scripts/ROOTConfig.cmake.in root-6.18.00/cmake/scripts/ROOTConfig.cmake.in
aff214e
--- root-6.18.00.orig/cmake/scripts/ROOTConfig.cmake.in	2019-06-25 10:52:11.000000000 +0200
aff214e
+++ root-6.18.00/cmake/scripts/ROOTConfig.cmake.in	2019-06-26 15:14:34.768256889 +0200
b8c8500
@@ -83,7 +83,7 @@
b8c8500
   set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
b8c8500
   set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
b8c8500
 endif()
b8c8500
-foreach(_cpt Core Imt RIO Net Hist Graf Graf3d Gpad ROOTDataFrame Tree TreePlayer Rint Postscript Matrix Physics MathCore Thread MultiProc ${ROOT_FIND_COMPONENTS})
b8c8500
+foreach(_cpt Core Imt RIO Net Hist Graf Graf3d Gpad ROOTDataFrame ROOTVecOps Tree TreePlayer Rint Postscript Matrix Physics MathCore Thread MultiProc ${ROOT_FIND_COMPONENTS})
b8c8500
   find_library(ROOT_${_cpt}_LIBRARY ${_cpt} HINTS ${ROOT_LIBRARY_DIR})
b8c8500
   if(ROOT_${_cpt}_LIBRARY)
b8c8500
     mark_as_advanced(ROOT_${_cpt}_LIBRARY)
aff214e
diff -ur root-6.18.00.orig/config/root-config.in root-6.18.00/config/root-config.in
aff214e
--- root-6.18.00.orig/config/root-config.in	2019-06-25 10:52:11.000000000 +0200
aff214e
+++ root-6.18.00/config/root-config.in	2019-06-26 15:41:39.518330743 +0200
b8c8500
@@ -72,15 +72,10 @@
b8c8500
 newlib="-lNew"
b8c8500
 rootglibs="-lGui"
b8c8500
 rootevelibs="-lEve -lEG -lGeom -lGed -lRGL"
b8c8500
-rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTVecOps -lTree -lTreePlayer\
e02c54a
+rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTDataFrame -lROOTVecOps -lTree -lTreePlayer\
b8c8500
           -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread\
b8c8500
           -lMultiProc"
b8c8500
 
aff214e
-if [ "@UNIX@" != "1" ] || [ "@CMAKE_SIZEOF_VOID_P@" != "4" ]; then
b8c8500
-   rootlibs="$rootlibs -lROOTDataFrame"
b8c8500
-fi
b8c8500
-
b8c8500
-
b8c8500
 if test "$platform" = "win32"; then
b8c8500
    rootulibs="-include:_G__cpp_setupG__Net        \
b8c8500
               -include:_G__cpp_setupG__IO         \
aff214e
diff -ur root-6.18.00.orig/tree/dataframe/CMakeLists.txt root-6.18.00/tree/dataframe/CMakeLists.txt
aff214e
--- root-6.18.00.orig/tree/dataframe/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
aff214e
+++ root-6.18.00/tree/dataframe/CMakeLists.txt	2019-06-26 15:14:34.827256273 +0200
b8c8500
@@ -3,11 +3,6 @@
b8c8500
 # @author Danilo Piparo CERN, Pere Mato CERN
b8c8500
 ############################################################################
b8c8500
 
b8c8500
-# Disable RDataFrame on 32-bit UNIX platforms due to ROOT-9236
b8c8500
-if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
b8c8500
-  return()
b8c8500
-endif()
b8c8500
-
b8c8500
 if(arrow)
b8c8500
   list(APPEND RDATAFRAME_EXTRA_HEADERS ROOT/RArrowDS.hxx)
b8c8500
   list(APPEND RDATAFRAME_EXTRA_INCLUDES -I${ARROW_INCLUDE_DIR})
aff214e
diff -ur root-6.18.00.orig/tutorials/CMakeLists.txt root-6.18.00/tutorials/CMakeLists.txt
aff214e
--- root-6.18.00.orig/tutorials/CMakeLists.txt	2019-06-25 10:52:11.000000000 +0200
aff214e
+++ root-6.18.00/tutorials/CMakeLists.txt	2019-06-26 15:18:15.834951333 +0200
aff214e
@@ -212,10 +212,6 @@
aff214e
                  v7/ntuple/ntpl004_dimuon.C)
b8c8500
 endif()
b8c8500
 
b8c8500
-if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
aff214e
-  set(bits32_veto dataframe/*.C graphs/timeSeriesFrom*.C v7/ntuple/ntpl004_dimuon.C)
b8c8500
-endif()
b8c8500
-
b8c8500
 #---These ones are disabled !!! ------------------------------------
b8c8500
 set(extra_veto
b8c8500
   htmlex.C
aff214e
@@ -266,7 +262,6 @@
b8c8500
              ${classic_veto}
b8c8500
              ${pythia_veto}
b8c8500
              ${root7_veto}
b8c8500
-             ${bits32_veto}
b8c8500
              ${xrootd_veto}
b8c8500
              )
b8c8500
 
aff214e
@@ -424,13 +419,6 @@
b8c8500
 
b8c8500
   list(REMOVE_ITEM pytutorials ${pyveto})
b8c8500
 
b8c8500
-  if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
b8c8500
-    set(bits32_veto_py dataframe/*.py)
b8c8500
-    file(GLOB bits32_veto_py RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} dataframe/*.py)
b8c8500
-    list(REMOVE_ITEM pytutorials ${bits32_veto_py})
b8c8500
-    list(REMOVE_ITEM pytutorials pyroot/pyroot002_TTreeAsMatrix.py)
b8c8500
-  endif()
b8c8500
-
b8c8500
   #---Python tutorials dependencies--------------------------------------
b8c8500
   set(pyroot-ntuple1-depends tutorial-pyroot-hsimple-py)
b8c8500
   set(pyroot-h1draw-depends tutorial-pyroot-hsimple-py)