cms-sw · smuzaffar · Jun 6, 2024 · Jun 3, 2024 · Jun 3, 2024 · Jun 3, 2024
diff --git a/bootstrap-bundle.spec b/bootstrap-bundle.spec
@@ -1,7 +1,6 @@
 ### RPM external bootstrap-bundle 3.0
 ## NO_AUTO_DEPENDENCY
 ## NOCOMPILER
-
 BuildRequires: gcc
 BuildRequires: db6-bootstrap lua-bootstrap file-bootstrap
 BuildRequires: xz-bootstrap libarchive-bootstrap
@@ -30,6 +29,7 @@ mkdir %{i}/share/misc
 cp ${FILE_BOOTSTRAP_ROOT}/share/misc/magic.mgc  %{i}/share/misc/magic.mgc
 rm -f %{i}/bin/xml2-config %{i}/lib/xml2Conf.sh
 
+%if 0%{!?use_system_gcc:1}
 #Bundle libstd and libgcc_s and libelf
 %ifos darwin
 cp -P $GCC_ROOT/lib/lib{stdc++,gcc_s}*.%{soname} %{i}/lib
@@ -41,6 +41,7 @@ cp -P $GCC_ROOT/lib/libdw.%{soname}* %{i}/lib
 cp -P $GCC_ROOT/lib/libdw-*.%{soname} %{i}/lib
 cp -P $GCC_ROOT/bin/readelf %{i}/bin
 %endif
+%endif
 
 find %{i}/bin -type f -writable -exec %{strip} {} \;
 # Do not strip archives, otherwise index of contents will be lost on newer binutils

diff --git a/bootstrap-driver.spec b/bootstrap-driver.spec
@@ -55,6 +55,15 @@ platformSeeds+=" libaio"
   platformSeeds+=" libxcrypt perl-libs"
 %endif
 
+platformSeeds+=" %{?rhel:libgcc}"
+%if 0%{?fedora:1}
+platformSeeds+=" libgcc libstdc++ elfutils-libelf libgfortran"
+#Needed by millepede
+platformSeeds+=" libgomp"
+#Needed by gdb
+platformSeeds+=" elfutils-debuginfod-client gmp mpfr"
+%endif
+
 defaultPkgs="cms+cms-common+1.0 cms+fakesystem+1.0"
 
 mkdir -p %{i}/etc/profile.d

diff --git a/cmssw-patch-tool-conf.spec → cmssw-patch-tools.spec b/cmssw-patch-tool-conf.spec → cmssw-patch-tools.spec
@@ -1,9 +1,9 @@
-### RPM cms cmssw-patch-tool-conf 5.0
+### RPM cms cmssw-patch-tools 1.0
 
 ## INSTALL_DEPENDENCIES cmsLHEtoEOSManager gcc-fixincludes
 
 Requires: cmssw
 
 ## INCLUDE cmssw-vectorization
 ## INCLUDE cmssw-drop-tools
-## INCLUDE scram-tool-conf
+## INCLUDE scram/tool-conf-src
diff --git a/cmssw-tool-conf.spec → cmssw-tools.spec b/cmssw-tool-conf.spec → cmssw-tools.spec
@@ -1,4 +1,4 @@
-### RPM cms cmssw-tool-conf 62.0
+### RPM cms cmssw-tools 1.0
 # With cmsBuild, change the above version only when a new tool is added
 
 ## INSTALL_DEPENDENCIES cmsLHEtoEOSManager gcc-fixincludes cmssw-osenv cms-git-tools SCRAMV2
@@ -76,7 +76,6 @@ Requires: sherpa
 Requires: libpciaccess
 Requires: numactl
 Requires: hwloc
-Requires: gdrcopy
 Requires: rdma-core
 Requires: ucx
 Requires: openmpi
@@ -153,14 +152,9 @@ Requires: rivet
 %ifos linux
 Requires: openldap
 Requires: gperftools
-Requires: cuda
-Requires: cuda-compatible-runtime
-Requires: alpaka
-
-%if "%{cmsos}" != "slc7_aarch64"
-Requires: cudnn
-%endif
+%{!?without_cuda:Requires: cuda cuda-compatible-runtime gdrcopy cudnn}
 
+Requires: alpaka
 Requires: libunwind
 %ifnarch ppc64le
 Requires: igprof
@@ -175,8 +169,7 @@ Requires: oracle
 Requires: icc
 Requires: icx
 Requires: intel-vtune
-Requires: rocm
-Requires: rocm-rocrand
+%{!?without_rocm:Requires: rocm rocm-rocrand}
 Requires: cmsmon-tools
 Requires: dip
 %else
@@ -194,4 +187,4 @@ Requires: pytorch-custom-ops
 ## INCLUDE tfaot-models
 ## INCLUDE cmssw-vectorization
 ## INCLUDE cmssw-drop-tools
-## INCLUDE scram-tool-conf
+## INCLUDE scram/tool-conf-src
diff --git a/coral-tool-conf.spec → coral-tools.spec b/coral-tool-conf.spec → coral-tools.spec
@@ -1,4 +1,4 @@
-### RPM cms coral-tool-conf 10.0
+### RPM cms coral-tools 1.0
 
 Requires: pcre
 Requires: python3
@@ -18,4 +18,4 @@ Requires: oracle
 
 %define skipreqtools jcompiler
 
-## INCLUDE scram-tool-conf
+## INCLUDE scram/tool-conf-src
diff --git a/cpu_features.spec b/cpu_features.spec
@@ -1,4 +1,4 @@
-### RPM external cpu_features 0.7.0
+### RPM external cpu_features 0.9.0
 
 Source: https://github.com/google/cpu_features/archive/refs/tags/v%{realversion}.tar.gz
 BuildRequires: gmake cmake

diff --git a/fwlite-tool-conf.spec → fwlite-tools.spec b/fwlite-tool-conf.spec → fwlite-tools.spec
@@ -1,15 +1,12 @@
-### RPM cms fwlite-tool-conf 20.0
+### RPM cms fwlite-tools 1.0
 # with cmsBuild, change the above version only when a new
 # tool is added
 ## INITENV SET CMSSW_TOOL_CONF_ROOT $FWLITE_TOOL_CONF_ROOT
 
-%ifarch x86_64
-Requires: rocm
-Requires: rocm-rocrand
-%endif
+%{!?without_rocm:Requires: rocm rocm-rocrand}
+%{!?without_cuda:Requires: cuda cuda-compatible-runtime}
+
 Requires: alpaka
-Requires: cuda-compatible-runtime
-Requires: cuda
 Requires: eigen
 Requires: fmt
 Requires: tbb
@@ -62,4 +59,4 @@ Requires: freetype
 %endif
 
 ## INCLUDE cmssw-drop-tools
-## INCLUDE scram-tool-conf
+## INCLUDE scram/tool-conf-src
diff --git a/hwloc.spec b/hwloc.spec
@@ -2,14 +2,15 @@
 Source: https://download.open-mpi.org/release/%{n}/v2.10/%{n}-%{realversion}.tar.bz2
 
 BuildRequires: autotools
-Requires: cuda libpciaccess libxml2 numactl
-%ifarch x86_64
-Requires: rocm
-%endif
+Requires: libpciaccess libxml2 numactl
+%{!?without_rocm:Requires: rocm}
+%{!?without_cuda:Requires: cuda}
+
 
 %prep
 %setup -n %{n}-%{realversion}
 
+%build
 ./configure \
   --prefix %{i} \
   --enable-shared \
@@ -20,15 +21,10 @@ Requires: rocm
   --disable-cairo \
   --disable-doxygen \
   --disable-opencl \
-  --with-cuda=$CUDA_ROOT \
-  --enable-cuda \
-  --enable-nvml \
-%ifarch x86_64
-  --with-rocm=$ROCM_ROOT \
-  --enable-rsmi \
-  --enable-plugins=cuda,nvml,rsmi \
-%else
-  --enable-plugins=cuda,nvml \
+  %{!?without_cuda:--with-cuda=$CUDA_ROOT --enable-cuda --enable-nvml} \
+  %{!?without_rocm:--with-rocm=$ROCM_ROOT --enable-rsmi} \
+%if 0%{!?without_cuda:1}%{!?without_rocm:1}
+  --enable-plugins=$(echo %{!?without_cuda:cuda,nvml,}%{!?without_rocm:rsmi} | sed 's|,$||') \
 %endif
   --with-pic \
   --with-gnu-ld \
@@ -40,7 +36,6 @@ Requires: rocm
   HWLOC_NUMA_CFLAGS="-I$NUMACTL_ROOT/include" \
   HWLOC_NUMA_LIBS="-L$NUMACTL_ROOT/lib -lnuma"
 
-%build
 make %{makeprocesses} 
 
 %install

diff --git a/java-env.spec b/java-env.spec
@@ -1,10 +1,10 @@
-### RPM external java-env 1.1
+### RPM external java-env 11.0
 ## INITENV SET JAVA_HOME %{java_home}
 ## INITENV +PATH PATH %{java_home}/bin
 ## INITENV +PATH LD_LIBRARY_PATH %{java_home}/lib
 ## NOCOMPILER
 
-%if %{rhel} < 9
+%if 0%{?rhel} >= 9
 # /usr/lib/jvm/java on EL8 contains java 1.8, and Bazel requires java 11
 %define java_home /usr/lib/jvm/java-11
 %else

diff --git a/jemalloc-common.file b/jemalloc-common.file
@@ -7,7 +7,7 @@ BuildRequires: autotools gmake
 
 %if "%{n}" != "jemalloc"
 %ifarch x86_64
-%if "%{rhel}" == "7"
+%if 0%{?rhel} == 7
 BuildRequires: patchelf
 %endif
 %endif

diff --git a/llvm.spec b/llvm.spec
@@ -4,7 +4,7 @@
 
 BuildRequires: cmake ninja
 Requires: gcc zlib python3
-Requires: cuda
+%{!?without_cuda:Requires: cuda}
 
 %define llvmCommit 83204dfcd4277154e46a5c6094aee389a7f260e8
 %define llvmBranch cms/release/17.x/afbe354
@@ -49,9 +49,11 @@ cmake %{_builddir}/llvm-%{realversion}-%{llvmCommit}/llvm \
   -DLLVM_ENABLE_PIC:BOOL=ON \
   -DLLVM_ENABLE_RTTI:BOOL=ON \
   -DLLVM_HOST_TRIPLE=$(gcc -dumpmachine) \
-  -DLLVM_TARGETS_TO_BUILD:STRING="X86;PowerPC;AArch64;NVPTX" \
+  -DLLVM_TARGETS_TO_BUILD:STRING="X86;PowerPC;AArch64%{!?without_cuda:;NVPTX}" \
+%if 0%{!?without_cuda:1}
   -DLIBOMPTARGET_NVPTX_ALTERNATE_HOST_COMPILER=/usr/bin/gcc \
   -DLIBOMPTARGET_NVPTX_COMPUTE_CAPABILITIES="%omptarget_cuda_archs" \
+%endif
   -DCMAKE_REQUIRED_INCLUDES="${ZLIB_ROOT}/include" \
   -DCMAKE_PREFIX_PATH="${ZLIB_ROOT}"
 

diff --git a/onnxruntime.spec b/onnxruntime.spec
@@ -7,10 +7,8 @@
 Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
 
 BuildRequires: cmake ninja
-Requires: protobuf py3-numpy py3-wheel py3-onnx zlib libpng py3-pybind11 cuda re2
-%if "%{cmsos}" != "slc7_aarch64"
-Requires: cudnn
-%endif
+Requires: protobuf py3-numpy py3-wheel py3-onnx zlib libpng py3-pybind11 re2
+%{!?without_cuda:Requires: cuda cudnn}
 
 %prep
 %setup -q -n %{n}-%{realversion}
@@ -21,7 +19,7 @@ rm -rf ../build; mkdir ../build; cd ../build
 USE_CUDA=OFF
 %if "%{cmsos}" != "slc7_aarch64"
 if [ "%{cuda_gcc_support}" = "true" ] ; then
-USE_CUDA=ON
+USE_CUDA=%{!?without_cuda:ON}
 %if 0%{!?without_cuda:1} 
 %define cuda_gcc_support $(\ 
   if [ ! -f %{_tmppath}/cache/cuda_gcc_supported.txt ] ; then \ 
     touch %{_builddir}/cuda_gcc_supported.cu &&\ 
     echo true > %{_builddir}/cuda_gcc_supported.txt &&\ 
     (nvcc -dc %{_builddir}/cuda_gcc_supported.cu -o %{_builddir}/cuda_gcc_supported.cu.o 2>&1 || echo 'unsupported GCC version') > %{_builddir}/cuda_gcc_supported.log &&\ 
     if [ $(grep -i 'unsupported ' %{_builddir}/cuda_gcc_supported.log | wc -l) -gt 0 ] ; then echo false > %{_builddir}/cuda_gcc_supported.txt ; fi;\ 
     mv %{_builddir}/cuda_gcc_supported.txt %{_tmppath}/cache/cuda_gcc_supported.txt ;\ 
   fi; cat %{_tmppath}/cache/cuda_gcc_supported.txt) 
 %else 
 %define cuda_gcc_support false 
 %endif 
 %if 0%{!?without_cuda:1} 
 %define cuda_gcc_support $(\ 
   if [ ! -f %{_tmppath}/cache/cuda_gcc_supported.txt ] ; then \ 
     touch %{_builddir}/cuda_gcc_supported.cu &&\ 
     echo true > %{_builddir}/cuda_gcc_supported.txt &&\ 
     (nvcc -dc %{_builddir}/cuda_gcc_supported.cu -o %{_builddir}/cuda_gcc_supported.cu.o 2>&1 || echo 'unsupported GCC version') > %{_builddir}/cuda_gcc_supported.log &&\ 
     if [ $(grep -i 'unsupported ' %{_builddir}/cuda_gcc_supported.log | wc -l) -gt 0 ] ; then echo false > %{_builddir}/cuda_gcc_supported.txt ; fi;\ 
     mv %{_builddir}/cuda_gcc_supported.txt %{_tmppath}/cache/cuda_gcc_supported.txt ;\ 
   fi; cat %{_tmppath}/cache/cuda_gcc_supported.txt) 
 %else 
 %define cuda_gcc_support false 
 %endif 
 fi
 %endif
 
@@ -33,9 +31,15 @@ cmake ../%{n}-%{realversion}/cmake -GNinja \
    -Donnxruntime_ENABLE_PYTHON=ON \
    -Donnxruntime_BUILD_SHARED_LIB=ON \
    -Donnxruntime_USE_CUDA=${USE_CUDA} \
+%if 0%{!?without_cuda:1}
    -Donnxruntime_CUDA_HOME="${CUDA_ROOT}" \
    -Donnxruntime_CUDNN_HOME="${CUDNN_ROOT}" \
    -Donnxruntime_NVCC_THREADS=0 \
+   -DCMAKE_CUDA_ARCHITECTURES=$(echo %{cuda_arch} | tr ' ' ';' | sed 's|;;*|;|') \
+   -DCMAKE_CUDA_FLAGS="-cudart shared" \
+   -DCMAKE_CUDA_RUNTIME_LIBRARY=Shared \
+   -DCMAKE_TRY_COMPILE_PLATFORM_VARIABLES="CMAKE_CUDA_RUNTIME_LIBRARY" \
+%endif
    -Donnxruntime_BUILD_CSHARP=OFF \
    -Donnxruntime_USE_OPENMP=OFF \
    -Donnxruntime_USE_TVM=OFF \
@@ -48,10 +52,6 @@ cmake ../%{n}-%{realversion}/cmake -GNinja \
    -Donnxruntime_DISABLE_CONTRIB_OPS=OFF \
    -Donnxruntime_PREFER_SYSTEM_LIB=ON \
    -Donnxruntime_BUILD_UNIT_TESTS=OFF \
-   -DCMAKE_CUDA_ARCHITECTURES=$(echo %{cuda_arch} | tr ' ' ';' | sed 's|;;*|;|') \
-   -DCMAKE_CUDA_FLAGS="-cudart shared" \
-   -DCMAKE_CUDA_RUNTIME_LIBRARY=Shared \
-   -DCMAKE_TRY_COMPILE_PLATFORM_VARIABLES="CMAKE_CUDA_RUNTIME_LIBRARY" \
    -DCMAKE_PREFIX_PATH="${ZLIB_ROOT};${LIBPNG_ROOT};${PROTOBUF_ROOT};${PY3_PYBIND11_ROOT};${RE2_ROOT}" \
    -DRE2_INCLUDE_DIR="${RE2_ROOT}/include" \
    -DCMAKE_CXX_FLAGS="-Wno-error=stringop-overflow -Wno-error=maybe-uninitialized"

diff --git a/openmpi.spec b/openmpi.spec
@@ -2,7 +2,7 @@
 ## INITENV SET OPAL_PREFIX %{i}
 Source: https://download.open-mpi.org/release/open-mpi/v4.1/%{n}-%{realversion}.tar.bz2
 BuildRequires: autotools
-Requires: cuda
+%{!?without_cuda:Requires: cuda}
 Requires: hwloc
 Requires: rdma-core
 Requires: xpmem
@@ -31,7 +31,7 @@ Requires: zlib
   --disable-mpi-java \
   --enable-openib-rdmacm-ibaddr \
   --with-zlib=$ZLIB_ROOT \
-  --with-cuda=$CUDA_ROOT \
+  %{!?without_cuda:--with-cuda=$CUDA_ROOT} \
   --with-hwloc=$HWLOC_ROOT \
   --without-ofi \
   --without-portals4 \

diff --git a/python_tools.spec b/python_tools.spec
@@ -174,7 +174,7 @@ Requires: py3-importlib-resources
 Requires: py3-smmap
 Requires: py3-zipp
 
-Requires: py3-pycuda
+%{!?without_cuda:Requires: py3-pycuda}
 
 Requires: py3-boost-histogram
 Requires: py3-hist

diff --git a/pytorch-cluster.spec b/pytorch-cluster.spec
@@ -8,7 +8,7 @@
 Source: git+https://github.com/%{github_user}/pytorch_cluster.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
 
 BuildRequires: cmake
-Requires: pytorch cudnn
+Requires: pytorch
 %define build_flags -Wall -Wextra -pedantic %{?arch_build_flags} 
 
 %prep

diff --git a/pytorch-scatter.spec b/pytorch-scatter.spec
@@ -8,7 +8,7 @@
 Source: git+https://github.com/%{github_user}/pytorch_scatter.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
 
 BuildRequires: cmake
-Requires: pytorch cudnn
+Requires: pytorch
 %define build_flags -Wall -Wextra -pedantic %{?arch_build_flags} 
 
 %prep

diff --git a/pytorch-sparse.spec b/pytorch-sparse.spec
@@ -8,7 +8,7 @@
 Source: git+https://github.com/%{github_user}/pytorch_sparse.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
 
 BuildRequires: cmake
-Requires: pytorch cudnn
+Requires: pytorch
 %define build_flags -Wall -Wextra -pedantic %{?arch_build_flags} 
 
 %prep

diff --git a/pytorch.spec b/pytorch.spec
@@ -16,7 +16,8 @@ Patch2: pytorch-system-fmt
 
 BuildRequires: cmake ninja
 Requires: eigen fxdiv numactl openmpi protobuf psimd python3 py3-PyYAML
-Requires: cuda cudnn OpenBLAS zlib protobuf fmt py3-pybind11
+Requires: OpenBLAS zlib protobuf fmt py3-pybind11
+%{!?without_cuda:Requires: cuda cudnn}
 
 %prep
 %setup -n %{n}-%{realversion}
@@ -32,7 +33,7 @@ source %{_sourcedir}/env
 USE_CUDA=OFF
 %if "%{cmsos}" != "slc7_aarch64"
 if [ "%{cuda_gcc_support}" = "true" ] ; then
-USE_CUDA=ON
+USE_CUDA=%{!?without_cuda:ON}
 fi
 %endif
 
@@ -43,10 +44,12 @@ cmake ../%{n}-%{realversion} \
     -DBUILD_TEST=OFF \
     -DBUILD_BINARY=OFF \
     -DBUILD_PYTHON=OFF \
+%if 0%{!?without_cuda:1}
     -DUSE_CUDA=${USE_CUDA} \
     -DTORCH_CUDA_ARCH_LIST="%{cuda_arch_float}" \
     -DCUDNN_INCLUDE_DIR=${CUDNN_ROOT}/include \
     -DCUDNN_LIBRARY=${CUDNN_ROOT}/lib64/libcudnn.so \
+%endif
     -DUSE_NCCL=OFF \
     -DUSE_FBGEMM=OFF \
     -DUSE_KINETO=OFF \

diff --git a/rocm-rocrand.spec b/rocm-rocrand.spec
@@ -1,7 +1,7 @@
 ### RPM external rocm-rocrand 5.6.1
 ## NOCOMPILER
 
-%if "%{rhel}" == "7"
+%if 0%{?rhel} == 7
 # allow rpm2cpio dependency on the bootstrap bundle
 %undefine drop_bootstrap_lib
 %define drop_bootstrap_lib true

diff --git a/rocm.spec b/rocm.spec
@@ -1,6 +1,6 @@
 ### RPM external rocm 5.6.1
 
-%if "%{rhel}" == "7"
+%if 0%{?rhel} == 7
 # allow rpm2cpio dependency on the bootstrap bundle
 %undefine drop_bootstrap_lib
 %define drop_bootstrap_lib true