From a5f01a9d32059c883f69671c0575c1d736c14d9e Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 28 Mar 2022 23:34:39 +0200 Subject: [PATCH 01/13] llvm] Update to version 14.0.0 --- llvm.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm.spec b/llvm.spec index 7fc1217a7ab..e3dead4e820 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,4 +1,4 @@ -### RPM external llvm 12.0.1 +### RPM external llvm 14.0.0 ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64 ## INITENV +PATH PYTHON3PATH %{i}/lib64/python%{cms_python3_major_minor_version}/site-packages @@ -7,10 +7,10 @@ Requires: gcc zlib python3 Requires: cuda AutoReq: no -%define llvmCommit 9f4ab770e61b68d2037cc7cda1f868a8ba52da85 -%define llvmBranch cms/release/12.x/fed4134 -%define iwyuCommit 5db414ac448004fe019871c977905cb7c2cff23f -%define iwyuBranch clang_11 +%define llvmCommit f5a6cc5bfc38f2598a4b667f29934df1187f9fbe +%define llvmBranch cms/release/14.x/3f43d80 +%define iwyuCommit d888efc52646dcf3e4e3a56af13aa23dd26abde0 +%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 From db2c1bab878549cb7253f5129c278d59b3841fc6 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Tue, 29 Mar 2022 19:03:36 +0200 Subject: [PATCH 02/13] testign non-cms changes --- llvm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index e3dead4e820..0fff6076740 100644 --- a/llvm.spec +++ b/llvm.spec @@ -7,7 +7,7 @@ Requires: gcc zlib python3 Requires: cuda AutoReq: no -%define llvmCommit f5a6cc5bfc38f2598a4b667f29934df1187f9fbe +%define llvmCommit 3f43d803382d57e3fc010ca19833077d1023e9c9 %define llvmBranch cms/release/14.x/3f43d80 %define iwyuCommit d888efc52646dcf3e4e3a56af13aa23dd26abde0 %define iwyuBranch master From 34ba4c4695ec1e4ca11ed1eea9ad9d1e72ee672f Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 30 Mar 2022 16:59:54 +0200 Subject: [PATCH 03/13] clang-tidy fixes from @gartung --- llvm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index 0fff6076740..05dd03acf1a 100644 --- a/llvm.spec +++ b/llvm.spec @@ -9,7 +9,7 @@ AutoReq: no %define llvmCommit 3f43d803382d57e3fc010ca19833077d1023e9c9 %define llvmBranch cms/release/14.x/3f43d80 -%define iwyuCommit d888efc52646dcf3e4e3a56af13aa23dd26abde0 +%define iwyuCommit 282462f20845d87aad8e6d55bccc06b3de1ab4d0 %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 From 99783acfaaae8a0c7231633799b5d99b90f38667 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 30 Mar 2022 17:11:38 +0200 Subject: [PATCH 04/13] use the correct commit --- llvm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm.spec b/llvm.spec index 05dd03acf1a..11f7b5cbe59 100644 --- a/llvm.spec +++ b/llvm.spec @@ -7,9 +7,9 @@ Requires: gcc zlib python3 Requires: cuda AutoReq: no -%define llvmCommit 3f43d803382d57e3fc010ca19833077d1023e9c9 +%define llvmCommit 282462f20845d87aad8e6d55bccc06b3de1ab4d0 %define llvmBranch cms/release/14.x/3f43d80 -%define iwyuCommit 282462f20845d87aad8e6d55bccc06b3de1ab4d0 +%define iwyuCommit d888efc52646dcf3e4e3a56af13aa23dd26abde0 %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 From 713a062c31de66a2f40e112da308b4fd588c4434 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 30 Mar 2022 19:54:56 +0200 Subject: [PATCH 05/13] updated dxr which include llvm 14.0 fixes --- py3-dxr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py3-dxr.spec b/py3-dxr.spec index 722db4b75bb..cd9f205e971 100644 --- a/py3-dxr.spec +++ b/py3-dxr.spec @@ -2,7 +2,7 @@ ## INITENV +PATH PYTHON3PATH %i/${PYTHON3_LIB_SITE_PACKAGES} Requires: zlib llvm sqlite Requires: py3-Jinja2 py3-parsimonious py3-pysqlite3 py3-Pygments -%define dxrCommit 4d24ba871f9f0df418c02fbbc7b949cb4371a4c5 +%define dxrCommit 480b5d0a56ca0cd96444b9d70210567261752553 %define triliteCommit e64a2a1 %define re2Version 20140304 %define branch cms/6ea764102a/py3 From 60f5213e59b414cef2cb109564318231f29caba0 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 30 Jun 2022 08:21:05 +0200 Subject: [PATCH 06/13] drop numba and llvmlite tools --- pip/requirements.txt | 2 -- python_tools.spec | 2 -- 2 files changed, 4 deletions(-) diff --git a/pip/requirements.txt b/pip/requirements.txt index 53cff7031f6..1c2d36aa4df 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -140,7 +140,6 @@ kiwisolver==1.3.2 law==0.1.5 lazy-object-proxy==1.6.0 lizard==1.17.9 -llvmlite==0.37.0 lockfile==0.12.2 luigi==3.0.3 lxml==4.6.5 @@ -170,7 +169,6 @@ networkx==2.6.2 neurolab==0.3.5 node-semver==0.8.0 notebook==6.4.3 -numba==0.54.0 numexpr==2.8.1 numpy==1.21.2 onnx==1.10.1 diff --git a/python_tools.spec b/python_tools.spec index 21e38da8518..0b41a007868 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -24,8 +24,6 @@ Requires: py3-pandas Requires: py3-Bottleneck Requires: py3-downhill Requires: py3-xgboost -Requires: py3-llvmlite -Requires: py3-numba Requires: py3-hep_ml Requires: py3-uncertainties Requires: py3-seaborn From 34a9fd33430454d7beb1d0a226eb2d5834383752 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 30 Jun 2022 08:47:10 +0200 Subject: [PATCH 07/13] update to llvm 14.0.6 --- llvm.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm.spec b/llvm.spec index 11f7b5cbe59..17dc4342739 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,4 +1,4 @@ -### RPM external llvm 14.0.0 +### RPM external llvm 14.0.6 ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64 ## INITENV +PATH PYTHON3PATH %{i}/lib64/python%{cms_python3_major_minor_version}/site-packages @@ -7,9 +7,9 @@ Requires: gcc zlib python3 Requires: cuda AutoReq: no -%define llvmCommit 282462f20845d87aad8e6d55bccc06b3de1ab4d0 -%define llvmBranch cms/release/14.x/3f43d80 -%define iwyuCommit d888efc52646dcf3e4e3a56af13aa23dd26abde0 +%define llvmCommit d88fe2a1cafb6621210a7a0ae968c1e8e797d2bb +%define llvmBranch cms/release/14.x/f28c006 +%define iwyuCommit 4c0f39615982c57a9cb313c971c6f45fca1cc1fe %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 From 783780b115e23b805dff0e0e665e02e6ee96bc8a Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 30 Jun 2022 10:17:42 +0200 Subject: [PATCH 08/13] Update llvm.spec --- llvm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index 17dc4342739..3dbd351f276 100644 --- a/llvm.spec +++ b/llvm.spec @@ -9,7 +9,7 @@ AutoReq: no %define llvmCommit d88fe2a1cafb6621210a7a0ae968c1e8e797d2bb %define llvmBranch cms/release/14.x/f28c006 -%define iwyuCommit 4c0f39615982c57a9cb313c971c6f45fca1cc1fe +%define iwyuCommit d88fe2a1cafb6621210a7a0ae968c1e8e797d2bb %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 From 72ef6a8a42e6908dc7c57d0e7a7c5fd43f0367cf Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 30 Jun 2022 10:42:55 +0200 Subject: [PATCH 09/13] Update llvm.spec --- llvm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index 3dbd351f276..09591a4e0ff 100644 --- a/llvm.spec +++ b/llvm.spec @@ -9,7 +9,7 @@ AutoReq: no %define llvmCommit d88fe2a1cafb6621210a7a0ae968c1e8e797d2bb %define llvmBranch cms/release/14.x/f28c006 -%define iwyuCommit d88fe2a1cafb6621210a7a0ae968c1e8e797d2bb +%define iwyuCommit d888efc52646dcf3e4e3a56af13aa23dd26abde0 %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 From db631ce0a07c6b351f735870e97d6ac706631ce3 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 30 Jun 2022 11:26:06 +0200 Subject: [PATCH 10/13] Update py3-dxr.spec --- py3-dxr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py3-dxr.spec b/py3-dxr.spec index 8f8a1794e6a..9bc073b6da9 100644 --- a/py3-dxr.spec +++ b/py3-dxr.spec @@ -2,7 +2,7 @@ ## INITENV +PATH PYTHON3PATH %i/${PYTHON3_LIB_SITE_PACKAGES} Requires: zlib llvm sqlite Requires: py3-Jinja2 py3-parsimonious py3-pysqlite3 py3-Pygments -%define dxrCommit de41946bc5601d100efb44780f11db71dafaeb1e +%define dxrCommit e79425eded8ca0ae882b4ccceaf27ae1aab446d3 %define branch cms/6ea764102a/py3 Source0: git+https://github.com/cms-externals/dxr.git?obj=%{branch}/%{dxrCommit}&export=dxr-%{dxrCommit}&module=dxr-%dxrCommit&output=/dxr-%{dxrCommit}.tgz From aa3c84a6acfd1c27ca397b43e6de1e5cbb391377 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 30 Jun 2022 12:10:38 +0200 Subject: [PATCH 11/13] rust 1.61.0 --- rust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index 2ecd91ae389..26912d13e33 100644 --- a/rust.spec +++ b/rust.spec @@ -1,4 +1,4 @@ -### RPM external rust 1.57.0 +### RPM external rust 1.61.0 %ifarch ppc64le %define build_arch powerpc64le-unknown-linux-gnu %else From 0814aae04c1de7adafdb62f5b868955123937628 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 30 Jun 2022 22:10:46 +0200 Subject: [PATCH 12/13] apply patch to link dylib libstdc --- rust-libstdc.patch | 35 +++++++++++++++++++++++++++++++++++ rust.spec | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 rust-libstdc.patch diff --git a/rust-libstdc.patch b/rust-libstdc.patch new file mode 100644 index 00000000000..f4e6540d224 --- /dev/null +++ b/rust-libstdc.patch @@ -0,0 +1,35 @@ +diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs +index ac758c1..11abfac 100644 +--- a/compiler/rustc_llvm/build.rs ++++ b/compiler/rustc_llvm/build.rs +@@ -347,18 +347,18 @@ fn main() { + + // C++ runtime library + if !target.contains("msvc") { +- if let Some(s) = llvm_static_stdcpp { +- assert!(!cxxflags.contains("stdlib=libc++")); +- let path = PathBuf::from(s); +- println!("cargo:rustc-link-search=native={}", path.parent().unwrap().display()); +- if target.contains("windows") { +- println!("cargo:rustc-link-lib=static:-bundle={}", stdcppname); +- } else { +- println!("cargo:rustc-link-lib=static={}", stdcppname); +- } +- } else if cxxflags.contains("stdlib=libc++") { +- println!("cargo:rustc-link-lib=c++"); +- } else { ++ if let Some(_s) = llvm_static_stdcpp { ++ // assert!(!cxxflags.contains("stdlib=libc++")); ++ // let path = PathBuf::from(s); ++ // println!("cargo:rustc-link-search=native={}", path.parent().unwrap().display()); ++ // if target.contains("windows") { ++ // println!("cargo:rustc-link-lib=static:-bundle={}", stdcppname); ++ // } else { ++ // println!("cargo:rustc-link-lib=static={}", stdcppname); ++ // } ++ //} else if cxxflags.contains("stdlib=libc++") { ++ // println!("cargo:rustc-link-lib=c++"); ++ //} else { + println!("cargo:rustc-link-lib={}", stdcppname); + } + } diff --git a/rust.spec b/rust.spec index 26912d13e33..ef2584bf4b7 100644 --- a/rust.spec +++ b/rust.spec @@ -8,11 +8,13 @@ %define branch master %define tag %{realversion} Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz +Patch0: rust-libstdc BuildRequires: python3 Requires: llvm %prep %setup -n %{n}-%{realversion} +%patch0 -p1 %build cat << EOF > config.toml From 028a67cf77ba9a28f91b6d1fd6f1b3033e87034d Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 1 Sep 2022 20:09:55 +0200 Subject: [PATCH 13/13] set --gcc-toolchain flag to point to cms gcc installation --- scram-tools.file/tools/llvm/llvm-ccompiler.xml | 1 + scram-tools.file/tools/llvm/llvm-cxxcompiler.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/scram-tools.file/tools/llvm/llvm-ccompiler.xml b/scram-tools.file/tools/llvm/llvm-ccompiler.xml index 0ac59e88363..ebb0e43273c 100644 --- a/scram-tools.file/tools/llvm/llvm-ccompiler.xml +++ b/scram-tools.file/tools/llvm/llvm-ccompiler.xml @@ -4,4 +4,5 @@ + diff --git a/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml index 9130dae09af..ff34cc29653 100644 --- a/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml +++ b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml @@ -28,6 +28,7 @@ +