Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions abseil-cpp.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external abseil-cpp 20230802.2
### RPM external abseil-cpp 20250814.1
## INCLUDE cpp-standard

Source: https://github.com/abseil/abseil-cpp/archive/%{realversion}.tar.gz
Expand All @@ -7,7 +7,7 @@ BuildRequires: cmake gmake

%prep
%setup -n %{n}-%{realversion}
patch -p1 <%{_sourcedir}/1732.diff
#patch -p1 <%{_sourcedir}/1732.diff

%build
rm -rf ../build
Expand Down
11 changes: 7 additions & 4 deletions acts.spec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
### RPM external acts v44.0.1
### RPM external acts 46.8.1

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, this will break our ACTS/Traccc tests and possible the ongoing developments.

I'm in favour of updating ACTS, but we need to synchronise our work.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can create a separate IBs for this then and track it.

## INITENV +PATH PYTHON3PATH %{i}/python
## INCLUDE microarch_flags
## INCLUDE cuda-flags
## INCLUDE rocm-flags
## INCLUDE geant4-deps

%define tag 30fb4ea
%define branch cms/%{realversion}
%define github_user cms-externals
%define tag v%{realversion}
%define branch main
%define github_user acts-project
Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Source99: scram-tools.file/tools/eigen/env

Expand Down Expand Up @@ -71,6 +71,7 @@ cmake ../%{n}-%{realversion} \
-DCMAKE_BUILD_TYPE="Release" \
-DCMAKE_INSTALL_PREFIX="%{i}" \
-DCMAKE_SKIP_INSTALL_RPATH="ON" \
-DEigen3_DIR="$EIGEN_ROOT/share/eigen3/cmake" \
%if 0%{!?without_cuda:1}
-DCMAKE_CUDA_ARCHITECTURES="$(echo %{cuda_arch} | sed -e 's/ \+/;/g')" \
-DCMAKE_CUDA_FLAGS="-Wno-deprecated-gpu-targets" \
Expand Down Expand Up @@ -114,6 +115,8 @@ cmake ../%{n}-%{realversion} \
-DPython_EXECUTABLE=$(which python3) \
-DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS="ON" \
-DTRACCC_BUILD_TESTING="ON" \
-DTRACCC_BUILD_SIMULATION="ON" \
-DTRACCC_BUILD_PERFORMANCE="ON" \
-DCMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE=PRE_TEST \
%endif
-L
Expand Down
45 changes: 8 additions & 37 deletions bazel.spec
Original file line number Diff line number Diff line change
@@ -1,41 +1,12 @@
### RPM external bazel 6.5.0
### RPM external bazel 7.7.0
## INCLUDE cpp-standard

Source: https://github.com/bazelbuild/bazel/releases/download/%{realversion}/bazel-%{realversion}-dist.zip

BuildRequires: java-env python3 python-python3

# For some build steps, bazel uses a process-wrapper that is executed in an empty environment.
# Therefore, the wrapper is linked to the system library /lib64/libstdc++.so.6, and complains about
# a missing GLIBCXX_3.4.21 version when (e.g.) used during the compilation of tensorflow python
# modules invoked via swig. This mechanism of bazel is actually only useful in combination with its
# remote compilation features. When disabling the process-wrapper, the local environment is taken
# into account which is the desired behavior for us. For example, see:
# - https://github.com/bazelbuild/bazel/issues/4137
# - https://github.com/bazelbuild/bazel/issues/4510
# - https://github.com/tensorflow/tensorboard/issues/1611

# configuration issue
# https://github.com/bazelbuild/bazel/issues/9392
Patch0: bazel-3.7.0-patches
Patch1: bazel-absl

Source: https://github.com/bazelbuild/bazel/releases/download/%{realversion}/bazel-%{realversion}-linux-x86_64
BuildRequires: java-env
%prep
%setup -q -c -n bazel-%{realversion}

%patch0 -p1
%patch1 -p1

%setup -T -c -n bazel-%{realversion}
cp %{_sourcedir}/bazel-%{realversion}-linux-x86_64 bazel
%build

export EXTRA_BAZEL_ARGS="--define=ABSOLUTE_JAVABASE=${JAVA_HOME} --jobs %{compiling_processes}"
export BAZEL_CXXOPTS="-Wno-error=deprecated:-std=c++%{cms_cxx_standard}"
${JAVA_HOME}/bin/java -version 2>&1 | grep -E -i 'openjdk version "[1-9]'
if [ $(${JAVA_HOME}/bin/java -version 2>&1 | grep -E -i 'openjdk version "[1-9]' | sed -E 's|.* "([0-9]+)[.].*|\1|') -ge 17 ] ; then
export JNI_FLAGS="--add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED"
fi
bash ./compile.sh

# nothing to build — prebuilt binary
%install
mkdir %{i}/bin
cp output/bazel %{i}/bin/.
mkdir -p %{i}/bin
install -m 0755 bazel %{i}/bin/bazel
7 changes: 2 additions & 5 deletions eigen.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
### RPM external eigen c1d637433e3b3f9012b226c2c9125c494b470ae6
### RPM external eigen 5.0.1
## INITENV +PATH PKG_CONFIG_PATH %{i}/share/pkgconfig
## NOCOMPILER
## INCLUDE cpp-standard
%define tag b25e86af3379e35cd267d337693684dcdbdfd5d1
%define branch cms/master/%{realversion}
%define github_user cms-externals
Source: git+https://github.com/%{github_user}/eigen-git-mirror.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Source: git+https://gitlab.com/libeigen/eigen.git?tag=%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
BuildRequires: cmake

%prep
Expand Down
6 changes: 4 additions & 2 deletions fasthadd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
%define user cms-sw
Source0: https://raw.githubusercontent.com/%user/cmssw/%commit/DQMServices/Components/bin/fastHadd.cc
Source1: https://raw.githubusercontent.com/%user/cmssw/%commit/DQMServices/Core/src/ROOTFilePB.proto
Requires: protobuf root
Requires: protobuf root abseil-cpp

%prep

Expand All @@ -17,7 +17,9 @@ cp %{_sourcedir}/ROOTFilePB.proto .
protoc -I ./ --cpp_out=./ ROOTFilePB.proto
perl -p -i -e 's|DQMServices/Core/interface/||' ROOTFilePB.pb.cc fastHadd.cc
g++ -O2 -o %i/bin/fastHadd ROOTFilePB.pb.cc ./fastHadd.cc \
-I$PROTOBUF_ROOT/include -L$PROTOBUF_ROOT/lib -lprotobuf \
-I$PROTOBUF_ROOT/include -I$ABSEIL_CPP_ROOT/include \
-L$PROTOBUF_ROOT/lib -lprotobuf \
-L$ABSEIL_CPP_ROOT/lib $ABSEIL_CPP_ROOT/lib/libabsl_*.so \
`root-config --cflags --libs`

%install
2 changes: 1 addition & 1 deletion flatbuffers.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external flatbuffers 24.3.25
### RPM external flatbuffers 25.9.23
## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64
## INCLUDE cpp-standard
%define tag v%{realversion}
Expand Down
8 changes: 5 additions & 3 deletions grpc.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external grpc 1.35.0
### RPM external grpc 1.82.0
## INCLUDE cpp-standard

Source: git+https://github.com/grpc/grpc.git?obj=master/v%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
Expand All @@ -11,8 +11,8 @@ Requires: protobuf zlib pcre c-ares abseil-cpp re2
%prep

%setup -n %{n}-%{realversion}
patch -p1 <%{_sourcedir}/28212.patch
%patch1 -p1
#patch -p1 <%{_sourcedir}/28212.patch
#%patch1 -p1

%build
rm -rf ../build
Expand Down Expand Up @@ -42,3 +42,5 @@ ninja -v %{makeprocesses}
cd ../build
ninja -v %{makeprocesses} install
ln -sf ../../../abseil-cpp/${ABSEIL_CPP_VERSION}/include/absl %{i}/include/absl


8 changes: 0 additions & 8 deletions java-env.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,7 @@

#For RHEL: Use java 17 for el8/el9 and 21 for above
#Nor non RHEL e.g FC: use default system java
%define java_home /usr/lib/jvm/java
%if 0%{?rhel:1}
%if 0%{rhel} < 10
%define java_home /usr/lib/jvm/java-17
%endif
%if 0%{?rhel} >= 10
%define java_home /usr/lib/jvm/java-21
%endif
%endif
Source: none

%prep
Expand Down
16 changes: 16 additions & 0 deletions lwtnn-assert-fix.patch
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,19 @@ index 7678ac1..7de3018 100644

namespace {
int run_on_files(const lwt::JSONConfig& config,
diff --git a/cmake/FindEigen3.cmake b/cmake/FindEigen3.cmake
--- a/cmake/FindEigen3.cmake
+++ b/cmake/FindEigen3.cmake
@@ -30,7 +30,11 @@ if(NOT Eigen3_FIND_VERSION)
endif(NOT Eigen3_FIND_VERSION)

macro(_eigen3_check_version)
- file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
+ if(EXISTS "${EIGEN3_INCLUDE_DIR}/Eigen/Version")
+ file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/Version" _eigen3_version_header)
+ else()
+ file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
+ endif()

string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
11 changes: 11 additions & 0 deletions patches/pip/pyg-lib.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,14 @@ index 52399d2..542ca41 100644
packages=find_packages(),
ext_modules=ext_modules,
cmdclass=cmdclass,
--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,7 @@
f'-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={extdir}',
f'-DCMAKE_RUNTIME_OUTPUT_DIRECTORY={extdir}',
f'-DCMAKE_BUILD_TYPE={self.build_type}',
- f'-DCMAKE_PREFIX_PATH={torch.utils.cmake_prefix_path}',
+ f'-DCMAKE_PREFIX_PATH={torch.utils.cmake_prefix_path};{os.environ.get("CMAKE_PREFIX_PATH", "")}',
]

if WITH_CUDA and not os.getenv('TORCH_CUDA_ARCH_LIST'):
2 changes: 1 addition & 1 deletion pip/files/pyg-lib-common.file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## INCLUDE cpp-standard
## INCLUDE compilation_flags
%define default_pkgname py3-pyg-lib
Requires: zlib ninja
Requires: zlib ninja abseil-cpp
Patch0: patches/pip/pyg-lib
%define source0 git+https://github.com/pyg-team/pyg-lib?obj=master/%{realversion}&export=pyg-lib-%{realversion}&submodules=1&output=/source.tar.gz
%define patchsrc0 \
Expand Down
2 changes: 1 addition & 1 deletion pip/files/torch-extension-build.file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## INCLUDE compilation_flags
## INCLUDE microarch_flags
BuildRequires: cmake ninja
Requires: zlib
Requires: zlib abseil-cpp
%define build_flags -O2 %{?arch_build_flags} %{default_microarch}

%define PipPreBuild \
Expand Down
2 changes: 1 addition & 1 deletion pip/onnx.file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## INCLUDE cpp-standard
Patch0: patches/pip/py3-onnx
Requires: cmake protobuf py3-protobuf py3-six py3-typing-extensions py3-numpy py3-pytest-runner
Requires: py3-ml_dtypes
Requires: py3-ml_dtypes abseil-cpp
%define runpath_opts -n pb -n onnx
%define PipPreBuild export ONNX_ML=1;export CMAKE_ARGS="-DCMAKE_CXX_STANDARD=%{cms_cxx_standard} -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProtobuf_USE_STATIC_LIBS=OFF -DCMAKE_PREFIX_PATH=%{cmake_prefix_path}"
4 changes: 2 additions & 2 deletions pip/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ prettytable==3.17.0
prometheus-client==0.24.1
prompt_toolkit==3.0.52
propcache==0.4.1
protobuf==5.29.6
protobuf==6.31.1
prwlock==0.4.1
psutil==7.2.2
ptyprocess==0.7.0
Expand Down Expand Up @@ -413,7 +413,7 @@ tabulate==0.9.0
tblib==3.2.2
tenacity==9.1.4
#NO_AUTO_UPDATE:1: Force to use tensorflow 2.17.0; this should match the version in tensorflow-sources.spec
tensorflow==2.17.0
tensorflow==2.21.0
tensorboard==2.20.0
tensorflow-io-gcs-filesystem==0.37.1
tensorflow-estimator==2.15.0
Expand Down
2 changes: 1 addition & 1 deletion pip/torch.file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Patch1: patches/pytorch-typename-decltype
Patch2: patches/pytorch-hipblaslt-include

BuildRequires: cmake ninja python-python3 py3-packaging
Requires: fftw3 eigen fxdiv numactl openmpi protobuf psimd python3 py3-PyYAML
Requires: fftw3 eigen fxdiv numactl openmpi protobuf psimd python3 py3-PyYAML abseil-cpp
Requires: OpenBLAS zlib protobuf fmt py3-pybind11 py3-typing-extensions
Requires: py3-filelock py3-fsspec py3-Jinja2 py3-networkx py3-sympy

Expand Down
15 changes: 8 additions & 7 deletions protobuf.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external protobuf 3.21.9
### RPM external protobuf 6.31.1
## INCLUDE cpp-standard
#============= IMPORTANT NOTE ========================#
# When changing the version of protobuf, remember to regenerate protobuf objects in CMSSW
Expand All @@ -12,20 +12,20 @@
%define keep_archives true

Source: https://github.com/protocolbuffers/protobuf/archive/v%{realversion}.zip
Requires: zlib
Requires: zlib abseil-cpp
BuildRequires: cmake ninja
# improves text_format printing
Patch0: protobuf_text_format
Patch1: protobuf-non-virtual-dtor

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

# Make sure the default c++sdt stand is c++11
grep -q 'CMAKE_CXX_STANDARD *11' CMakeLists.txt
sed -i -e 's|CMAKE_CXX_STANDARD *11|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' CMakeLists.txt
#grep -q 'CMAKE_CXX_STANDARD *11' CMakeLists.txt
#sed -i -e 's|CMAKE_CXX_STANDARD *11|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' CMakeLists.txt
%build
rm -rf ../build
mkdir ../build
Expand All @@ -43,7 +43,8 @@ cmake ../%{n}-%{realversion} \
-DCMAKE_CXX_FLAGS="-I${ZLIB_ROOT}/include" \
-DCMAKE_C_FLAGS="-I${ZLIB_ROOT}/include" \
-DCMAKE_SHARED_LINKER_FLAGS="-L${ZLIB_ROOT}/lib" \
-DCMAKE_PREFIX_PATH="${ZLIB_ROOT}"
-DCMAKE_PREFIX_PATH="${ABSEIL_CPP_ROOT};${ZLIB_ROOT}" \
-Dprotobuf_ABSL_PROVIDER=package

ninja -v %{makeprocesses}

Expand Down
2 changes: 1 addition & 1 deletion tensorflow-requires.file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Requires: python3 py3-numpy py3-mock py3-typing-extensions
Requires: py3-keras-applications py3-keras-preprocessing py3-future py3-wrapt py3-gast py3-setuptools
Requires: py3-cython py3-protobuf py3-astor py3-six py3-termcolor py3-absl-py
Requires: py3-flatbuffers
Requires: py3-flatbuffers llvm hwloc
Requires: py3-psutil py3-lit py3-tblib py3-portpicker
Requires: eigen protobuf zlib libpng libjpeg-turbo curl giflib sqlite grpc flatbuffers py3-pybind11
%define enable_gpu 0
Expand Down
Loading