diff -Nru stdgpu-contrib-1.3.0+git20220507.32e0517/debian/changelog stdgpu-contrib-1.3.0+git20220507.32e0517/debian/changelog --- stdgpu-contrib-1.3.0+git20220507.32e0517/debian/changelog 2023-06-16 18:18:11.000000000 +0000 +++ stdgpu-contrib-1.3.0+git20220507.32e0517/debian/changelog 2023-07-12 22:06:05.000000000 +0000 @@ -1,3 +1,12 @@ +stdgpu-contrib (1.3.0+git20220507.32e0517-2) unstable; urgency=medium + + * Merge stdgpu-contrib repo into stdgpu repo + * Refresh patches from stdgpu in main + * Build-depend on nvidia-cuda-toolkit-gcc + * Restrict architectures to those with CUDA + + -- Timo Röhling Thu, 13 Jul 2023 00:06:05 +0200 + stdgpu-contrib (1.3.0+git20220507.32e0517-1) unstable; urgency=medium * Initial release. diff -Nru stdgpu-contrib-1.3.0+git20220507.32e0517/debian/control stdgpu-contrib-1.3.0+git20220507.32e0517/debian/control --- stdgpu-contrib-1.3.0+git20220507.32e0517/debian/control 2023-06-16 18:18:11.000000000 +0000 +++ stdgpu-contrib-1.3.0+git20220507.32e0517/debian/control 2023-07-12 22:04:42.000000000 +0000 @@ -6,12 +6,12 @@ debhelper-compat (= 13), cmake, libthrust-dev, - nvidia-cuda-toolkit, + nvidia-cuda-toolkit-gcc, Homepage: https://github.com/stotko/stdgpu Standards-Version: 4.6.2 Rules-Requires-Root: no -Vcs-Git: https://salsa.debian.org/debian/stdgpu-contrib.git -Vcs-Browser: https://salsa.debian.org/debian/stdgpu-contrib +Vcs-Git: https://salsa.debian.org/debian/stdgpu.git -b master-contrib +Vcs-Browser: https://salsa.debian.org/debian/stdgpu Description: Efficient STL-like Data Structures on the GPU stdgpu is an open-source library providing several generic GPU data structures for fast and reliable data management. Multiple platforms such as CUDA, @@ -20,7 +20,7 @@ executed in parallel on the GPU. Package: libstdgpu-cuda0d -Architecture: any +Architecture: amd64 arm64 ppc64el Multi-Arch: same Depends: ${misc:Depends}, @@ -32,7 +32,7 @@ Package: libstdgpu-cuda-dev Section: contrib/libdevel -Architecture: any +Architecture: amd64 arm64 ppc64el Multi-Arch: same Conflicts: libstdgpu-dev Provides: libstdgpu-dev diff -Nru stdgpu-contrib-1.3.0+git20220507.32e0517/debian/gbp.conf stdgpu-contrib-1.3.0+git20220507.32e0517/debian/gbp.conf --- stdgpu-contrib-1.3.0+git20220507.32e0517/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ stdgpu-contrib-1.3.0+git20220507.32e0517/debian/gbp.conf 2023-07-12 21:49:39.000000000 +0000 @@ -0,0 +1,4 @@ +[DEFAULT] +debian-branch = master-contrib +debian-tag = debian-contrib/%(version)s + diff -Nru stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0005-Disable-enable_language-HIP-for-now.patch stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0005-Disable-enable_language-HIP-for-now.patch --- stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0005-Disable-enable_language-HIP-for-now.patch 1970-01-01 00:00:00.000000000 +0000 +++ stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0005-Disable-enable_language-HIP-for-now.patch 2023-07-12 21:54:48.000000000 +0000 @@ -0,0 +1,21 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Mon, 5 Jun 2023 21:29:37 +0200 +Subject: Disable enable_language(HIP) for now + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7a158ef..8894b77 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,7 +62,7 @@ elseif(STDGPU_BACKEND STREQUAL STDGPU_BACKEND_HIP) + set(STDGPU_HIP_ARCHITECTURE_FLAGS_USER ${CMAKE_HIP_ARCHITECTURES}) + endif() + +- enable_language(HIP) ++ #enable_language(HIP) + endif() + + diff -Nru stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0006-Handle-architecture-dependent-signedness-of-char-and.patch stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0006-Handle-architecture-dependent-signedness-of-char-and.patch --- stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0006-Handle-architecture-dependent-signedness-of-char-and.patch 1970-01-01 00:00:00.000000000 +0000 +++ stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0006-Handle-architecture-dependent-signedness-of-char-and.patch 2023-07-12 21:54:48.000000000 +0000 @@ -0,0 +1,42 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Sat, 1 Jul 2023 10:54:41 +0200 +Subject: Handle architecture-dependent signedness of char and wchar_t + +--- + src/stdgpu/limits.h | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) + +diff --git a/src/stdgpu/limits.h b/src/stdgpu/limits.h +index 9276d2d..8ba777c 100644 +--- a/src/stdgpu/limits.h ++++ b/src/stdgpu/limits.h +@@ -253,7 +253,7 @@ struct numeric_limits + * \brief Whether the type is signed + * \note implementation-defined + */ +- static constexpr bool is_signed = true; ++ static constexpr bool is_signed = ((char)(-1) < 0); + + /** + * \brief Whether the type is an integer +@@ -490,16 +490,10 @@ struct numeric_limits + */ + static constexpr bool is_specialized = true; + +-/** +- * \var is_signed +- * \brief Whether the type is signed +- * \note implementation-defined +- */ +-#if STDGPU_HOST_COMPILER == STDGPU_HOST_COMPILER_MSVC +- static constexpr bool is_signed = false; +-#else +- static constexpr bool is_signed = true; +-#endif ++ /** ++ * \brief Whether the type is signed ++ */ ++ static constexpr bool is_signed = ((wchar_t)(-1) < 0); + + /** + * \brief Whether the type is an integer diff -Nru stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0007-Fix-wrong-alignment-test-to-actually-provoke-wrong-a.patch stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0007-Fix-wrong-alignment-test-to-actually-provoke-wrong-a.patch --- stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0007-Fix-wrong-alignment-test-to-actually-provoke-wrong-a.patch 1970-01-01 00:00:00.000000000 +0000 +++ stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/0007-Fix-wrong-alignment-test-to-actually-provoke-wrong-a.patch 2023-07-12 21:54:48.000000000 +0000 @@ -0,0 +1,49 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Sat, 1 Jul 2023 23:13:05 +0200 +Subject: Fix wrong alignment test to actually provoke wrong alignment + +--- + test/stdgpu/iterator.cpp | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/test/stdgpu/iterator.cpp b/test/stdgpu/iterator.cpp +index a4c8e3d..a1db53c 100644 +--- a/test/stdgpu/iterator.cpp ++++ b/test/stdgpu/iterator.cpp +@@ -16,6 +16,7 @@ + #include + + #include ++#include + #include + #include + +@@ -228,22 +229,22 @@ TEST_F(stdgpu_iterator, size_host_shifted) + + TEST_F(stdgpu_iterator, size_device_wrong_alignment) + { +- int* array = createDeviceArray(1); ++ std::int32_t* array = createDeviceArray(1); + + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) +- EXPECT_EQ(stdgpu::size(reinterpret_cast(array)), static_cast(0)); ++ EXPECT_EQ(stdgpu::size(reinterpret_cast(array)), static_cast(0)); + +- destroyDeviceArray(array); ++ destroyDeviceArray(array); + } + + TEST_F(stdgpu_iterator, size_host_wrong_alignment) + { +- int* array_result = createHostArray(1); ++ std::int32_t* array_result = createHostArray(1); + + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) +- EXPECT_EQ(stdgpu::size(reinterpret_cast(array_result)), static_cast(0)); ++ EXPECT_EQ(stdgpu::size(reinterpret_cast(array_result)), static_cast(0)); + +- destroyHostArray(array_result); ++ destroyHostArray(array_result); + } + + TEST_F(stdgpu_iterator, device_begin_end) diff -Nru stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/series stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/series --- stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/series 2023-06-16 18:18:11.000000000 +0000 +++ stdgpu-contrib-1.3.0+git20220507.32e0517/debian/patches/series 2023-07-12 21:54:48.000000000 +0000 @@ -2,3 +2,6 @@ 0002-Use-system-GTest.patch 0003-Add-override-for-SOVERSION-AND-OUTPUT_NAME.patch 0004-Increase-version-tweak.patch +0005-Disable-enable_language-HIP-for-now.patch +0006-Handle-architecture-dependent-signedness-of-char-and.patch +0007-Fix-wrong-alignment-test-to-actually-provoke-wrong-a.patch