Skip to content

Commit 69af7e0

Browse files
committed
Remove thrust example filecheck bitrot.
1 parent 76f8432 commit 69af7e0

File tree

64 files changed

+1
-652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1
-652
lines changed

docs/thrust/developer/cmake_options.rst

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ Generic CMake Options
7070
- Toggles single-config and multi-config modes. Default is ``OFF``
7171
(single config).
7272

73-
- ``THRUST_ENABLE_EXAMPLE_FILECHECK={ON, OFF}``
74-
75-
- Enable validation of example outputs using the LLVM FileCheck
76-
utility. Default is ``OFF``.
77-
7873
- ``THRUST_ENABLE_INSTALL_RULES={ON, OFF}``
7974

8075
- If true, installation rules will be generated for thrust. Default
@@ -104,22 +99,11 @@ Single Config CMake Options
10499

105100
- Selects the device system. Default: ``CUDA``
106101

107-
- ``THRUST_CPP_DIALECT={17, 20}``
108-
109-
- Selects the C++ standard dialect to use. Default is ``14``
110-
(C++14).
111-
112102
.. _cmake-multi-config-options:
113103

114104
Multi Config CMake Options
115105
--------------------------
116106

117-
- ``THRUST_MULTICONFIG_ENABLE_DIALECT_CPPXX={ON, OFF}``
118-
119-
- Toggle whether a specific C++ dialect will be targeted.
120-
- Possible values of ``XX`` are ``{17, 20}``.
121-
- By default, only C++14 is enabled.
122-
123107
- ``THRUST_MULTICONFIG_ENABLE_SYSTEM_XXXX={ON, OFF}``
124108

125109
- Toggle whether a specific system will be targeted.

thrust/cmake/ThrustRunExample.cmake

Lines changed: 0 additions & 52 deletions
This file was deleted.

thrust/examples/CMakeLists.txt

Lines changed: 1 addition & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,3 @@
1-
# Setup FileCheck if requested and available:
2-
option(
3-
THRUST_ENABLE_EXAMPLE_FILECHECK
4-
"Check example output with the LLVM FileCheck utility."
5-
OFF
6-
)
7-
set(filecheck_data_path "${Thrust_SOURCE_DIR}/internal/test")
8-
9-
if (THRUST_ENABLE_EXAMPLE_FILECHECK)
10-
# TODO this should go into a find module
11-
find_program(
12-
THRUST_FILECHECK_EXECUTABLE
13-
DOC "Path to the LLVM FileCheck utility."
14-
NAMES
15-
FileCheck
16-
FileCheck-3.9
17-
FileCheck-4.0
18-
FileCheck-5.0
19-
FileCheck-6.0
20-
FileCheck-7
21-
FileCheck-8
22-
FileCheck-9
23-
)
24-
25-
if (NOT THRUST_FILECHECK_EXECUTABLE)
26-
message(
27-
FATAL_ERROR
28-
"Could not find the LLVM FileCheck utility. Set THRUST_FILECHECK_EXECUTABLE manually, "
29-
"or disable THRUST_ENABLE_EXAMPLE_FILECHECK."
30-
)
31-
endif()
32-
33-
execute_process(
34-
COMMAND
35-
"${THRUST_FILECHECK_EXECUTABLE}"
36-
"${filecheck_data_path}/thrust.smoke.filecheck"
37-
INPUT_FILE "${Thrust_SOURCE_DIR}/cmake/filecheck_smoke_test"
38-
RESULT_VARIABLE exit_code
39-
)
40-
41-
if (0 EQUAL exit_code)
42-
message(STATUS "FileCheck enabled: ${THRUST_FILECHECK_EXECUTABLE}")
43-
else()
44-
message(
45-
FATAL_ERROR
46-
"The current THRUST_FILECHECK_EXECUTABLE ('${THRUST_FILECHECK_EXECUTABLE}') "
47-
"does not seem to be a valid FileCheck executable."
48-
)
49-
endif()
50-
endif()
51-
521
## thrust_add_example
532
#
543
# Add an example executable and register it with ctest.
@@ -83,7 +32,7 @@ function(
8332
set(example_target ${config_prefix}.example.${example_name})
8433
set(${target_name_var} ${example_target} PARENT_SCOPE)
8534

86-
cccl_add_executable(${example_target} SOURCES "${real_example_src}")
35+
cccl_add_executable(${example_target} SOURCES "${real_example_src}" ADD_CTEST)
8736
target_link_libraries(${example_target} PRIVATE ${thrust_target})
8837
target_include_directories(
8938
${example_target}
@@ -111,29 +60,6 @@ function(
11160
PRIVATE $<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:THRUST_EXAMPLE_DEVICE_SIDE>
11261
)
11362

114-
# Get the name of FileCheck input by stripping out the config name.
115-
# (e.g. "thrust.cpp.cuda.cpp14.example.xxx" -> "thrust.example.xxx.filecheck")
116-
string(
117-
REPLACE
118-
"${config_prefix}"
119-
"thrust"
120-
filecheck_reference_file
121-
"${example_target}.filecheck"
122-
)
123-
124-
add_test(
125-
NAME ${example_target}
126-
# gersemi: off
127-
COMMAND
128-
"${CMAKE_COMMAND}"
129-
"-DEXAMPLE_EXECUTABLE=$<TARGET_FILE:${example_target}>"
130-
"-DFILECHECK_ENABLED=${THRUST_ENABLE_EXAMPLE_FILECHECK}"
131-
"-DFILECHECK_EXECUTABLE=${THRUST_FILECHECK_EXECUTABLE}"
132-
"-DREFERENCE_FILE=${filecheck_data_path}/${filecheck_reference_file}"
133-
-P "${Thrust_SOURCE_DIR}/cmake/ThrustRunExample.cmake"
134-
# gersemi: on
135-
)
136-
13763
# Run OMP/TBB tests in serial. Multiple OMP processes will massively
13864
# oversubscribe the machine with GCC's OMP, and we want to test these with
13965
# the full CPU available to each unit test.

thrust/internal/test/thrust.example.arbitrary_transformation.filecheck

Lines changed: 0 additions & 5 deletions
This file was deleted.

thrust/internal/test/thrust.example.basic_vector.filecheck

Lines changed: 0 additions & 8 deletions
This file was deleted.

thrust/internal/test/thrust.example.bounding_box.filecheck

Lines changed: 0 additions & 1 deletion
This file was deleted.

thrust/internal/test/thrust.example.bucket_sort2d.filecheck

Lines changed: 0 additions & 55 deletions
This file was deleted.

thrust/internal/test/thrust.example.constant_iterator.filecheck

Lines changed: 0 additions & 4 deletions
This file was deleted.

thrust/internal/test/thrust.example.counting_iterator.filecheck

Lines changed: 0 additions & 5 deletions
This file was deleted.

thrust/internal/test/thrust.example.cuda.async_reduce.filecheck

Whitespace-only changes.

0 commit comments

Comments
 (0)