Skip to content
Merged
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
2 changes: 1 addition & 1 deletion cmssw-vectorization.file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%if "%{?package_vectorization}" != ""
%global vectorized_packages fastjet OpenBLAS rivet gbl lwtnn opencv
%global vectorized_packages fastjet OpenBLAS rivet gbl lwtnn opencv ucx
%if 0%{?without_tensorflow} <= 0
%global vectorized_packages %{vectorized_packages} tensorflow-sources tensorflow
%endif
Expand Down
5 changes: 5 additions & 0 deletions scram-tools.file/tools/ucx/vectorized.tmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<tool name="ucx_@TOOL_VECTORIZATION@" revision="1">
<client>
<environment name="@TOOL_VECTORIZATION_KEY@_LIBDIR" default="$TOOL_BASE/lib"/>
</client>
</tool>
25 changes: 15 additions & 10 deletions ucx.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
### RPM external ucx 1.19.0
### RPM external ucx 1.20.1
## INCLUDE microarch_flags
## INCLUDE cuda-flags
Source: https://github.com/openucx/%{n}/archive/refs/tags/v%{realversion}.tar.gz
BuildRequires: autotools
%{!?without_cuda:Requires: cuda gdrcopy}
Expand All @@ -15,6 +17,11 @@ Requires: xpmem

./configure \
--prefix=%i \
--enable-mt \
--disable-logging \
--disable-debug \
--disable-assertions \
--disable-params-check \
--disable-dependency-tracking \
--enable-openmp \
--enable-shared \
Expand All @@ -25,20 +32,14 @@ Requires: xpmem
--disable-doxygen-html \
--enable-compiler-opt \
--enable-cma \
--enable-mt \
--with-pic \
--with-gnu-ld \
%ifarch x86_64
--with-march=x86-64-v2 \
--with-sse41 \
--with-sse42 \
--without-avx \
%endif
--without-go \
--without-java \
%if 0%{!?without_cuda:1}
--with-cuda=$CUDA_ROOT \
--with-gdrcopy=$GDRCOPY_ROOT \
--with-nvcc-gencode='%{nvcc_flags_cuda_archs}' \
%else
--without-cuda \
--without-gdrcopy \
Expand All @@ -59,14 +60,18 @@ Requires: xpmem
--without-knem \
--with-xpmem=$XPMEM_ROOT \
--without-ugni \
%ifarch x86_64
CFLAGS="%{selected_microarch}" \
CXXFLAGS="%{selected_microarch}" \
%endif
CPPFLAGS="-I$NUMACTL_ROOT/include" \
LDFLAGS="-L$NUMACTL_ROOT/lib"

%build
make %{makeprocesses}
make %{makeprocesses} V=1

%install
make install
make install V=1

# remove pkg-config to avoid rpm-generated dependency on /usr/bin/pkg-config
rm -rf %{i}/lib/pkgconfig
Expand Down