The package rpms/kokkos.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/kokkos.git/commit/?id=438acffb407c2a....
Change: +%ifarch s390x
Thanks.
Full change: ============
commit c33685d72082194bb814d60654338b7fc11d116a Author: Christoph Junghans junghans@lanl.gov Date: Sat Jan 23 11:07:25 2021 -0700
Version bump to v3.3.01 (bug #1919508)
diff --git a/.gitignore b/.gitignore index bdd791a..642bb4f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /kokkos-3.2.00.tar.gz /kokkos-3.2.01.tar.gz /kokkos-3.3.00.tar.gz +/kokkos-3.3.01.tar.gz diff --git a/kokkos.spec b/kokkos.spec index a2dafb3..af23cb8 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,6 +1,6 @@ Name: kokkos -Version: 3.3.00 -%global sover 3.3.0 +Version: 3.3.01 +%global sover 3.3.1 Release: 1%{?dist} Summary: Kokkos C++ Performance Portability Programming # no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 @@ -73,6 +73,9 @@ This package contains the development files of %{name}. %{_bindir}/kokkos_launch_compiler
%changelog +* Sat Jan 23 08:19:42 MST 2021 Christoph Junghans junghans@lanl.gov - 3.3.01-1 +- Version bump to v3.3.01 (bug #1919508) + * Sat Dec 19 13:38:32 MST 2020 Christoph Junghans junghans@votca.org - 3.3.00-1 - Version bump to v3.3.00 (bug #1909362)
diff --git a/sources b/sources index 37e83ad..abd86bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-3.3.00.tar.gz) = c5b1fb20d5470b99d1ea39a593d6adec58fd5d8b041df587b45c2222ee3de2cc10e13a164fea3201b504f8a9605c4d5d57380ff62b220a6098427e106cd2acf0 +SHA512 (kokkos-3.3.01.tar.gz) = 9271be6ef080ac60b588b20d6d13c654311221691295dda199bbb833ab3fda7024aa0672ca3304f07824507e8d0708b7f58d8a707b84ad08e82357e00fe8fcae
commit 6b3737f1a8c7ab1f4f5ce14eda37112172f07401 Author: Christoph Junghans junghans@lanl.gov Date: Sat Dec 19 17:28:24 2020 -0700
Version bump to v3.3.00 (bug #1909362)
diff --git a/.gitignore b/.gitignore index 0716ae0..bdd791a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /kokkos-3.1.01.tar.gz /kokkos-3.2.00.tar.gz /kokkos-3.2.01.tar.gz +/kokkos-3.3.00.tar.gz diff --git a/3308.patch b/3308.patch deleted file mode 100644 index ff66179..0000000 --- a/3308.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 766a82445380c8a36ad90c51f48f110a6624a176 Mon Sep 17 00:00:00 2001 -From: Christoph Junghans junghans@lanl.gov -Date: Tue, 25 Aug 2020 14:07:28 -0600 -Subject: [PATCH] cmake: rename libprinter-tool - ---- - core/unit_test/CMakeLists.txt | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/core/unit_test/CMakeLists.txt b/core/unit_test/CMakeLists.txt -index 8ce6ca3d3..f241c5bf1 100644 ---- a/core/unit_test/CMakeLists.txt -+++ b/core/unit_test/CMakeLists.txt -@@ -417,10 +417,12 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate - if(KOKKOS_ENABLE_LIBDL) - - KOKKOS_ADD_LIBRARY( -- printer-tool SHARED -+ kokkosprinter-tool SHARED - SOURCES tools/printing-tool.cpp - ) - -+ SET_TARGET_PROPERTIES(kokkosprinter-tool PROPERTIES VERSION ${Kokkos_VERSION}) -+ - KOKKOS_ADD_TEST_EXECUTABLE( - ProfilingAllCalls - tools/TestAllCalls.cpp -@@ -433,7 +435,7 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate - - KOKKOS_ADD_TEST( NAME ProfilingTestLibraryLoad - EXE ProfilingAllCalls -- TOOL printer-tool -+ TOOL kokkosprinter-tool - PASS_REGULAR_EXPRESSION "kokkosp_init_library::kokkosp_allocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]source]:0:0::kokkosp_end_parallel_for:0::kokkosp_allocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]destination]:0:0::kokkosp_end_parallel_for:0::kokkosp_begin_deep_copy:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_end_deep_copy::kokkosp_begin_parallel_for:parallel_for:${SIZE_REGEX}:0::kokkosp_end_parallel_for:0::kokkosp_begin_parallel_reduce:parallel_reduce:0:1${SKIP_SCRATCH_INITIALIZATION_REGEX}::kokkosp_end_parallel_reduce:1::kokkosp_begin_parallel_scan:parallel_scan:${SIZE_REGEX}:2::kokkosp_end_parallel_scan:2::kokkosp_push_profile_region:push_region::kokkosp_pop_profile_region::kokkosp_create_profile_section:created_section:3::kokkosp_start_profile_section:3::kokkosp_stop_profile_section:3::kokkosp_destroy_profile_section:3::kokkosp_profile_event:profiling_event::kokkosp_deallocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_deallocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_finalize_library::" - ) - endif() #KOKKOS_ENABLE_LIBDL diff --git a/kokkos.spec b/kokkos.spec index 815a10f..a2dafb3 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,6 +1,6 @@ Name: kokkos -Version: 3.2.01 -%global sover 3.2.1 +Version: 3.3.00 +%global sover 3.3.0 Release: 1%{?dist} Summary: Kokkos C++ Performance Portability Programming # no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 @@ -69,8 +69,13 @@ This package contains the development files of %{name}. %{_libdir}/cmake/Kokkos %{_includedir}/kokkos %{_bindir}/nvcc_wrapper +%{_bindir}/hpcbind +%{_bindir}/kokkos_launch_compiler
%changelog +* Sat Dec 19 13:38:32 MST 2020 Christoph Junghans junghans@votca.org - 3.3.00-1 +- Version bump to v3.3.00 (bug #1909362) + * Wed Nov 25 15:26:40 MST 2020 Christoph Junghans junghans@votca.org - 3.2.01-1 - Version bump to v3.2.01 (bug #1901667)
diff --git a/sources b/sources index bc16e28..37e83ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-3.2.01.tar.gz) = 9de3185134686e75f294b7cf0ac794506351a3c3b029720a7f7fce5d867ed3b60c9ec55a8e0d64af1ddd0a1e0d6a129a2dae2453f35d327f99acb20b07baa022 +SHA512 (kokkos-3.3.00.tar.gz) = c5b1fb20d5470b99d1ea39a593d6adec58fd5d8b041df587b45c2222ee3de2cc10e13a164fea3201b504f8a9605c4d5d57380ff62b220a6098427e106cd2acf0
commit a276212b9fde70d69e97d46c85bf7ec16104a4c1 Author: Christoph Junghans junghans@lanl.gov Date: Wed Nov 25 19:49:27 2020 -0700
Version bump to v3.2.01 (bug #1901667)
diff --git a/.gitignore b/.gitignore index 4249551..0716ae0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /kokkos-3.1.00.tar.gz /kokkos-3.1.01.tar.gz /kokkos-3.2.00.tar.gz +/kokkos-3.2.01.tar.gz diff --git a/kokkos.spec b/kokkos.spec index 707051f..815a10f 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,7 +1,7 @@ Name: kokkos -Version: 3.2.00 -%global sover 3.2.0 -Release: 2%{?dist} +Version: 3.2.01 +%global sover 3.2.1 +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 @@ -9,7 +9,6 @@ ExcludeArch: i686 armv7hl License: BSD URL: https://github.com/kokkos/kokkos Source0: https://github.com/kokkos/kokkos/archive/%%7Bversion%7D.tar.gz#/%%7Bname%7D-... -Patch0: https://github.com/kokkos/kokkos/pull/3308.patch
BuildRequires: gcc-c++ BuildRequires: cmake3 >= 3.0 @@ -37,7 +36,6 @@ This package contains the development files of %{name}.
%prep %setup -q -%patch0 -p1
%build %{cmake3} \ @@ -73,6 +71,9 @@ This package contains the development files of %{name}. %{_bindir}/nvcc_wrapper
%changelog +* Wed Nov 25 15:26:40 MST 2020 Christoph Junghans junghans@votca.org - 3.2.01-1 +- Version bump to v3.2.01 (bug #1901667) + * Tue Aug 25 2020 Christoph Junghans junghans@votca.org - 3.2.00-2 - Fix cmake targets
diff --git a/sources b/sources index cba7070..bc16e28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-3.2.00.tar.gz) = 5aea16b6ed84c1cc24ccbbc50811026caebb1b7b47806f673e04dc37cc38e3da3d9fbc2d54c487765a222d0020a461240c16114e823d56e6ddadf9480deda9c8 +SHA512 (kokkos-3.2.01.tar.gz) = 9de3185134686e75f294b7cf0ac794506351a3c3b029720a7f7fce5d867ed3b60c9ec55a8e0d64af1ddd0a1e0d6a129a2dae2453f35d327f99acb20b07baa022
commit a24954c602000aa5dc0b308dbb07b7f65dc1b9b4 Author: Christoph Junghans junghans@lanl.gov Date: Tue Aug 25 17:47:50 2020 -0600
Fix cmake targets
diff --git a/3308.patch b/3308.patch new file mode 100644 index 0000000..ff66179 --- /dev/null +++ b/3308.patch @@ -0,0 +1,36 @@ +From 766a82445380c8a36ad90c51f48f110a6624a176 Mon Sep 17 00:00:00 2001 +From: Christoph Junghans junghans@lanl.gov +Date: Tue, 25 Aug 2020 14:07:28 -0600 +Subject: [PATCH] cmake: rename libprinter-tool + +--- + core/unit_test/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/core/unit_test/CMakeLists.txt b/core/unit_test/CMakeLists.txt +index 8ce6ca3d3..f241c5bf1 100644 +--- a/core/unit_test/CMakeLists.txt ++++ b/core/unit_test/CMakeLists.txt +@@ -417,10 +417,12 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate + if(KOKKOS_ENABLE_LIBDL) + + KOKKOS_ADD_LIBRARY( +- printer-tool SHARED ++ kokkosprinter-tool SHARED + SOURCES tools/printing-tool.cpp + ) + ++ SET_TARGET_PROPERTIES(kokkosprinter-tool PROPERTIES VERSION ${Kokkos_VERSION}) ++ + KOKKOS_ADD_TEST_EXECUTABLE( + ProfilingAllCalls + tools/TestAllCalls.cpp +@@ -433,7 +435,7 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate + + KOKKOS_ADD_TEST( NAME ProfilingTestLibraryLoad + EXE ProfilingAllCalls +- TOOL printer-tool ++ TOOL kokkosprinter-tool + PASS_REGULAR_EXPRESSION "kokkosp_init_library::kokkosp_allocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]source]:0:0::kokkosp_end_parallel_for:0::kokkosp_allocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]destination]:0:0::kokkosp_end_parallel_for:0::kokkosp_begin_deep_copy:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_end_deep_copy::kokkosp_begin_parallel_for:parallel_for:${SIZE_REGEX}:0::kokkosp_end_parallel_for:0::kokkosp_begin_parallel_reduce:parallel_reduce:0:1${SKIP_SCRATCH_INITIALIZATION_REGEX}::kokkosp_end_parallel_reduce:1::kokkosp_begin_parallel_scan:parallel_scan:${SIZE_REGEX}:2::kokkosp_end_parallel_scan:2::kokkosp_push_profile_region:push_region::kokkosp_pop_profile_region::kokkosp_create_profile_section:created_section:3::kokkosp_start_profile_section:3::kokkosp_stop_profile_section:3::kokkosp_destroy_profile_section:3::kokkosp_profile_event:profiling_event::kokkosp_deallocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_deallocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_finalize_library::" + ) + endif() #KOKKOS_ENABLE_LIBDL diff --git a/kokkos.spec b/kokkos.spec index b6ddb84..707051f 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,7 +1,7 @@ Name: kokkos Version: 3.2.00 %global sover 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kokkos C++ Performance Portability Programming # no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 ExcludeArch: i686 armv7hl @@ -9,6 +9,7 @@ ExcludeArch: i686 armv7hl License: BSD URL: https://github.com/kokkos/kokkos Source0: https://github.com/kokkos/kokkos/archive/%%7Bversion%7D.tar.gz#/%%7Bname%7D-... +Patch0: https://github.com/kokkos/kokkos/pull/3308.patch
BuildRequires: gcc-c++ BuildRequires: cmake3 >= 3.0 @@ -36,6 +37,7 @@ This package contains the development files of %{name}.
%prep %setup -q +%patch0 -p1
%build %{cmake3} \ @@ -51,7 +53,6 @@ This package contains the development files of %{name}.
%install %cmake3_install -rm %{buildroot}%{_libdir}/libprinter-tool.so
%check # https://github.com/kokkos/kokkos/issues/2959 - unstable test @@ -72,6 +73,9 @@ rm %{buildroot}%{_libdir}/libprinter-tool.so %{_bindir}/nvcc_wrapper
%changelog +* Tue Aug 25 2020 Christoph Junghans junghans@votca.org - 3.2.00-2 +- Fix cmake targets + * Tue Aug 25 2020 Christoph Junghans junghans@votca.org - 3.2.00-1 - Version bump to v3.2.00 (bug #1872456)
commit 575de12f7138497922c0fd403f37b7fe1649dcee Author: Christoph Junghans junghans@lanl.gov Date: Tue Aug 25 15:07:59 2020 -0600
Version bump to v3.2.00 (bug #1872456)
diff --git a/.gitignore b/.gitignore index 1ce8828..4249551 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /kokkos-3.0.00.tar.gz /kokkos-3.1.00.tar.gz /kokkos-3.1.01.tar.gz +/kokkos-3.2.00.tar.gz diff --git a/kokkos.spec b/kokkos.spec index 169ab69..b6ddb84 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,7 +1,7 @@ Name: kokkos -Version: 3.1.01 -%global sover 3.1.1 -Release: 4%{?dist} +Version: 3.2.00 +%global sover 3.2.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 @@ -51,6 +51,7 @@ This package contains the development files of %{name}.
%install %cmake3_install +rm %{buildroot}%{_libdir}/libprinter-tool.so
%check # https://github.com/kokkos/kokkos/issues/2959 - unstable test @@ -71,6 +72,9 @@ This package contains the development files of %{name}. %{_bindir}/nvcc_wrapper
%changelog +* Tue Aug 25 2020 Christoph Junghans junghans@votca.org - 3.2.00-1 +- Version bump to v3.2.00 (bug #1872456) + * Mon Aug 03 2020 Christoph Junghans junghans@votca.org - 3.1.01-4 - Fix out-of-source build on F33 (bug #1863948)
diff --git a/sources b/sources index 8b5c2d0..cba7070 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-3.1.01.tar.gz) = 4fa428ec33ec207147b3fcc5e0d297bcff4ed772ba6baa24ccaf56b691b72b70c69bd48fdf134f4e78234bf755377fe01a31611a41539c2d211ba9caed24b1f2 +SHA512 (kokkos-3.2.00.tar.gz) = 5aea16b6ed84c1cc24ccbbc50811026caebb1b7b47806f673e04dc37cc38e3da3d9fbc2d54c487765a222d0020a461240c16114e823d56e6ddadf9480deda9c8
commit 438acffb407c2a3b36504727ed23bba9aeae9490 Author: Christoph Junghans junghans@lanl.gov Date: Tue Aug 4 20:36:53 2020 -0600
Fix out-of-source build on F33 (bug #1863948)
diff --git a/kokkos.spec b/kokkos.spec index f3e9624..169ab69 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,14 +1,12 @@ -%undefine __cmake_in_source_build - Name: kokkos Version: 3.1.01 %global sover 3.1.1 -Release: 3%{?dist} -Summary: Kokkos C++ Performance Portability Programming -#no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 +Release: 4%{?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 +License: BSD URL: https://github.com/kokkos/kokkos Source0: https://github.com/kokkos/kokkos/archive/%%7Bversion%7D.tar.gz#/%%7Bname%7D-...
@@ -55,7 +53,11 @@ This package contains the development files of %{name}. %cmake3_install
%check -%ctest3 +# https://github.com/kokkos/kokkos/issues/2959 - unstable test +%ifarch s390x +%global testargs --exclude-regex KokkosCore_UnitTest_StackTraceTest +%endif +%ctest3 %{?testargs}
%files %doc README.md @@ -69,6 +71,9 @@ This package contains the development files of %{name}. %{_bindir}/nvcc_wrapper
%changelog +* Mon Aug 03 2020 Christoph Junghans junghans@votca.org - 3.1.01-4 +- Fix out-of-source build on F33 (bug #1863948) + * Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 3.1.01-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit d40cce347ce3221258eb30a354f241702b26796c Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Aug 1 03:46:37 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/kokkos.spec b/kokkos.spec index 1c47839..f3e9624 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -3,7 +3,7 @@ Name: kokkos Version: 3.1.01 %global sover 3.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 ExcludeArch: i686 armv7hl @@ -69,6 +69,10 @@ This package contains the development files of %{name}. %{_bindir}/nvcc_wrapper
%changelog +* Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 3.1.01-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering releng@fedoraproject.org - 3.1.01-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 05f194cd9f3fbd42927a33e1ba2ec71d39e240ae Author: Fedora Release Engineering releng@fedoraproject.org Date: Tue Jul 28 03:35:08 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/kokkos.spec b/kokkos.spec index 4abcbec..1c47839 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -3,7 +3,7 @@ Name: kokkos Version: 3.1.01 %global sover 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 ExcludeArch: i686 armv7hl @@ -69,6 +69,9 @@ This package contains the development files of %{name}. %{_bindir}/nvcc_wrapper
%changelog +* Tue Jul 28 2020 Fedora Release Engineering releng@fedoraproject.org - 3.1.01-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed May 06 2020 Christoph Junghans junghans@votca.org - 3.1.01-1 - Version bump to v3.1.01 (bug #1824998) - drop 2961.patch - merge upstream
commit fbe972da4cbe9e59c1d75a80e3fe682d113b9e49 Author: Igor Raits ignatenkobrain@fedoraproject.org Date: Mon Jul 20 13:33:40 2020 +0200
Improve compatibility with new CMake macro
Signed-off-by: Igor Raits ignatenkobrain@fedoraproject.org
diff --git a/kokkos.spec b/kokkos.spec index 65ddb13..4abcbec 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + Name: kokkos Version: 3.1.01 %global sover 3.1.1 @@ -38,9 +40,6 @@ This package contains the development files of %{name}. %setup -q
%build -mkdir build -pushd build - %{cmake3} \ -DKokkos_ENABLE_TESTS=On \ -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos \ @@ -49,15 +48,14 @@ pushd build -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_HWLOC=ON \ - .. -%make_build -popd + %{nil} +%cmake3_build
%install -%make_install -C build +%cmake3_install
%check -make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs} +%ctest3
%files %doc README.md
commit 02e84592aea90fa647c83b71ecee24ed22dd1968 Author: Christoph Junghans junghans@lanl.gov Date: Tue May 5 19:09:47 2020 -0600
fix sover
diff --git a/kokkos.spec b/kokkos.spec index 602066d..65ddb13 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,6 +1,6 @@ Name: kokkos Version: 3.1.01 -%global sover 3.1.0 +%global sover 3.1.1 Release: 1%{?dist} Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312
commit 286eb5a62c06a1cd932dcdc462d65074bc2a8aa4 Author: Christoph Junghans junghans@lanl.gov Date: Tue May 5 18:49:47 2020 -0600
add bug reference
diff --git a/kokkos.spec b/kokkos.spec index d24dc23..602066d 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -72,7 +72,7 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
%changelog * Wed May 06 2020 Christoph Junghans junghans@votca.org - 3.1.01-1 -- Version bump to v3.1.01 +- Version bump to v3.1.01 (bug #1824998) - drop 2961.patch - merge upstream
* Thu Apr 16 2020 Christoph Junghans junghans@votca.org - 3.1.00-1
commit a5d7582563b9982efe72ceeb1b44c677f63c2a17 Author: Christoph Junghans junghans@lanl.gov Date: Tue May 5 18:44:51 2020 -0600
Version bump to v3.1.01
diff --git a/.gitignore b/.gitignore index 0731517..1ce8828 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /kokkos-e79d6b7311fb91c81477a7fc458ca5408e0c19d2.tar.gz /kokkos-3.0.00.tar.gz /kokkos-3.1.00.tar.gz +/kokkos-3.1.01.tar.gz diff --git a/2961.patch b/2961.patch deleted file mode 100644 index 8eb5b83..0000000 --- a/2961.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b3cf3bca09e68f9c2076998d25179635e40e2d09 Mon Sep 17 00:00:00 2001 -From: Christoph Junghans junghans@lanl.gov -Date: Fri, 17 Apr 2020 09:14:14 -0600 -Subject: [PATCH] fix typo in KOKKOS_SET_EXE_PROPERTY() - ---- - cmake/kokkos_tribits.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/kokkos_tribits.cmake b/cmake/kokkos_tribits.cmake -index 1c3b704ad..6ee1409aa 100644 ---- a/cmake/kokkos_tribits.cmake -+++ b/cmake/kokkos_tribits.cmake -@@ -170,7 +170,7 @@ FUNCTION(KOKKOS_SET_EXE_PROPERTY ROOT_NAME) - IF (NOT TARGET ${TARGET_NAME}) - MESSAGE(SEND_ERROR "No target ${TARGET_NAME} exists - cannot set target properties") - ENDIF() -- SET_PROPERTY(TARGET ${TARGET_PROPERTY} PROPERTY ${ARGN}) -+ SET_PROPERTY(TARGET ${TARGET_NAME} PROPERTY ${ARGN}) - ENDFUNCTION() - - MACRO(KOKKOS_SETUP_BUILD_ENVIRONMENT) diff --git a/kokkos.spec b/kokkos.spec index 3908b0a..d24dc23 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,5 +1,5 @@ Name: kokkos -Version: 3.1.00 +Version: 3.1.01 %global sover 3.1.0 Release: 1%{?dist} Summary: Kokkos C++ Performance Portability Programming @@ -9,8 +9,6 @@ ExcludeArch: i686 armv7hl License: BSD URL: https://github.com/kokkos/kokkos Source0: https://github.com/kokkos/kokkos/archive/%%7Bversion%7D.tar.gz#/%%7Bname%7D-... -Patch0: https://github.com/kokkos/kokkos/pull/2961.patch -
BuildRequires: gcc-c++ BuildRequires: cmake3 >= 3.0 @@ -38,11 +36,11 @@ This package contains the development files of %{name}.
%prep %setup -q -%patch0 -p1
%build mkdir build pushd build + %{cmake3} \ -DKokkos_ENABLE_TESTS=On \ -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos \ @@ -73,6 +71,10 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs} %{_bindir}/nvcc_wrapper
%changelog +* Wed May 06 2020 Christoph Junghans junghans@votca.org - 3.1.01-1 +- Version bump to v3.1.01 +- drop 2961.patch - merge upstream + * Thu Apr 16 2020 Christoph Junghans junghans@votca.org - 3.1.00-1 - Version bump to v3.1.00 (bug #1824998)
diff --git a/sources b/sources index 2f0c6da..8b5c2d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-3.1.00.tar.gz) = 7933542c24e137052d630a503d707912295022863f2d47c89c4a35a9c8a70514763d89e321c66a3878575e661461ede45ac44d74cf45eca2470e7f57840d5c0c +SHA512 (kokkos-3.1.01.tar.gz) = 4fa428ec33ec207147b3fcc5e0d297bcff4ed772ba6baa24ccaf56b691b72b70c69bd48fdf134f4e78234bf755377fe01a31611a41539c2d211ba9caed24b1f2
commit 71f3d624a70d975baa27118e503f696ba3066ccb Author: Christoph Junghans junghans@lanl.gov Date: Fri Apr 17 09:52:24 2020 -0600
Version bump to v3.1.00 (bug #1824998)
diff --git a/.gitignore b/.gitignore index e6c553b..0731517 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /kokkos-cb90e9484286b8728d821bb5b1c23e74373bc47b.tar.gz /kokkos-e79d6b7311fb91c81477a7fc458ca5408e0c19d2.tar.gz /kokkos-3.0.00.tar.gz +/kokkos-3.1.00.tar.gz diff --git a/2961.patch b/2961.patch new file mode 100644 index 0000000..8eb5b83 --- /dev/null +++ b/2961.patch @@ -0,0 +1,22 @@ +From b3cf3bca09e68f9c2076998d25179635e40e2d09 Mon Sep 17 00:00:00 2001 +From: Christoph Junghans junghans@lanl.gov +Date: Fri, 17 Apr 2020 09:14:14 -0600 +Subject: [PATCH] fix typo in KOKKOS_SET_EXE_PROPERTY() + +--- + cmake/kokkos_tribits.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/kokkos_tribits.cmake b/cmake/kokkos_tribits.cmake +index 1c3b704ad..6ee1409aa 100644 +--- a/cmake/kokkos_tribits.cmake ++++ b/cmake/kokkos_tribits.cmake +@@ -170,7 +170,7 @@ FUNCTION(KOKKOS_SET_EXE_PROPERTY ROOT_NAME) + IF (NOT TARGET ${TARGET_NAME}) + MESSAGE(SEND_ERROR "No target ${TARGET_NAME} exists - cannot set target properties") + ENDIF() +- SET_PROPERTY(TARGET ${TARGET_PROPERTY} PROPERTY ${ARGN}) ++ SET_PROPERTY(TARGET ${TARGET_NAME} PROPERTY ${ARGN}) + ENDFUNCTION() + + MACRO(KOKKOS_SETUP_BUILD_ENVIRONMENT) diff --git a/kokkos.spec b/kokkos.spec index ce41564..3908b0a 100644 --- a/kokkos.spec +++ b/kokkos.spec @@ -1,6 +1,6 @@ Name: kokkos -Version: 3.0.00 -%global sover 3.0.0 +Version: 3.1.00 +%global sover 3.1.0 Release: 1%{?dist} Summary: Kokkos C++ Performance Portability Programming #no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 @@ -9,6 +9,7 @@ ExcludeArch: i686 armv7hl License: BSD URL: https://github.com/kokkos/kokkos Source0: https://github.com/kokkos/kokkos/archive/%%7Bversion%7D.tar.gz#/%%7Bname%7D-... +Patch0: https://github.com/kokkos/kokkos/pull/2961.patch
BuildRequires: gcc-c++ @@ -37,6 +38,7 @@ This package contains the development files of %{name}.
%prep %setup -q +%patch0 -p1
%build mkdir build @@ -66,12 +68,14 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
%files devel %{_libdir}/libkokkos*.so -%{_libdir}/pkgconfig/ %{_libdir}/cmake/Kokkos %{_includedir}/kokkos %{_bindir}/nvcc_wrapper
%changelog +* Thu Apr 16 2020 Christoph Junghans junghans@votca.org - 3.1.00-1 +- Version bump to v3.1.00 (bug #1824998) + * Thu Feb 27 2020 Christoph Junghans junghans@votca.org - 3.0.00-1 - Version bump to 3.0.00
diff --git a/sources b/sources index 316e01f..2f0c6da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kokkos-3.0.00.tar.gz) = f98feaedfb3b5759fdab35f68ca5b6bd3eacdb658ff0a7b91a33839fa266a8533c76213ebba6445ff7f2430bcdec8d05d7e4c023b63532515ba30223a27f3ebb +SHA512 (kokkos-3.1.00.tar.gz) = 7933542c24e137052d630a503d707912295022863f2d47c89c4a35a9c8a70514763d89e321c66a3878575e661461ede45ac44d74cf45eca2470e7f57840d5c0c