diff --git a/.hwloc.metadata b/.hwloc.metadata new file mode 100644 index 0000000..b123a13 --- /dev/null +++ b/.hwloc.metadata @@ -0,0 +1 @@ +60f5ca622ee70fbc098f372d7c8e651ed27e7e65 SOURCES/hwloc-1.7.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/hwloc-1.7-manpage.patch b/SOURCES/hwloc-1.7-manpage.patch new file mode 100644 index 0000000..9c010aa --- /dev/null +++ b/SOURCES/hwloc-1.7-manpage.patch @@ -0,0 +1,12 @@ +diff -ru hwloc-1.7-original/utils/hwloc-info.1in hwloc-1.7/utils/hwloc-info.1in +--- hwloc-1.7-original/utils/hwloc-info.1in 2013-03-26 21:00:18.000000000 +0100 ++++ hwloc-1.7/utils/hwloc-info.1in 2013-05-09 09:19:06.397752380 +0200 +@@ -148,7 +148,7 @@ + before reading this man page. Most of the concepts described in + hwloc(7) directly apply to the hwloc-calc utility. + . +-..\" ************************** ++.\" ************************** + .\" Examples Section + .\" ************************** + .SH EXAMPLES diff --git a/SOURCES/hwloc-1.7.patch b/SOURCES/hwloc-1.7.patch new file mode 100644 index 0000000..4003012 --- /dev/null +++ b/SOURCES/hwloc-1.7.patch @@ -0,0 +1,35 @@ +diff -ru hwloc-1.7-orig/src/topology-gl.c hwloc-1.7/src/topology-gl.c +--- hwloc-1.7-orig/src/topology-gl.c 2013-03-26 21:00:17.000000000 +0100 ++++ hwloc-1.7/src/topology-gl.c 2013-04-23 16:18:46.497469010 +0200 +@@ -85,12 +85,18 @@ + gpu_number = ptr_binary_data[1]; + free(ptr_binary_data); + ++#ifdef NV_CTRL_PCI_DOMAIN ++ + /* Gets the ID's of the GPU defined by gpu_number + * For further details, see the */ + err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0, + NV_CTRL_PCI_DOMAIN, &nv_ctrl_pci_domain); + if (!err) + continue; ++#else ++ nv_ctrl_pci_domain = 0; ++#endif ++ + + err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0, + NV_CTRL_PCI_BUS, &nv_ctrl_pci_bus); +@@ -102,11 +108,6 @@ + if (!err) + continue; + +- err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0, +- NV_CTRL_PCI_DOMAIN, &nv_ctrl_pci_domain); +- if (!err) +- continue; +- + err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0, + NV_CTRL_PCI_FUNCTION, &nv_ctrl_pci_func); + if (!err) +Only in hwloc-1.7/src: .topology-gl.c.swp diff --git a/SPECS/hwloc.spec b/SPECS/hwloc.spec new file mode 100644 index 0000000..a464738 --- /dev/null +++ b/SPECS/hwloc.spec @@ -0,0 +1,223 @@ +Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures +Name: hwloc +Version: 1.7 +Release: 1.2%{?dist} +License: BSD +Group: Applications/System +URL: http://www.open-mpi.org/projects/hwloc/ +Source0: http://www.open-mpi.org/software/hwloc/v1.7/downloads/%{name}-%{version}.tar.bz2 +Patch0: hwloc-1.7.patch +Patch1: hwloc-1.7-manpage.patch +Requires: %{name}-libs = %{version}-%{release} + +BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel libpciaccess-devel transfig doxygen texlive-latex texlive-makeindex libtool-ltdl-devel autoconf automake libtool +%ifnarch s390 s390x +BuildRequires: libibverbs-devel +%endif +%ifnarch s390 s390x %{arm} +BuildRequires: numactl-devel +##Requires: numactl-libs +%endif + +%description +The Portable Hardware Locality (hwloc) software package provides +a portable abstraction (across OS, versions, architectures, ...) +of the hierarchical topology of modern architectures, including +NUMA memory nodes, shared caches, processor sockets, processor cores +and processing units (logical processors or "threads"). It also gathers +various system attributes such as cache and memory information. It primarily +aims at helping applications with gathering information about modern +computing hardware so as to exploit it accordingly and efficiently. + +hwloc may display the topology in multiple convenient formats. +It also offers a powerful programming interface (C API) to gather information +about the hardware, bind processes, and much more. + +%package devel +Summary: Headers and shared development libraries for hwloc +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description devel +Headers and shared object symbolic links for the hwloc. + +%package libs +Summary: Run time libraries for the hwloc +Group: Development/Libraries + +%description libs +Run time libraries for the hwloc + +%package gui +Summary: The gui-based hwloc program(s) +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description gui +GUI-based tool for displaying system topology information. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +autoreconf --force --install +%configure +##sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +##sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%{__make} %{?_smp_mflags} V=1 + +%install +%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p" + +#Fix wrong permition on file hwloc-assembler-remote => I have reported this to upstream already +%{__chmod} 0755 %{buildroot}%{_bindir}/hwloc-assembler-remote + +# We don't ship .la files. +%{__rm} -rf %{buildroot}%{_libdir}/libhwloc.la + +%{__mv} %{buildroot}%{_defaultdocdir}/%{name} %{buildroot}%{_defaultdocdir}/%{name}-%{version} +%{__cp} -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}-%{version} +%{__cp} -p doc/hwloc-hello.c %{buildroot}%{_defaultdocdir}/%{name}-%{version} + +%check +%{__make} check + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files +%defattr(-, root, root, -) +%{_bindir}/%{name}* +%{_bindir}/lstopo-no-graphics +%{_mandir}/man1/%{name}* +%{_mandir}/man1/lstopo-no-graphics* + +%files devel +%defattr(-, root, root, -) +%{_libdir}/pkgconfig/* +%{_mandir}/man3/* +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/* +%{_includedir}/%{name}.h +%{_defaultdocdir}/%{name}-%{version}/*c +%{_libdir}/*.so + +%files libs +%defattr(-, root, root, -) +%{_mandir}/man7/%{name}* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/%{name}.dtd +%{_datadir}/%{name}/%{name}-valgrind.supp +%dir %{_defaultdocdir}/%{name}-%{version} +%{_defaultdocdir}/%{name}-%{version}/*[^c] +%{_libdir}/libhwloc*so.* + +%files gui +%{_bindir}/lstopo +%{_mandir}/man1/lstopo.* + + +%changelog +* Fri Sep 13 2013 Jay Fenlason - 1.7-1.2 +- Split out lstopo into a -gui subpackage, so the hwloc base package + does not pull in all of X. + Resolves: rhbz910165 + +* Thu Aug 1 2013 Jay Fenlason - 1.7-1.1 +- Remove build dependencies on libXNVCtrl-devel and w3m because RHEL + does not have them (w3m is available on x86_64, but not s390). + Resolves: rhbz978752 + +* Thu May 9 2013 Jirka Hladky - 1.7-1 +- Minor issue with the man page fixed + +* Tue Apr 23 2013 Jirka Hladky - 1.7-0 +- Update to version 1.7 + +* Thu Jan 31 2013 Jirka Hladky - 1.6.1-1 +- Created libs package with reduced dependencies + +* Sat Jan 19 2013 Jirka Hladky - 1.6.1-0 +- Update to version 1.6.1 + +* Mon Nov 5 2012 Jirka Hladky - 1.5.1-1 +- Update to version 1.5.1 + +* Wed Aug 15 2012 Jirka Hladky - 1.5-1 +- Update to version 1.5 + +* Thu Jul 19 2012 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue May 15 2012 Orion Poplawski - 1.4.2-1 +- Update to version 1.4.2 + +* Wed Apr 18 2012 Jirka Hladky - 1.4.1-2 +- Fixed build dependency for s390x + +* Mon Apr 16 2012 Jirka Hladky - 1.4.1-1 +- Update to version 1.4.1 +- BZ812622 - libnuma was splitted out of numactl package + +* Thu Apr 12 2012 Dan Horák - 1.4-2 +- no InfiniBand on s390(x) + +* Wed Feb 14 2012 Jirka Hladky - 1.4-1 +- Update to 1.4 release + +* Mon Nov 14 2011 Peter Robinson - 1.3-1 +- Update build for ARM support + +* Sat Oct 15 2011 Jirka Hladky - 1.3-0 + - 1.3 release + - added dependency on libibverbs-devel pciutils-devel + - cannot provide support for cuda (cuda_runtime_api.h). + - Nvidia CUDA is free but not open-source therefore not in Fedora. + +* Fri Oct 07 2011 Jirka Hladky - 1.2.2-1 + - moved *.so to the devel package + - libhwloc*so* in the main package + +* Wed Oct 05 2011 Jirka Hladky - 1.2.2-0 +- 1.2.2 release +- Fix for BZ https://bugzilla.redhat.com/show_bug.cgi?id=724937 for 32-bit PPC + +* Sat Sep 17 2011 Jirka Hladky - 1.2.1-0 +- 1.2.1 release +- Moved libhwloc*.so* to the main package + +* Mon Jun 27 2011 Jirka Hladky - 1.2-0 +- 1.2 release + +* Wed Feb 09 2011 Fedora Release Engineering - 1.1-0.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 3 2011 Dan Horák - 1.1-0.1 +- fix build on s390(x) where numactl is missing + +* Sat Jan 1 2011 Jirka Hladky - 1.1-0 +- 1.1 rel# Patch to the 1.1 fix 2967 http://www.open-mpi.org/software/hwloc/nightly/v1.1/hwloc-1.1rc6r2967.tar.bz2 +- Fix hwloc_bitmap_to_ulong right after allocating the bitmap. +- Fix the minimum width of NUMA nodes, caches and the legend in the graphical lstopo output. +- Cleanup error management in hwloc-gather-topology.sh. +- Add a manpage and usage for hwloc-gather-topology.sh on Linux. +- Rename hwloc-gather-topology.sh to hwloc-gather-topology to be consistent with the upcoming version 1.2ease + +* Mon Jul 19 2010 Jirka Hladky - 1.0.2-1 +- 1.0.2 release +- added "check" section to the RPM SPEC file + +* Mon Jul 19 2010 Jirka Hladky - 1.0.2-0.1.rc1r2330 +- 1.0.2 release candidate + +* Mon Jul 12 2010 Jirka Hladky - 1.0.1-19 +- Fixed issues as described at https://bugzilla.redhat.com/show_bug.cgi?id=606498#c6 + +* Fri Jul 09 2010 Jirka Hladky - 1.0.1-18 +- Fixed issues as described at https://bugzilla.redhat.com/show_bug.cgi?id=606498 + +* Fri Jun 18 2010 Jirka Hladky - 1.0.1-17 +- Initial build