Remove dead auto-schedule label in CMake (#7818)

These were replaced by more granular labels. Also, drive-by fix to comment that needed plurals.
halide · Aug 30, 2023 · 24d846c · 24d846c
1 parent afc61b2
commit 24d846c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/src/autoschedulers/adams2019/CMakeLists.txt b/src/autoschedulers/adams2019/CMakeLists.txt
@@ -122,5 +122,5 @@ if (WITH_TESTS)
     add_executable(adams2019_test_function_dag test_function_dag.cpp FunctionDAG.cpp)
     target_link_libraries(adams2019_test_function_dag PRIVATE ASLog Halide::Halide Halide::Tools Halide::Plugin)
     add_test(NAME adams2019_test_function_dag COMMAND adams2019_test_function_dag)
-    set_tests_properties(adams2019_test_function_dag PROPERTIES LABELS "adams2019;autoschedulers_cpu;auto_schedule")
+    set_tests_properties(adams2019_test_function_dag PROPERTIES LABELS "adams2019;autoschedulers_cpu")
 endif()
diff --git a/src/autoschedulers/common/CMakeLists.txt b/src/autoschedulers/common/CMakeLists.txt
@@ -27,5 +27,5 @@ endif ()
 if (WITH_TESTS)
     add_executable(test_perfect_hash_map test_perfect_hash_map.cpp)
     add_test(NAME test_perfect_hash_map COMMAND test_perfect_hash_map)
-    set_tests_properties(test_perfect_hash_map PROPERTIES LABELS "autoschedulers_cpu;auto_schedule")
+    set_tests_properties(test_perfect_hash_map PROPERTIES LABELS "autoschedulers_cpu")
 endif()
diff --git a/test/autoschedulers/CMakeLists.txt b/test/autoschedulers/CMakeLists.txt
@@ -1,10 +1,8 @@
 # Note that there are 3 distinct tags for autoscheduler tests:
 #
-# autoscheduler_cpu: this autoscheduler is expected to work for CPU targets
-# autoscheduler_gpu: this autoscheduler is expected to work for GPU targets
-# autoscheduler_cuda: this autoscheduler is expected to work on Cuda targets (but probably not other GPU targets)
-#
-# There is also a legacy tag, `auto_schedule`, which is present for legacy purposes and will be removed soon.
+# autoschedulers_cpu: this autoscheduler is expected to work for CPU targets
+# autoschedulers_gpu: this autoscheduler is expected to work for GPU targets
+# autoschedulers_cuda: this autoscheduler is expected to work on Cuda targets (but probably not other GPU targets)
 
 add_subdirectory(adams2019)
 if (TARGET_NVPTX)

diff --git a/test/autoschedulers/adams2019/CMakeLists.txt b/test/autoschedulers/adams2019/CMakeLists.txt
@@ -22,7 +22,6 @@ function(add_adams2019_test NAME)
     endif()
     list(APPEND ARGS_LABELS adams2019)
     list(APPEND ARGS_LABELS autoschedulers_cpu)
-    list(APPEND ARGS_LABELS auto_schedule)
 
     add_test(NAME ${NAME}
              COMMAND ${ARGS_COMMAND})

diff --git a/test/autoschedulers/li2018/CMakeLists.txt b/test/autoschedulers/li2018/CMakeLists.txt
@@ -19,9 +19,9 @@ target_link_libraries(li2018_demo_gradient_autoscheduler PRIVATE li2018_demo_gra
 # demo_generator.cpp
 add_halide_test(li2018_demo_gradient_autoscheduler
                 COMMAND li2018_demo_gradient_autoscheduler --benchmarks=all --benchmark_min_time=1 --estimate_all --success
-                GROUPS li2018 autoschedulers_cpu autoschedulers_gpu auto_schedule multithreaded)
+                GROUPS li2018 autoschedulers_cpu autoschedulers_gpu multithreaded)
 
-tests(GROUPS li2018 autoschedulers_cpu autoschedulers_gpu auto_schedule
+tests(GROUPS li2018 autoschedulers_cpu autoschedulers_gpu
       SOURCES
       test.cpp
       ARGS $<TARGET_FILE:Halide::Li2018>)
@@ -43,7 +43,7 @@ if (WITH_PYTHON_BINDINGS)
 
         set_tests_properties(li2018_gradient_autoscheduler_test_py PROPERTIES
                              DEPENDS li2018_test
-                             LABELS "li2018;autoschedulers_cpu;autoschedulers_gpu;auto_schedule"
+                             LABELS "li2018;autoschedulers_cpu;autoschedulers_gpu"
                              ENVIRONMENT_MODIFICATION "${PYTHONPATH}")
     endif()
 endif ()
diff --git a/test/autoschedulers/mullapudi2016/CMakeLists.txt b/test/autoschedulers/mullapudi2016/CMakeLists.txt
@@ -3,13 +3,13 @@ if (NOT TARGET Halide::Mullapudi2016)
     return()
 endif()
 
-tests(GROUPS mullapudi2016 autoschedulers_cpu auto_schedule
+tests(GROUPS mullapudi2016 autoschedulers_cpu
       SOURCES
       extern.cpp
       param.cpp
       ARGS $<TARGET_FILE:Halide::Mullapudi2016>)
 
-tests(GROUPS mullapudi2016 autoschedulers_cpu auto_schedule multithreaded
+tests(GROUPS mullapudi2016 autoschedulers_cpu multithreaded
       SOURCES
       cost_function.cpp
       data_dependent.cpp