From a2fe5ee2a6d813764e0d175261eb99e4f38051dc Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sun, 29 Sep 2019 14:35:23 -0600 Subject: [PATCH 1/9] bump to latest snapshot and enable AGGRESSIVE_VECTORIZATION --- .gitignore | 1 + kokkos.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5ee57d5..b8ffe8c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /kokkos-d93e239baee253fca66b8b7f2196edaa40a2ef17.tar.gz +/kokkos-445c17625fe6dcfa8ddf98046301a648550c5738.tar.gz diff --git a/kokkos.spec b/kokkos.spec index 16e791e..a4a41ac 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,10 +1,10 @@ %global git 1 -%global commit d93e239baee253fca66b8b7f2196edaa40a2ef17 +%global commit 445c17625fe6dcfa8ddf98046301a648550c5738 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: kokkos Version: 3.0.0 -Release: 0.1.190912git%{shortcommit}%{?dist} +Release: 0.2.20190929git%{shortcommit}%{?dist} Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 ExcludeArch: i686 armv7hl @@ -54,6 +54,7 @@ pushd build %{cmake3} \ -DKokkos_ENABLE_TESTS=On \ -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos \ + -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_HWLOC=ON \ @@ -80,5 +81,8 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{_bindir}/nvcc_wrapper %changelog +* 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..8ad172b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-d93e239baee253fca66b8b7f2196edaa40a2ef17.tar.gz) = 60c88a9ca9c39d0f25175c16148b13a32e3b5b8ead1b89c8842f0d59c25a8f57192df44582113bb79a3f102d9fe6335db75ae41c882c616befa54c70a9363e9c +SHA512 (kokkos-445c17625fe6dcfa8ddf98046301a648550c5738.tar.gz) = dc6c6d3daba6917fa58fafbc690773982f7cef899046be794c84bd158c8b49bbdcee55279acbe0c6eb64a91533fbc50db05f1e8e18b133b9d55304012acbca79 From 719ea0f1bd99cfbe9a2719a9a300ccd34c1bc8fd Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 20 Dec 2019 11:41:53 -0700 Subject: [PATCH 2/9] bump to latest snapshot and enable Kokkos_ENABLE_DEPRECATED_CODE --- .gitignore | 1 + kokkos.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b8ffe8c..874150d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /kokkos-d93e239baee253fca66b8b7f2196edaa40a2ef17.tar.gz /kokkos-445c17625fe6dcfa8ddf98046301a648550c5738.tar.gz +/kokkos-6619d83a6d682ee83eabc7d23cf051d0ff77ff61.tar.gz diff --git a/kokkos.spec b/kokkos.spec index a4a41ac..a735d4e 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,10 +1,10 @@ %global git 1 -%global commit 445c17625fe6dcfa8ddf98046301a648550c5738 +%global commit 6619d83a6d682ee83eabc7d23cf051d0ff77ff61 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: kokkos Version: 3.0.0 -Release: 0.2.20190929git%{shortcommit}%{?dist} +Release: 0.2.20191216git%{shortcommit}%{?dist} Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 ExcludeArch: i686 armv7hl @@ -55,6 +55,7 @@ pushd build -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 \ @@ -81,6 +82,9 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{_bindir}/nvcc_wrapper %changelog +* Fri Dec 20 2019 Christoph Junghans - 3.0.0-0.2.20191216git6619d83 +- bump to latest snapshot and enable Kokkos_ENABLE_DEPRECATED_CODE + * Sun Sep 29 2019 Christoph Junghans - 3.0.0-0.2.20190929git445c176 - bump to latest snapshot and enable AGGRESSIVE_VECTORIZATION diff --git a/sources b/sources index 8ad172b..6135d50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-445c17625fe6dcfa8ddf98046301a648550c5738.tar.gz) = dc6c6d3daba6917fa58fafbc690773982f7cef899046be794c84bd158c8b49bbdcee55279acbe0c6eb64a91533fbc50db05f1e8e18b133b9d55304012acbca79 +SHA512 (kokkos-6619d83a6d682ee83eabc7d23cf051d0ff77ff61.tar.gz) = 18101e683262eed30f1a60eac054a7cc70e01a400529c39aea568678cae78e96f3954468df5548b29c7a91f836334d59ed9f4c0b37d7f8bfdc4cec412cd86733 From a9ad303a89380a7f46d4983afd8f277563875bb3 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 20 Dec 2019 12:23:38 -0700 Subject: [PATCH 3/9] disable StackTrace Unittests --- kokkos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kokkos.spec b/kokkos.spec index a735d4e..3b99d83 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -67,7 +67,9 @@ popd %make_install -C build %check -make -C build test CTEST_OUTPUT_ON_FAILURE=1 +# https://github.com/kokkos/kokkos/issues/2613 +%global testargs ARGS='-E UnitTest_StackTraceTest' +make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}} %files %doc README.md @@ -84,6 +86,7 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %changelog * 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 From 1b877244c104695bac179c5f9d520bc86c37cb88 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 20 Dec 2019 12:36:20 -0700 Subject: [PATCH 4/9] fix install --- kokkos.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kokkos.spec b/kokkos.spec index 3b99d83..185b56c 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -74,10 +74,10 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}} %files %doc README.md %license LICENSE -%{_libdir}/libkokkos.so.%{version} +%{_libdir}/libkokkos*.so.%{version} %files devel -%{_libdir}/libkokkos.so +%{_libdir}/libkokkos*.so %{_libdir}/pkgconfig/ %{_libdir}/cmake/Kokkos %{_includedir}/kokkos From e39b3bed0ff933c68ff81ee3d1b19ff3af3d8b87 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 23 Dec 2019 14:47:28 -0700 Subject: [PATCH 5/9] bump to latest release candidate snapshot --- .gitignore | 1 + kokkos.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 874150d..235983b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /kokkos-d93e239baee253fca66b8b7f2196edaa40a2ef17.tar.gz /kokkos-445c17625fe6dcfa8ddf98046301a648550c5738.tar.gz /kokkos-6619d83a6d682ee83eabc7d23cf051d0ff77ff61.tar.gz +/kokkos-cb90e9484286b8728d821bb5b1c23e74373bc47b.tar.gz diff --git a/kokkos.spec b/kokkos.spec index 185b56c..9738337 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,10 +1,10 @@ %global git 1 -%global commit 6619d83a6d682ee83eabc7d23cf051d0ff77ff61 +%global commit cb90e9484286b8728d821bb5b1c23e74373bc47b %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: kokkos Version: 3.0.0 -Release: 0.2.20191216git%{shortcommit}%{?dist} +Release: 0.2.20191219git%{shortcommit}%{?dist} Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 ExcludeArch: i686 armv7hl @@ -84,6 +84,9 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}} %{_bindir}/nvcc_wrapper %changelog +* 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 diff --git a/sources b/sources index 6135d50..0a40c38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-6619d83a6d682ee83eabc7d23cf051d0ff77ff61.tar.gz) = 18101e683262eed30f1a60eac054a7cc70e01a400529c39aea568678cae78e96f3954468df5548b29c7a91f836334d59ed9f4c0b37d7f8bfdc4cec412cd86733 +SHA512 (kokkos-cb90e9484286b8728d821bb5b1c23e74373bc47b.tar.gz) = 50183d66bcdfd4ed565e57cf2f9053879bd7067766e1d3bff077d7d682fa06518ddc6565a99e19f07c114a3b7af2327ffdaa247c9a70f6b757cec9fa763c6373 From 32741062673de146d95441d5a7f00d09860d8914 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sun, 12 Jan 2020 19:34:40 -0700 Subject: [PATCH 6/9] bump to latest release candidate snapshot --- .gitignore | 2 ++ kokkos.spec | 7 +++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 235983b..a120a05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ +/kokkos-*/ /kokkos-d93e239baee253fca66b8b7f2196edaa40a2ef17.tar.gz /kokkos-445c17625fe6dcfa8ddf98046301a648550c5738.tar.gz /kokkos-6619d83a6d682ee83eabc7d23cf051d0ff77ff61.tar.gz /kokkos-cb90e9484286b8728d821bb5b1c23e74373bc47b.tar.gz +/kokkos-e79d6b7311fb91c81477a7fc458ca5408e0c19d2.tar.gz diff --git a/kokkos.spec b/kokkos.spec index 9738337..2f8ac75 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,10 +1,10 @@ %global git 1 -%global commit cb90e9484286b8728d821bb5b1c23e74373bc47b +%global commit e79d6b7311fb91c81477a7fc458ca5408e0c19d2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: kokkos Version: 3.0.0 -Release: 0.2.20191219git%{shortcommit}%{?dist} +Release: 0.2.20200107git%{shortcommit}%{?dist} Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 ExcludeArch: i686 armv7hl @@ -84,6 +84,9 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}} %{_bindir}/nvcc_wrapper %changelog +* 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 diff --git a/sources b/sources index 0a40c38..abe3faa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-cb90e9484286b8728d821bb5b1c23e74373bc47b.tar.gz) = 50183d66bcdfd4ed565e57cf2f9053879bd7067766e1d3bff077d7d682fa06518ddc6565a99e19f07c114a3b7af2327ffdaa247c9a70f6b757cec9fa763c6373 +SHA512 (kokkos-e79d6b7311fb91c81477a7fc458ca5408e0c19d2.tar.gz) = 5a5b9b6acfb69410cba2234d7575b65ed30d9f45ffabff1d6ba984abac56272f4a433f6d5a1e9a0b381803b823091a0902e071d546e7be49071f689d1cd43d11 From d619d373d585175f6c888f3974a64c5b5e58c3af Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 14 Jan 2020 18:40:33 -0700 Subject: [PATCH 7/9] Added missing hwloc dep --- kokkos.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kokkos.spec b/kokkos.spec index 2f8ac75..57ac476 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -4,7 +4,7 @@ Name: kokkos Version: 3.0.0 -Release: 0.2.20200107git%{shortcommit}%{?dist} +Release: 0.2.20200107git%{shortcommit}%{?dist}.1 Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 ExcludeArch: i686 armv7hl @@ -36,6 +36,7 @@ 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} @@ -84,6 +85,9 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}} %{_bindir}/nvcc_wrapper %changelog +* 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 From dc8c95df67a488e67f4072eafe885d2001866b93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 07:44:35 +0000 Subject: [PATCH 8/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kokkos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kokkos.spec b/kokkos.spec index 57ac476..80f4603 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -4,7 +4,7 @@ Name: kokkos Version: 3.0.0 -Release: 0.2.20200107git%{shortcommit}%{?dist}.1 +Release: 0.3.20200107git%{shortcommit}%{?dist}.1 Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 ExcludeArch: i686 armv7hl @@ -85,6 +85,9 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}} %{_bindir}/nvcc_wrapper %changelog +* 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 From 06e5d34cdbb9f6bba36c541aa0d3e5274a07ef5f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 27 Feb 2020 17:20:24 -0700 Subject: [PATCH 9/9] Version bump to 3.0.00 --- .gitignore | 1 + kokkos.spec | 28 +++++++++------------------- sources | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index a120a05..e6c553b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /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 80f4603..ce41564 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,21 +1,14 @@ -%global git 1 -%global commit e79d6b7311fb91c81477a7fc458ca5408e0c19d2 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: kokkos -Version: 3.0.0 -Release: 0.3.20200107git%{shortcommit}%{?dist}.1 +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++ @@ -43,11 +36,7 @@ Requires: hwloc-devel This package contains the development files of %{name}. %prep -%if %{git} -%setup -q -n %{name}-%{commit} -%else %setup -q -%endif %build mkdir build @@ -68,14 +57,12 @@ popd %make_install -C build %check -# https://github.com/kokkos/kokkos/issues/2613 -%global testargs ARGS='-E UnitTest_StackTraceTest' -make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}} +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 @@ -85,6 +72,9 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}} %{_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 diff --git a/sources b/sources index abe3faa..316e01f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-e79d6b7311fb91c81477a7fc458ca5408e0c19d2.tar.gz) = 5a5b9b6acfb69410cba2234d7575b65ed30d9f45ffabff1d6ba984abac56272f4a433f6d5a1e9a0b381803b823091a0902e071d546e7be49071f689d1cd43d11 +SHA512 (kokkos-3.0.00.tar.gz) = f98feaedfb3b5759fdab35f68ca5b6bd3eacdb658ff0a7b91a33839fa266a8533c76213ebba6445ff7f2430bcdec8d05d7e4c023b63532515ba30223a27f3ebb