diff --git a/pkg/debian/Makefile b/pkg/debian/Makefile index 0494f3e..650ca42 100644 --- a/pkg/debian/Makefile +++ b/pkg/debian/Makefile @@ -25,7 +25,7 @@ prep : $(DEBTARGETS) build : prep $(MAKE) -C ../.. src.build BUILDDIR=$(BUILDDIR) @printf "Building Debian package\n" - (cd $(BUILDDIR); debuild -eLD_LIBRARY_PATH -uc -us -d -b) + (cd $(BUILDDIR); debuild -eLD_LIBRARY_PATH -uc -us -d -b -Zxz) mkdir -p $(PKGDIR) mv $(BUILDDIR)/../libnccl*.deb $(PKGDIR)/ diff --git a/pkg/debian/libnccl-dev.install.in b/pkg/debian/libnccl-dev.install.in index 13eca26..45120e6 100644 --- a/pkg/debian/libnccl-dev.install.in +++ b/pkg/debian/libnccl-dev.install.in @@ -1,4 +1,4 @@ +bin/ncclras /usr/bin include/nccl.h /usr/include -include/nccl_net.h /usr/include lib/libnccl.so /usr/lib/${pkg:MultiArch} lib/libnccl_static.a /usr/lib/${pkg:MultiArch} diff --git a/pkg/debian/rules b/pkg/debian/rules index 23b90a9..8005d30 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -11,3 +11,6 @@ override_dh_auto_test: override_dh_auto_clean: # Do not make clean + +override_dh_builddeb: + dh_builddeb -- -Zxz diff --git a/pkg/redhat/nccl.spec.in b/pkg/redhat/nccl.spec.in index 8e5aed6..d629555 100644 --- a/pkg/redhat/nccl.spec.in +++ b/pkg/redhat/nccl.spec.in @@ -20,6 +20,7 @@ sockets. %package devel Summary: NVIDIA Collective Communication Library (NCCL) Runtime Group: Development/Libraries +Requires: libnccl >= ${nccl:Major}.${nccl:Minor}.${nccl:Patch} %description devel NCCL development files @@ -44,9 +45,10 @@ install -m 755 lib/libnccl.so.${nccl:Major}.${nccl:Minor}.${nccl:Patch} $RPM_BUI ln -s libnccl.so.${nccl:Major}.${nccl:Minor}.${nccl:Patch} $RPM_BUILD_ROOT/%{_libdir}/libnccl.so.${nccl:Major} # devel +install -m 755 -d $RPM_BUILD_ROOT/%{_bindir} install -m 755 -d $RPM_BUILD_ROOT/%{_includedir} +install -m 755 bin/ncclras $RPM_BUILD_ROOT/%{_bindir} install -m 644 include/nccl.h $RPM_BUILD_ROOT/%{_includedir} -install -m 644 include/nccl_net.h $RPM_BUILD_ROOT/%{_includedir} ln -s libnccl.so.${nccl:Major} $RPM_BUILD_ROOT/%{_libdir}/libnccl.so # static @@ -64,8 +66,8 @@ rm -rf $RPM_BUILD_ROOT %files devel %doc LICENSE.txt %defattr(-,root,root,-) +%{_bindir}/ncclras %{_includedir}/nccl.h -%{_includedir}/nccl_net.h %{_libdir}/libnccl.so %files static diff --git a/pkg/txz/create_txz.sh.in b/pkg/txz/create_txz.sh.in index deae854..88f9613 100644 --- a/pkg/txz/create_txz.sh.in +++ b/pkg/txz/create_txz.sh.in @@ -21,4 +21,4 @@ PKG_ARCH=${pkg:Arch} NCCLNAME="nccl_${NCCL_MAJOR}.${NCCL_MINOR}.${NCCL_PATCH}${NCCL_SUFFIX}-${PKG_REVISION}+cuda${CUDA_MAJOR}.${CUDA_MINOR}_${PKG_ARCH}" -tar --transform "s/^$BUILDDIR/$NCCLNAME/" -Jcf $NCCLNAME.txz --owner=0 --group=0 $BUILDDIR/include $BUILDDIR/lib $BUILDDIR/*.txt +tar --transform "s/^$BUILDDIR/$NCCLNAME/" -Jcf $NCCLNAME.txz --owner=0 --group=0 $BUILDDIR/bin $BUILDDIR/include $BUILDDIR/lib $BUILDDIR/*.txt