Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport PR #2332 and #2341 #2368

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Backport PR #2332 and #2341 #2368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc521e1
Update CCCL version to 2.6.1
wmaxey Sep 4, 2024
1424c18
Do not hardcode Thrust's host system to cpp. (#2332)
alliepiper Aug 30, 2024
abb9cb7
Fix hardcoding __THRUST_HOST_SYSTEM_NAMESPACE to cpp (#2341)
bernhardmgruber Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cub/cub/cmake/cub-config-version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/cub-header-search.cmake")

set(CUB_VERSION_MAJOR 2)
set(CUB_VERSION_MINOR 6)
set(CUB_VERSION_PATCH 0)
set(CUB_VERSION_PATCH 1)
set(CUB_VERSION_TWEAK 0)
set(CUB_VERSION "${CUB_VERSION_MAJOR}.${CUB_VERSION_MINOR}.${CUB_VERSION_PATCH}.${CUB_VERSION_TWEAK}")

Expand Down
2 changes: 1 addition & 1 deletion cub/cub/version.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
* <tt>CUB_VERSION / 100 % 1000</tt> is the minor version.
* <tt>CUB_VERSION / 100000</tt> is the major version.
*/
#define CUB_VERSION 200600 // macro expansion with ## requires this to be a single value
#define CUB_VERSION 200601 // macro expansion with ## requires this to be a single value

/*! \def CUB_MAJOR_VERSION
* \brief The preprocessor macro \p CUB_MAJOR_VERSION encodes the
Expand Down
2 changes: 1 addition & 1 deletion cudax/lib/cmake/cudax/cudax-config-version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(cudax_VERSION_MAJOR 2)
set(cudax_VERSION_MINOR 6)
set(cudax_VERSION_PATCH 0)
set(cudax_VERSION_PATCH 1)
set(cudax_VERSION_TWEAK 0)

set(cudax_VERSION "${cudax_VERSION_MAJOR}.${cudax_VERSION_MINOR}.${cudax_VERSION_PATCH}.${cudax_VERSION_TWEAK}")
Expand Down
2 changes: 1 addition & 1 deletion lib/cmake/cccl/cccl-config-version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(CCCL_VERSION_MAJOR 2)
set(CCCL_VERSION_MINOR 6)
set(CCCL_VERSION_PATCH 0)
set(CCCL_VERSION_PATCH 1)
set(CCCL_VERSION_TWEAK 0)

set(CCCL_VERSION "${CCCL_VERSION_MAJOR}.${CCCL_VERSION_MINOR}.${CCCL_VERSION_PATCH}.${CCCL_VERSION_TWEAK}")
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/include/cuda/std/__cccl/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef __CCCL_VERSION_H
#define __CCCL_VERSION_H

#define CCCL_VERSION 2006000
#define CCCL_VERSION 2006001
#define CCCL_MAJOR_VERSION (CCCL_VERSION / 1000000)
#define CCCL_MINOR_VERSION (((CCCL_VERSION / 1000) % 1000))
#define CCCL_PATCH_VERSION (CCCL_VERSION % 1000)
Expand Down
2 changes: 1 addition & 1 deletion libcudacxx/lib/cmake/libcudacxx/libcudacxx-config-version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/libcudacxx-header-search.cmake")

set(libcudacxx_VERSION_MAJOR 2)
set(libcudacxx_VERSION_MINOR 6)
set(libcudacxx_VERSION_PATCH 0)
set(libcudacxx_VERSION_PATCH 1)
set(libcudacxx_VERSION_TWEAK 0)

set(libcudacxx_VERSION
Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/cmake/thrust-config-version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/thrust-header-search.cmake")

set(THRUST_VERSION_MAJOR 2)
set(THRUST_VERSION_MINOR 6)
set(THRUST_VERSION_PATCH 0) # Thrust: "subminor" CMake: "patch"
set(THRUST_VERSION_PATCH 1) # Thrust: "subminor" CMake: "patch"
set(THRUST_VERSION_TWEAK 0)
set(THRUST_VERSION "${THRUST_VERSION_MAJOR}.${THRUST_VERSION_MINOR}.${THRUST_VERSION_PATCH}.${THRUST_VERSION_TWEAK}")

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/execution_policy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ THRUST_NAMESPACE_BEGIN
namespace detail
{

using host_t = thrust::system::cpp::detail::par_t;
using host_t = thrust::system::__THRUST_HOST_SYSTEM_NAMESPACE::detail::par_t;

using device_t = thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::detail::par_t;

Expand Down
2 changes: 1 addition & 1 deletion thrust/thrust/mr/host_memory_resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@

THRUST_NAMESPACE_BEGIN

using host_memory_resource = thrust::system::cpp::memory_resource;
using host_memory_resource = thrust::system::__THRUST_HOST_SYSTEM_NAMESPACE::memory_resource;

THRUST_NAMESPACE_END
2 changes: 1 addition & 1 deletion thrust/thrust/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
* <tt>THRUST_VERSION / 100 % 1000</tt> is the minor version.
* <tt>THRUST_VERSION / 100000</tt> is the major version.
*/
#define THRUST_VERSION 200600 // macro expansion with ## requires this to be a single value
#define THRUST_VERSION 200601 // macro expansion with ## requires this to be a single value

/*! \def THRUST_MAJOR_VERSION
* \brief The preprocessor macro \p THRUST_MAJOR_VERSION encodes the
Expand Down
Loading