Skip to content

[15.0]Backport root bug fixes and generation of cuda.pcm #9899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: IB/CMSSW_15_0_X/master
Choose a base branch
from
+13 −68
Open

[15.0]Backport root bug fixes and generation of cuda.pcm #9899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5c4876
HLS: use patched version of hls from cms-externals
smuzaffar May 15, 2025
61efffc
[15.0]Backport root bug fixes and generation of cuda.pcm
smuzaffar May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 0 additions & 59 deletions hls-fix.patch
View file
Open in desktop

This file was deleted.

12 changes: 5 additions & 7 deletions hls.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
### RPM external hls 2019.08
%define tag 200a9aecaadf471592558540dc5a88256cbf880f
%define branch master
%define github_user Xilinx
### RPM external hls 2025.05
%define tag a3c0b0b444984aadba245a3b1fdffacaccea3141
%define branch cms/200a9ae
%define github_user cms-externals
%define runpath_opts -m examples
Source: git+https://github.com/%{github_user}/HLS_arbitrary_Precision_Types.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Patch0: hls-fix
Requires: gmake
BuildRequires: gmake

%prep
%setup -n %{n}-%{realversion}
%patch0 -p1

%build

Expand Down
10 changes: 8 additions & 2 deletions root.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
## INITENV SET ROOTSYS %{i}
## INCLUDE compilation_flags
## INCLUDE cpp-standard
%define tag 4e50d5412e654c757fe78cb5475b30363541951a
%define branch cms/v6-32-00-patches/4467b6916f
%define tag 63c27767f1be350ef3d684242da34f0d396cf97d
%define branch cms/v6-32-00-patches/69384a6a78

%define github_user cms-sw
Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

BuildRequires: cmake ninja

Requires: gsl libjpeg-turbo libpng libtiff giflib pcre2 python3 fftw3 xz xrootd libxml2 zlib davix tbb OpenBLAS py3-numpy lz4 freetype zstd
%{!?without_cuda:Requires: cuda}

%ifos linux
Requires: dcap
Expand Down Expand Up @@ -178,6 +179,11 @@ export ROOTSYS="%{i}"

ninja -v %{makeprocesses} install

# Generate cuda.pcm if CUDA is available
%if 0%{!?without_cuda:1}
echo '#include <cuda_runtime.h>' | %{i}/bin/root -b -n -l
%endif

find %{i} -type f -name '*.py' | xargs chmod -x
grep -rlI '#!.*python' %{i} | xargs chmod +x
for p in $(grep -rlI -m1 '^#\!.*python' %i/bin %i/etc) ; do
Expand Down