Merge IB/CMSSW_11_2_X/master into IB/CMSSW_11_2_X/rootmodule.

codechecker.spec

@@ -1,8 +1,8 @@
 ### RPM external codechecker 0.1
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
 
-%define tag f10d1156e2295d688d6b0a80fae50df029caa1fd
-%define branch llvm9
+%define tag d0f091c40569bf5b618f3e415a9b07fa6d9044fc
+%define branch llvm10
 %define github_user cms-externals
 Source: git+https://github.com/%github_user/CMSCodeChecker.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
 

llvm.spec

@@ -1,4 +1,4 @@
-### RPM external llvm 9.0.1
+### RPM external llvm 10.0.0
 ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64
 ## INITENV +PATH PYTHON27PATH %{i}/lib64/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages
 ## INITENV +PATH PYTHON3PATH %{i}/lib64/python`echo $PYTHON3_VERSION | cut -d. -f 1,2`/site-packages
@@ -8,10 +8,10 @@ Requires: gcc zlib python python3
 Requires: cuda
 AutoReq: no
 
-%define llvmCommit 379a43bc841451feccf78db64f2ed5c9e62c7de8
-%define llvmBranch cms/release/9.x/c1a0a21
-%define iwyuCommit 06e88efada2ff6dbccee3bbb1279c10439daa4d2
-%define iwyuBranch clang_9.0
+%define llvmCommit 80c6853a9ea2d6b142111a4177f94fb8b39ba2cf
+%define llvmBranch cms/release/10.x/92d5c1b
+%define iwyuCommit a5a6f27dabeb7fbc59b06ea949a312201c2fbdcf
+%define iwyuBranch master
 
 Source0: git+https://github.com/cms-externals/llvm-project.git?obj=%{llvmBranch}/%{llvmCommit}&export=llvm-%{realversion}-%{llvmCommit}&module=llvm-%{realversion}-%{llvmCommit}&output=/llvm-%{realversion}-%{llvmCommit}.tgz
 Source1: git+https://github.com/include-what-you-use/include-what-you-use.git?obj=%{iwyuBranch}/%{iwyuCommit}&export=iwyu-%{realversion}-%{iwyuCommit}&module=iwyu-%{realversion}-%{iwyuCommit}&output=/iwyu-%{realversion}-%{iwyuCommit}.tgz

pip/llvmlite.file

@@ -2,5 +2,5 @@ Requires: llvm py2-wheel py2-enum34
 Patch0: py2-llvmlite-fpic-flag
 Patch1: py2-llvmlite-llvm9
 
-%define source0 git+https://github.com/numba/llvmlite?obj=master/6435ea21f73dbf909a0418ed16375361e40d9892&export=llvmlite-%{realversion}&output=/source.tar.gz
+%define source0 git+https://github.com/numba/llvmlite?obj=master/0be433f000ddad39a43a7469ce19e0692a8b73de&export=llvmlite-%{realversion}&output=/source.tar.gz
 %define PipPreBuild export LLVM_CONFIG=${LLVM_ROOT}/bin/llvm-config

pip/py3-numba.file

@@ -0,0 +1,5 @@
+Requires: py2-funcsigs py2-six py2-singledispatch py2-llvmlite py3-numpy python3
+Patch0: py3-numba-llvm33
+
+%define source0 git+https://github.com/numba/numba?obj=master/1ea770564cb3c0c6cb9d8ab92e7faf23cd4c4c19&export=numba-%{realversion}&output=/source.tar.gz
+%define RelocatePython %{i}/bin/*

pip/requirements.txt

@@ -117,7 +117,7 @@ kiwisolver==1.1.0
 lazy-object-proxy==1.4.3
 lizard==1.17.3
 #NO_AUTO_UPDATE: Source is defined in llvmlite.file, changing version here is not going to get new sources
-llvmlite==0.32.0x
+llvmlite==0.33.0dev
 lxml==4.5.0
 lz4==2.2.1
 Mako==1.1.2
@@ -142,14 +142,13 @@ nose-parameterized==0.6.0
 nose==1.3.7
 notebook==5.7.8 ; python_version<'3.0'
 notebook==6.0.2 ; python_version>'3.0'
-numba==0.47.0
+numba==0.50.0dev0 ; python_version>'3.0'
 numexpr==2.7.1
 numpy==1.16.6 ; python_version<'3.0'
 numpy==1.17.5 ; python_version>'3.0'
 #NO_AUTO_UPDATE:2: numpy versions >1.15.1 fail on aarch64
 numpy==1.15.1 ; python_version<'3.0' ; platform_machine=='aarch64'
 numpy==1.15.1 ; python_version>'3.0' ; platform_machine=='aarch64'
-oamap==0.12.4
 onnx==1.6.0
 onnxruntime==1.2.0 ; python_version>'3.0'
 opt-einsum==2.3.2 ; python_version<'3.0'

py2-dxr-llvm10.patch

@@ -0,0 +1,48 @@
+diff --git a/dxr/plugins/clang/dxr-index.cpp b/dxr/plugins/clang/dxr-index.cpp
+index bba5563..bd95878 100644
+--- a/dxr/plugins/clang/dxr-index.cpp
++++ b/dxr/plugins/clang/dxr-index.cpp
+@@ -3,6 +3,7 @@
+ #include "clang/AST/RecursiveASTVisitor.h"
+ #include "clang/Basic/SourceManager.h"
+ #include "clang/Basic/Version.h"
++#include "clang/Basic/FileManager.h"
+ #include "clang/Frontend/CompilerInstance.h"
+ #include "clang/Frontend/FrontendPluginRegistry.h"
+ #include "clang/Lex/Lexer.h"
+@@ -158,7 +159,7 @@ public:
+       m_currentFunction(NULL) {
+     inner = ci.getDiagnostics().takeClient();
+     ci.getDiagnostics().setClient(this, false);
+-    ci.getPreprocessor().addPPCallbacks(llvm::make_unique<PreprocThunk>(this));
++    ci.getPreprocessor().addPPCallbacks(std::make_unique<PreprocThunk>(this));
+   }
+
+   virtual DiagnosticConsumer *clone(DiagnosticsEngine &Diags) const {
+@@ -390,7 +391,7 @@ public:
+       recordValue("name", nd->getNameAsString());
+       recordValue("qualname", getQualifiedName(*nd));
+       recordValue("loc", locationToString(d->getLocation()));
+-      recordValue("kind", d->getKindName());
++      recordValue("kind", d->getKindName().str());
+       printScope(d);
+       // Linkify the name, not the `enum'
+       printExtent(nd->getLocation(), nd->getLocation());
+@@ -1070,7 +1071,7 @@ public:
+         // you include a nonexistent file.
+         !file ||
+
+-        !(target = getFileInfo(file->getName()))->interesting ||
++        !(target = getFileInfo(file->getName().str()))->interesting ||
+
+         // TODO: Come up with some kind of reasonable extent for macro-based
+         // includes, like #include FOO_MACRO.
+@@ -1151,7 +1152,7 @@ void PreprocThunk::InclusionDirective(  // same in 3.2 and 3.3
+ class DXRIndexAction : public PluginASTAction {
+ protected:
+   std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI, llvm::StringRef f) {
+-    return llvm::make_unique<IndexConsumer>(CI);
++    return std::make_unique<IndexConsumer>(CI);
+   }
+
+   bool ParseArgs(const CompilerInstance &CI,

py2-dxr.spec

@@ -19,6 +19,7 @@ Patch5: py2-dxr-clang37
 Patch6: py2-dxr-clang700
 Patch7: py2-dxr-llvm801
 Patch8: py2-dxr-dxrindex-fpic
+Patch9: py2-dxr-llvm10
 %define keep_archives true
 
 %prep
@@ -35,6 +36,7 @@ cd ..
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 mv trilite-%triliteCommit/* trilite
 %setup -T -D -n dxr-%dxrCommit
 

py2-llvmlite-llvm9.patch

@@ -6,7 +6,20 @@ diff -Naur a/ffi/build.py b/ffi/build.py
      print(out)
      if not (out.startswith('8.0.') or out.startswith('7.0.')
 -            or out.startswith('7.1.')):
-+            or out.startswith('7.1.') or out.startswith('9.0.')):
++            or out.startswith('7.1.') or out.startswith('9.0.') or out.startswith('10.0.')):
          msg = (
              "Building llvmlite requires LLVM 7.0.x, 7.1.x or 8.0.x Be sure to "
              "set LLVM_CONFIG to the right executable path.\n"
+diff --git a/ffi/linker.cpp b/ffi/linker.cpp
+index 57bb80b..2cc0019 100644
+--- a/ffi/linker.cpp
++++ b/ffi/linker.cpp
+@@ -42,7 +42,7 @@ LLVMPY_LinkModules(LLVMModuleRef Dest, LLVMModuleRef Src, const char **Err)
+     auto OldDiagnosticHandler = Ctx.getDiagnosticHandler();
+
+     // set the handler to a new one
+-    Ctx.setDiagnosticHandler(llvm::make_unique<ReportNotAbortDiagnosticHandler>(errstream));
++    Ctx.setDiagnosticHandler(std::make_unique<ReportNotAbortDiagnosticHandler>(errstream));
+
+     // link
+     bool failed = LLVMLinkModules2(Dest, Src);

py3-numba-llvm33.patch

@@ -0,0 +1,28 @@
+diff --git a/setup.py b/setup.py
+index d9af186..edfdd3c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -302,12 +302,8 @@ def get_ext_modules():
+
+ packages = find_packages(include=["numba", "numba.*"])
+
+-build_requires = [f'numpy >={min_numpy_build_version}']
+-install_requires = [
+-    f'llvmlite >={min_llvmlite_version},<={max_llvmlite_version}',
+-    f'numpy >={min_numpy_run_version}',
+-    'setuptools',
+-]
++build_requires = ['numpy >=1.11']
++install_requires = ['llvmlite>=0.31.0dev0,<=0.33.0.dev0', 'numpy', 'setuptools']
+
+ metadata = dict(
+     name='numba',
+@@ -346,7 +342,7 @@ metadata = dict(
+     packages=packages,
+     setup_requires=build_requires,
+     install_requires=install_requires,
+-    python_requires=f">={min_python_version}",
++    python_requires=">=3.6",
+     license="BSD",
+     cmdclass=cmdclass,
+ )

python_tools.spec

@@ -24,7 +24,7 @@ Requires: py2-downhill
 Requires: py2-theanets
 Requires: py2-xgboost
 Requires: py2-llvmlite
-Requires: py2-numba
+Requires: py3-numba
 Requires: py2-hep_ml
 Requires: py2-rep
 Requires: py2-uncertainties
@@ -35,7 +35,6 @@ Requires: py2-h5py
 Requires: py2-h5py-cache
 Requires: py2-root_pandas
 Requires: py2-uproot
-Requires: py2-oamap
 
 #this DOES NOT depend on numpy..
 Requires: py2-xrootdpyfs