diff --git a/.gitignore b/.gitignore index 46c222c..6312a03 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libxsmm-1.6.3.tar.gz /libxsmm-1.8.tar.gz /libxsmm-1.8.1.tar.gz +/libxsmm-1.8.3.tar.gz diff --git a/libxsmm.spec b/libxsmm.spec index 6838088..30619e1 100644 --- a/libxsmm.spec +++ b/libxsmm.spec @@ -22,17 +22,17 @@ %bcond_with devtoolset %endif -# See check stanza -%global test 0 +%global somajor 1 +%global sominor 9 Name: libxsmm -Version: 1.8.1 -Release: 5%{?dist} +Version: 1.8.3 +Release: 1%{?dist} Summary: Small dense or sparse matrix multiplications and convolutions for x86_64 License: BSD URL: https://github.com/hfp/libxsmm Source0: https://github.com/hfp/libxsmm/archive/%version.tar.gz#/libxsmm-%version.tar.gz -BuildRequires: gcc-gfortran gcc-c++ python %{?test:openblas-devel} +BuildRequires: gcc-gfortran gcc-c++ python openblas-devel %if %{with devtoolset} BuildRequires: devtoolset-7-gcc-gfortran devtoolset-7-gcc-c++ %endif @@ -92,7 +92,9 @@ PATH=/opt/rh/devtoolset-7/root/usr/bin:$PATH %endif # OpenMP is only used by libxsmmext, so no need to turn it off. # SSE=0 avoids -msse3, given the packaging baseline of SSE2. -%global makeflags STATIC=0 SYM=1 SSE=0 AVX=0 LDFLAGS="%{?__global_ldflags}" VERSION_MAJOR=1 VERSION_MINOR=9 +# Avoid the ld hardening flags for now so the test works; see +# https://github.com/hfp/libxsmm/issues/204 +%global makeflags STATIC=0 SYM=1 SSE=0 AVX=0 VERSION_MAJOR=%somajor VERSION_MINOR=%sominor # LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags} %makeflags @@ -122,28 +124,23 @@ popd %check -# Fixme: This rebuilds the libraries (and currently fails due to not -# linking with -fopenmp). Disabled pending upstream query. -%if %{?test} make test TEST=1 %makeflags rm -r samples/cp2k/{cp2k,build} -%endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%{!?_licensedir:%global license %doc} - %files -%license LICENSE -%_libdir/*.so.* +%license LICENSE.md +%_libdir/libxsmm*.so.%{somajor}* %files devel %doc README.md -%_libdir/*.so -%_includedir/* +%_libdir/libxsmm*.so +%_includedir/libxsmm.f +%_includedir/libxsmm*.h %_bindir/libxsmm_gemm_generator %_bindir/libxsmm_conv_generator %_bindir/libxsmm_convwino_generator @@ -159,10 +156,15 @@ rm -r samples/cp2k/{cp2k,build} %files doc %doc README.md documentation/* samples -%license LICENSE +%license LICENSE.md %changelog +* Thu Mar 8 2018 Dave Love - 1.8.3-1 +- Update to 1.8.3 (#1528828) +- Fix running test +- Modify %%files for distribution changes and to specify lib soversion + * Wed Feb 07 2018 Fedora Release Engineering - 1.8.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 2acc7bc..285895e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libxsmm-1.8.1.tar.gz) = 30388de1edf46ae40b2ccdf224bd9febd1ffbb91f8250c89c03044fe1ea75754ce5155107ec9d027fe2e08963f1ac9d2e526ea84618d2cf50c2d5dfe8a1e074d +SHA512 (libxsmm-1.8.3.tar.gz) = 8fbe6e2b41886d98ba953ab7c7d718663fbaca4802ec202ac9a97635e2d2b106b779e55be55a817a0a80117cc01b208858451ca78d30b4bb104658c85d8575ef