Skip to content

Commit 30fa584

Browse files
authored
fix: fix FindThrust.cmake (#161)
The latest thrust version corresponding to CUDA 12.4 is 200301 which is not divisible by 100. Use predefined `THRUST_MINOR_VERSION`/ `THRUST_MAJOR_VERSION` instead.
1 parent 66ee066 commit 30fa584

File tree

1 file changed

+25
-6
lines changed

1 file changed

+25
-6
lines changed

Diff for: cmake/modules/FindThrust.cmake

+25-6
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,32 @@ if( THRUST_INCLUDE_DIR )
5151
version
5252
"${version}"
5353
)
54+
55+
file( STRINGS ${THRUST_INCLUDE_DIR}/thrust/version.h
56+
major_version
57+
REGEX "#define THRUST_MAJOR_VERSION[ \t]+([0-9x]+)"
58+
)
59+
string( REGEX REPLACE
60+
"#define THRUST_MAJOR_VERSION[ \t]+"
61+
""
62+
major_version
63+
"${major_version}"
64+
)
65+
66+
file( STRINGS ${THRUST_INCLUDE_DIR}/thrust/version.h
67+
major_version
68+
REGEX "#define THRUST_MINOR_VERSION[ \t]+([0-9x]+)"
69+
)
70+
string( REGEX REPLACE
71+
"#define THRUST_MINOR_VERSION[ \t]+"
72+
""
73+
minor_version
74+
"${minor_version}"
75+
)
5476

55-
math(EXPR major "${version} / 100000")
56-
math(EXPR minor "(${version} / 100) % 1000")
57-
math(EXPR version "${version} % 100")
58-
set( THRUST_VERSION "${major}.${minor}.${version}")
59-
set( THRUST_MAJOR_VERSION "${major}")
60-
set( THRUST_MINOR_VERSION "${minor}")
77+
set( THRUST_VERSION "${version}")
78+
set( THRUST_MAJOR_VERSION "${major_version}")
79+
set( THRUST_MINOR_VERSION "${minor_version}")
6180
endif( THRUST_INCLUDE_DIR )
6281

6382
# Check for required components

0 commit comments

Comments
 (0)