From 144a3ef093b2647afeadfc5dbe6e85ddd5d4b8a2 Mon Sep 17 00:00:00 2001 From: Lauren Wrubleski Date: Thu, 5 Oct 2023 15:58:58 -0600 Subject: [PATCH] Replace CMake `return` from later CMake (#970) [ROCm/composable_kernel commit: 5913609168e6f691185f1b7b214e517d67dd5075] --- example/CMakeLists.txt | 10 +++++----- .../src/tensor_operation_instance/gpu/CMakeLists.txt | 4 ++-- test/CMakeLists.txt | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index d030c53453..7f8704f281 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -30,7 +30,7 @@ function(add_example_executable EXAMPLE_NAME FILE_NAME) set(test 0) break() elseif((source MATCHES "fp8" OR source MATCHES "fp32" OR source MATCHES "fp64" OR source MATCHES "bf16" OR source MATCHES "int8" OR source MATCHES "fp16" OR - source MATCHES "_f8" OR source MATCHES "_f32" OR source MATCHES "_f64" OR source MATCHES "_i8" OR source MATCHES "_f16" OR source MATCHES "_b16") AND + source MATCHES "_f8" OR source MATCHES "_f32" OR source MATCHES "_f64" OR source MATCHES "_i8" OR source MATCHES "_f16" OR source MATCHES "_b16") AND NOT(source MATCHES type OR source MATCHES type1)) #if filename contains a type which doesn't match any selected type, mark it for removal set(test 1) @@ -59,7 +59,7 @@ function(add_example_executable EXAMPLE_NAME FILE_NAME) set(result 0) endif() #message("add_example returns ${result}") - return(PROPAGATE result) + set(result ${result} PARENT_SCOPE) endfunction(add_example_executable EXAMPLE_NAME) function(add_example_executable_no_testing EXAMPLE_NAME FILE_NAME) @@ -87,7 +87,7 @@ function(add_example_executable_no_testing EXAMPLE_NAME FILE_NAME) set(test 0) break() elseif((source MATCHES "fp8" OR source MATCHES "fp32" OR source MATCHES "fp64" OR source MATCHES "bf16" OR source MATCHES "int8" OR source MATCHES "fp16" OR - source MATCHES "_f8" OR source MATCHES "_f32" OR source MATCHES "_f64" OR source MATCHES "_i8" OR source MATCHES "_f16" OR source MATCHES "_b16") AND + source MATCHES "_f8" OR source MATCHES "_f32" OR source MATCHES "_f64" OR source MATCHES "_i8" OR source MATCHES "_f16" OR source MATCHES "_b16") AND NOT(source MATCHES type OR source MATCHES type1)) #if filename contains a type which doesn't match any selected type, mark it for removal set(test 1) @@ -96,7 +96,7 @@ function(add_example_executable_no_testing EXAMPLE_NAME FILE_NAME) if(test EQUAL 1) message("removing example ${source} ") list(REMOVE_ITEM FILE_NAME "${source}") - endif() + endif() endforeach() endif() foreach(source IN LISTS FILE_NAME) @@ -114,7 +114,7 @@ function(add_example_executable_no_testing EXAMPLE_NAME FILE_NAME) set(result 0) endif() #message("add_example returns ${result}") - return(PROPAGATE result) + set(result ${result} PARENT_SCOPE) endfunction(add_example_executable_no_testing EXAMPLE_NAME) # add all example subdir diff --git a/library/src/tensor_operation_instance/gpu/CMakeLists.txt b/library/src/tensor_operation_instance/gpu/CMakeLists.txt index a0478c9f09..9c1f72eca3 100644 --- a/library/src/tensor_operation_instance/gpu/CMakeLists.txt +++ b/library/src/tensor_operation_instance/gpu/CMakeLists.txt @@ -24,7 +24,7 @@ function(add_instance_library INSTANCE_NAME) set(test 0) break() elseif((source MATCHES "fp8" OR source MATCHES "fp32" OR source MATCHES "fp64" OR source MATCHES "bf16" OR source MATCHES "int8" OR source MATCHES "fp16" OR - source MATCHES "_f8" OR source MATCHES "_f32" OR source MATCHES "_f64" OR source MATCHES "_i8" OR source MATCHES "_f16" OR source MATCHES "_b16") AND + source MATCHES "_f8" OR source MATCHES "_f32" OR source MATCHES "_f64" OR source MATCHES "_i8" OR source MATCHES "_f16" OR source MATCHES "_b16") AND NOT(source MATCHES type OR source MATCHES type1)) #if filename contains a type which doesn't match any selected type, mark it for removal set(test 1) @@ -51,7 +51,7 @@ function(add_instance_library INSTANCE_NAME) set(result 0) endif() #message("add_instance_library returns ${result}") - return(PROPAGATE result) + set(result ${result} PARENT_SCOPE) endfunction(add_instance_library INSTANCE_NAME) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 07dd675afc..4b2c7bbf38 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -32,7 +32,7 @@ function(add_test_executable TEST_NAME) set(test 0) break() elseif((source MATCHES "fp8" OR source MATCHES "fp32" OR source MATCHES "fp64" OR source MATCHES "bf16" OR source MATCHES "int8" OR source MATCHES "fp16" OR - source MATCHES "_f8" OR source MATCHES "_f32" OR source MATCHES "_f64" OR source MATCHES "_i8" OR source MATCHES "_f16" OR source MATCHES "_b16") AND + source MATCHES "_f8" OR source MATCHES "_f32" OR source MATCHES "_f64" OR source MATCHES "_i8" OR source MATCHES "_f16" OR source MATCHES "_b16") AND NOT(source MATCHES type OR source MATCHES type1)) #if filename contains a type which doesn't match any selected type, mark it for removal set(test 1) @@ -61,7 +61,7 @@ function(add_test_executable TEST_NAME) set(result 0) endif() #message("add_test returns ${result}") - return(PROPAGATE result) + set(result ${result} PARENT_SCOPE) endfunction(add_test_executable TEST_NAME) include(GoogleTest) @@ -91,7 +91,7 @@ function(add_gtest_executable TEST_NAME) set(test 0) break() elseif((source MATCHES "fp8" OR source MATCHES "fp32" OR source MATCHES "fp64" OR source MATCHES "bf16" OR source MATCHES "int8" OR source MATCHES "fp16" OR - source MATCHES "_f8" OR source MATCHES "_f32" OR source MATCHES "_f64" OR source MATCHES "_i8" OR source MATCHES "_f16" OR source MATCHES "_b16") AND + source MATCHES "_f8" OR source MATCHES "_f32" OR source MATCHES "_f64" OR source MATCHES "_i8" OR source MATCHES "_f16" OR source MATCHES "_b16") AND NOT(source MATCHES type OR source MATCHES type1)) #if filename contains a type which doesn't match any selected type, mark it for removal set(test 1) @@ -123,7 +123,7 @@ function(add_gtest_executable TEST_NAME) set(result 0) endif() #message("add_gtest returns ${result}") - return(PROPAGATE result) + set(result ${result} PARENT_SCOPE) endfunction(add_gtest_executable TEST_NAME) add_subdirectory(magic_number_division)