Skip to content

Commit 4c8a26e

Browse files
nausiktnausikt
authored
Merge branch 'IB/CMSSW_15_1_X/master' into update-crab-prod-in-ib
2 parents 2bec753 + c4e8bac commit 4c8a26e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+631
-329
lines changed

‎AXOL1TL.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### RPM external AXOL1TL 5.0.0
1+
### RPM external AXOL1TL 5.0.1
22
Source: https://github.com/cms-hls4ml/%{n}/archive/refs/tags/v%{realversion}.tar.gz
33
Requires: hls4mlEmulatorExtras hls
44
BuildRequires: gmake

‎L1TSC4NGJetModel.spec‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
### RPM external L1TSC4NGJetModel 0.0.0
2+
Source: https://github.com/cms-hls4ml/%{n}/archive/refs/tags/v%{realversion}.tar.gz
3+
Requires: hls4mlEmulatorExtras hls
4+
BuildRequires: gmake
5+
6+
%prep
7+
%setup -n %{n}-%{realversion}
8+
9+
%build
10+
make %{makeprocesses} EMULATOR_EXTRAS=${HLS4MLEMULATOREXTRAS_ROOT} HLS_ROOT=${HLS_ROOT}
11+
12+
%install
13+
make PREFIX=%{i} install

‎SCRAMV1.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
### RPM lcg SCRAMV1 V3_00_81
1+
### RPM lcg SCRAMV1 V3_00_82
22
## NOCOMPILER
33
## NO_VERSION_SUFFIX
44

5-
%define tag 15e35540e5d65d9eec5a0b817bccac8b1f9fe9f9
5+
%define tag 7b4455f33cbf875bc8a618844a6e4fca84245104
66
%define branch SCRAMV3
77
%define github_user cms-sw
88
Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

‎cms-common.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
### RPM cms cms-common 1.0
2-
## REVISION 1247
2+
## REVISION 1251
33
## NOCOMPILER
44

5-
%define tag 81b35f466ec55e2899f6393dc8ddca6125650b4f
5+
%define tag aead6251e27548e048e86d829737664ad13e58ea
66
Source: git+https://github.com/cms-sw/cms-common.git?obj=master/%{tag}&export=%{n}-%{realversion}-%{tag}&output=/%{n}-%{realversion}-%{tag}.tgz
77

88
%prep

‎cmssw-drop-tools.file‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
%define skipreqtools jcompiler icc-cxxcompiler icc-ccompiler icc-f77compiler rivet2 opencl opencl-cpp intel-vtune icx-cxxcompiler icx-ccompiler icx-f77compiler
1+
%define skipreqtools jcompiler icc-cxxcompiler icc-ccompiler icc-f77compiler rivet2 opencl opencl-cpp intel-vtune icx-cxxcompiler icx-ccompiler icx-f77compiler mpich

‎cmssw-osenv.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
### RPM cms cmssw-osenv 241219.0
1+
### RPM cms cmssw-osenv 250428.0
22
## NOCOMPILER
33
## NO_VERSION_SUFFIX
44

55
# ***Do not change minor number of the above version. ***
66

7-
%define commit 14c3e364557bdb5474f485a84798d0575d2043da
7+
%define commit d3ebe2f441c80b46d06c6cebb4dbdcbebe98d0b7
88
%define branch master
99
# We do not use a revision explicitly, because revisioned packages do not get
1010
# updated automatically when there are dependencies.

‎cmssw-tools.spec‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### RPM cms cmssw-tools 2.0
1+
### RPM cms cmssw-tools 3.0
22
# With cmsBuild, change the above version only when a new tool is added
33

44
## INSTALL_DEPENDENCIES cmsLHEtoEOSManager gcc-fixincludes cms-cat cmssw-osenv cms-git-tools SCRAMV2
@@ -57,6 +57,7 @@ Requires: jemalloc-prof
5757
Requires: json
5858
Requires: ktjet
5959
Requires: L1METML
60+
Requires: L1TSC4NGJetModel
6061
Requires: lhapdf
6162
Requires: libjpeg-turbo
6263
Requires: libpng
@@ -77,7 +78,10 @@ Requires: numactl
7778
Requires: hwloc
7879
Requires: rdma-core
7980
Requires: ucx
81+
Requires: libfabric
8082
Requires: openmpi
83+
Requires: mpich
84+
Requires: mpi
8185
Requires: sigcpp
8286
Requires: sqlite
8387
Requires: tauolapp
@@ -172,7 +176,7 @@ Requires: icc
172176
Requires: icx
173177
Requires: intel-vtune
174178
Requires: ruff
175-
%{!?without_rocm:Requires: rocm rocm-rocrand}
179+
%{!?without_rocm:Requires: rocm}
176180
Requires: cmsmon-tools
177181
Requires: dip
178182
%else

‎cmssw-wm-tools.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
################################################################
22
####For any change, always update version number to latest date#
33
################################################################
4-
### RPM cms cmssw-wm-tools 211210
4+
### RPM cms cmssw-wm-tools 250417
55
## NOCOMPILER
66
## NO_VERSION_SUFFIX
77

8-
%define commit aa1626fb2d2fdbde6b3259e4b44828220883a809
8+
%define commit cd271d3796bfd8d0eff6500f801a4367bfd1b5dc
99
%define branch master
1010
Source0: git://github.com/cms-sw/%{n}.git?obj=%{branch}/%{commit}&export=%{n}&output=/%{n}-%{commit}.tgz
1111

‎conifer.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### RPM external conifer 1.6
1+
### RPM external conifer 1.7
22
## NOCOMPILER
33

44
Source: https://github.com/thesps/%{n}/archive/v%{realversion}.tar.gz

‎crab-dev.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#For any other change, increment version_suffix
44
##########################################
55
%define version_suffix 00
6-
%define crabclient_version v3.250217
6+
%define crabclient_version v3.250522
77
### RPM cms crab-dev %{crabclient_version}.%{version_suffix}
8-
%define crabserver_version v3.250215
8+
%define crabserver_version v3.250424
99

1010
## IMPORT crab-build

0 commit comments

Comments
 (0)