resolved conflicts

9f1b4276 · Jakub Piasecki · 711857c4 · c7010716 · 9f1b4276 · 9f1b4276
Commit 9f1b4276 authored Apr 04, 2024 by Jakub Piasecki
18 changed files
--- a/test/gemm_split_k/test_gemm_splitk.cpp
+++ b/test/gemm_split_k/test_gemm_splitk.cpp
--- a/test/grouped_convnd_bwd_data/CMakeLists.txt
+++ b/test/grouped_convnd_bwd_data/CMakeLists.txt
--- a/test/grouped_convnd_bwd_data/test_grouped_convnd_bwd_data.cpp
+++ b/test/grouped_convnd_bwd_data/test_grouped_convnd_bwd_data.cpp
--- a/test/grouped_convnd_bwd_weight/CMakeLists.txt
+++ b/test/grouped_convnd_bwd_weight/CMakeLists.txt
--- a/test/grouped_convnd_bwd_weight/test_grouped_convnd_bwd_weight.cpp
+++ b/test/grouped_convnd_bwd_weight/test_grouped_convnd_bwd_weight.cpp
--- a/test/grouped_convnd_fwd/CMakeLists.txt
+++ b/test/grouped_convnd_fwd/CMakeLists.txt
--- a/test/grouped_convnd_fwd/test_grouped_convnd_fwd_multi_d_interface_compatibility.cpp
+++ b/test/grouped_convnd_fwd/test_grouped_convnd_fwd_multi_d_interface_compatibility.cpp
--- a/test/grouped_convnd_fwd/test_grouped_convnd_fwd.cpp
+++ b/test/grouped_convnd_fwd/test_grouped_convnd_fwd.cpp
--- a/test/grouped_gemm/CMakeLists.txt
+++ b/test/grouped_gemm/CMakeLists.txt
--- a/test/grouped_gemm/test_grouped_gemm_interface.cpp
+++ b/test/grouped_gemm/test_grouped_gemm_interface.cpp
--- a/test/grouped_gemm/test_grouped_gemm_splitk.cpp
+++ b/test/grouped_gemm/test_grouped_gemm_splitk.cpp
--- a/test/normalization_bwd_data/CMakeLists.txt
+++ b/test/normalization_bwd_data/CMakeLists.txt
--- a/test/normalization_bwd_gamma_beta/CMakeLists.txt
+++ b/test/normalization_bwd_gamma_beta/CMakeLists.txt
--- a/test/permute_scale/CMakeLists.txt
+++ b/test/permute_scale/CMakeLists.txt
--- a/test/transpose/CMakeLists.txt
+++ b/test/transpose/CMakeLists.txt
--- a/test/transpose/test_transpose.cpp
+++ b/test/transpose/test_transpose.cpp
--- a/test/wrapper/CMakeLists.txt
+++ b/test/wrapper/CMakeLists.txt
--- a/test/wrapper/test_wrapper_gemm.cpp
+++ b/test/wrapper/test_wrapper_gemm.cpp