diff --git a/.gitignore b/.gitignore index 5ee57d5..e6c553b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ +/kokkos-*/ /kokkos-d93e239baee253fca66b8b7f2196edaa40a2ef17.tar.gz +/kokkos-445c17625fe6dcfa8ddf98046301a648550c5738.tar.gz +/kokkos-6619d83a6d682ee83eabc7d23cf051d0ff77ff61.tar.gz +/kokkos-cb90e9484286b8728d821bb5b1c23e74373bc47b.tar.gz +/kokkos-e79d6b7311fb91c81477a7fc458ca5408e0c19d2.tar.gz +/kokkos-3.0.00.tar.gz diff --git a/kokkos.spec b/kokkos.spec index 16e791e..ce41564 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,21 +1,14 @@ -%global git 1 -%global commit d93e239baee253fca66b8b7f2196edaa40a2ef17 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: kokkos -Version: 3.0.0 -Release: 0.1.190912git%{shortcommit}%{?dist} +Version: 3.0.00 +%global sover 3.0.0 +Release: 1%{?dist} Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 ExcludeArch: i686 armv7hl License: BSD URL: https://github.com/kokkos/kokkos -%if %{git} -Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz -%else -Source0: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz -%endif +Source0: https://github.com/kokkos/kokkos/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ @@ -36,17 +29,14 @@ currently can use OpenMP, Pthreads and CUDA as backend programming models. %package devel Summary: Development package for %{name} packages Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: hwloc-devel %description devel %{kokkos_desc} This package contains the development files of %{name}. %prep -%if %{git} -%setup -q -n %{name}-%{commit} -%else %setup -q -%endif %build mkdir build @@ -54,6 +44,8 @@ pushd build %{cmake3} \ -DKokkos_ENABLE_TESTS=On \ -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos \ + -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON \ + -DKokkos_ENABLE_DEPRECATED_CODE=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_HWLOC=ON \ @@ -65,20 +57,42 @@ popd %make_install -C build %check -make -C build test CTEST_OUTPUT_ON_FAILURE=1 +make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs} %files %doc README.md %license LICENSE -%{_libdir}/libkokkos.so.%{version} +%{_libdir}/libkokkos*.so.%{sover} %files devel -%{_libdir}/libkokkos.so +%{_libdir}/libkokkos*.so %{_libdir}/pkgconfig/ %{_libdir}/cmake/Kokkos %{_includedir}/kokkos %{_bindir}/nvcc_wrapper %changelog +* Thu Feb 27 2020 Christoph Junghans - 3.0.00-1 +- Version bump to 3.0.00 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.0.0-0.3.20200107gite79d6b7.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 15 2020 Christoph Junghans - 3.0.0-0.2.20200107gite79d6b7.1 +- Added missing hwloc dep + +* Sun Jan 12 2020 Christoph Junghans - 3.0.0-0.2.20200107gite79d6b7 +- bump to latest release candidate snapshot + +* Mon Dec 23 2019 Christoph Junghans - 3.0.0-0.2.20191219gitcb90e9 +- bump to latest release candidate snapshot + +* Fri Dec 20 2019 Christoph Junghans - 3.0.0-0.2.20191216git6619d83 +- bump to latest snapshot and enable Kokkos_ENABLE_DEPRECATED_CODE +- disable StackTrace Unittests + +* Sun Sep 29 2019 Christoph Junghans - 3.0.0-0.2.20190929git445c176 +- bump to latest snapshot and enable AGGRESSIVE_VECTORIZATION + * Wed Sep 18 2019 Christoph Junghans - 3.0.0-0.1.190912gitd93e239 - initial commit (bug #1751409) diff --git a/sources b/sources index f91ea62..316e01f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-d93e239baee253fca66b8b7f2196edaa40a2ef17.tar.gz) = 60c88a9ca9c39d0f25175c16148b13a32e3b5b8ead1b89c8842f0d59c25a8f57192df44582113bb79a3f102d9fe6335db75ae41c882c616befa54c70a9363e9c +SHA512 (kokkos-3.0.00.tar.gz) = f98feaedfb3b5759fdab35f68ca5b6bd3eacdb658ff0a7b91a33839fa266a8533c76213ebba6445ff7f2430bcdec8d05d7e4c023b63532515ba30223a27f3ebb