From 1d7847d570cb9b74e5c77781c72aaaef5c4a8e92 Mon Sep 17 00:00:00 2001 From: lvhan028 Date: Tue, 1 Aug 2023 17:35:15 +0800 Subject: [PATCH] move src test cases to tests/csrc --- CMakeLists.txt | 2 +- tests/{ => csrc}/CMakeLists.txt | 1 - tests/{ => csrc}/gemm_dequantize/CMakeLists.txt | 0 tests/{ => csrc}/gemm_dequantize/th_gemm_dequantize.cc | 0 tests/{ => csrc}/gemm_dequantize/th_gemm_dequantize.py | 0 tests/{ => csrc}/int8_gemm/CMakeLists.txt | 0 tests/{ => csrc}/int8_gemm/int8_gemm_test.cu | 0 tests/{ => csrc}/unittests/CMakeLists.txt | 0 tests/{ => csrc}/unittests/gtest_utils.h | 0 tests/{ => csrc}/unittests/test_attention_kernels.cu | 2 +- tests/{ => csrc}/unittests/test_context_attention_layer.cu | 0 tests/{ => csrc}/unittests/test_gemm.cu | 0 tests/{ => csrc}/unittests/test_gpt_kernels.cu | 0 tests/{ => csrc}/unittests/test_int8.cu | 2 +- tests/{ => csrc}/unittests/test_logprob_kernels.cu | 2 +- tests/{ => csrc}/unittests/test_penalty_kernels.cu | 4 +--- tests/{ => csrc}/unittests/test_sampling.cu | 0 tests/{ => csrc}/unittests/test_sampling_kernels.cu | 2 +- tests/{ => csrc}/unittests/test_sampling_layer.cu | 3 +-- tests/{ => csrc}/unittests/test_tensor.cu | 0 tests/{ => csrc}/unittests/unittest_utils.h | 0 21 files changed, 7 insertions(+), 11 deletions(-) rename tests/{ => csrc}/CMakeLists.txt (96%) rename tests/{ => csrc}/gemm_dequantize/CMakeLists.txt (100%) rename tests/{ => csrc}/gemm_dequantize/th_gemm_dequantize.cc (100%) rename tests/{ => csrc}/gemm_dequantize/th_gemm_dequantize.py (100%) rename tests/{ => csrc}/int8_gemm/CMakeLists.txt (100%) rename tests/{ => csrc}/int8_gemm/int8_gemm_test.cu (100%) rename tests/{ => csrc}/unittests/CMakeLists.txt (100%) rename tests/{ => csrc}/unittests/gtest_utils.h (100%) rename tests/{ => csrc}/unittests/test_attention_kernels.cu (99%) rename tests/{ => csrc}/unittests/test_context_attention_layer.cu (100%) rename tests/{ => csrc}/unittests/test_gemm.cu (100%) rename tests/{ => csrc}/unittests/test_gpt_kernels.cu (100%) rename tests/{ => csrc}/unittests/test_int8.cu (98%) rename tests/{ => csrc}/unittests/test_logprob_kernels.cu (99%) rename tests/{ => csrc}/unittests/test_penalty_kernels.cu (99%) rename tests/{ => csrc}/unittests/test_sampling.cu (100%) rename tests/{ => csrc}/unittests/test_sampling_kernels.cu (99%) rename tests/{ => csrc}/unittests/test_sampling_layer.cu (99%) rename tests/{ => csrc}/unittests/test_tensor.cu (100%) rename tests/{ => csrc}/unittests/unittest_utils.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a1901489..01d19de73 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -285,7 +285,7 @@ add_subdirectory(src) add_subdirectory(examples) if(BUILD_TEST) - add_subdirectory(tests) + add_subdirectory(tests/csrc) endif() # # Mesaure the compile time diff --git a/tests/CMakeLists.txt b/tests/csrc/CMakeLists.txt similarity index 96% rename from tests/CMakeLists.txt rename to tests/csrc/CMakeLists.txt index 37d971dae..61a9b7383 100644 --- a/tests/CMakeLists.txt +++ b/tests/csrc/CMakeLists.txt @@ -15,6 +15,5 @@ add_subdirectory(unittests) if(BUILD_PYT) add_subdirectory(gemm_dequantize) - add_subdirectory(moe) add_subdirectory(int8_gemm) endif() diff --git a/tests/gemm_dequantize/CMakeLists.txt b/tests/csrc/gemm_dequantize/CMakeLists.txt similarity index 100% rename from tests/gemm_dequantize/CMakeLists.txt rename to tests/csrc/gemm_dequantize/CMakeLists.txt diff --git a/tests/gemm_dequantize/th_gemm_dequantize.cc b/tests/csrc/gemm_dequantize/th_gemm_dequantize.cc similarity index 100% rename from tests/gemm_dequantize/th_gemm_dequantize.cc rename to tests/csrc/gemm_dequantize/th_gemm_dequantize.cc diff --git a/tests/gemm_dequantize/th_gemm_dequantize.py b/tests/csrc/gemm_dequantize/th_gemm_dequantize.py similarity index 100% rename from tests/gemm_dequantize/th_gemm_dequantize.py rename to tests/csrc/gemm_dequantize/th_gemm_dequantize.py diff --git a/tests/int8_gemm/CMakeLists.txt b/tests/csrc/int8_gemm/CMakeLists.txt similarity index 100% rename from tests/int8_gemm/CMakeLists.txt rename to tests/csrc/int8_gemm/CMakeLists.txt diff --git a/tests/int8_gemm/int8_gemm_test.cu b/tests/csrc/int8_gemm/int8_gemm_test.cu similarity index 100% rename from tests/int8_gemm/int8_gemm_test.cu rename to tests/csrc/int8_gemm/int8_gemm_test.cu diff --git a/tests/unittests/CMakeLists.txt b/tests/csrc/unittests/CMakeLists.txt similarity index 100% rename from tests/unittests/CMakeLists.txt rename to tests/csrc/unittests/CMakeLists.txt diff --git a/tests/unittests/gtest_utils.h b/tests/csrc/unittests/gtest_utils.h similarity index 100% rename from tests/unittests/gtest_utils.h rename to tests/csrc/unittests/gtest_utils.h diff --git a/tests/unittests/test_attention_kernels.cu b/tests/csrc/unittests/test_attention_kernels.cu similarity index 99% rename from tests/unittests/test_attention_kernels.cu rename to tests/csrc/unittests/test_attention_kernels.cu index d595f40ff..f2a869381 100644 --- a/tests/unittests/test_attention_kernels.cu +++ b/tests/csrc/unittests/test_attention_kernels.cu @@ -20,7 +20,7 @@ #include "src/turbomind/utils/Tensor.h" #include "src/turbomind/utils/memory_utils.h" #include "src/turbomind/utils/nccl_utils.h" -#include "tests/unittests/gtest_utils.h" +#include "gtest_utils.h" #include #include diff --git a/tests/unittests/test_context_attention_layer.cu b/tests/csrc/unittests/test_context_attention_layer.cu similarity index 100% rename from tests/unittests/test_context_attention_layer.cu rename to tests/csrc/unittests/test_context_attention_layer.cu diff --git a/tests/unittests/test_gemm.cu b/tests/csrc/unittests/test_gemm.cu similarity index 100% rename from tests/unittests/test_gemm.cu rename to tests/csrc/unittests/test_gemm.cu diff --git a/tests/unittests/test_gpt_kernels.cu b/tests/csrc/unittests/test_gpt_kernels.cu similarity index 100% rename from tests/unittests/test_gpt_kernels.cu rename to tests/csrc/unittests/test_gpt_kernels.cu diff --git a/tests/unittests/test_int8.cu b/tests/csrc/unittests/test_int8.cu similarity index 98% rename from tests/unittests/test_int8.cu rename to tests/csrc/unittests/test_int8.cu index 8813b01be..96f0daead 100644 --- a/tests/unittests/test_int8.cu +++ b/tests/csrc/unittests/test_int8.cu @@ -14,7 +14,7 @@ #include #include -#include "tests/unittests/gtest_utils.h" +#include "gtest_utils.h" using namespace turbomind; diff --git a/tests/unittests/test_logprob_kernels.cu b/tests/csrc/unittests/test_logprob_kernels.cu similarity index 99% rename from tests/unittests/test_logprob_kernels.cu rename to tests/csrc/unittests/test_logprob_kernels.cu index aee090c2e..242b31ccf 100644 --- a/tests/unittests/test_logprob_kernels.cu +++ b/tests/csrc/unittests/test_logprob_kernels.cu @@ -12,7 +12,7 @@ #include "src/turbomind/utils/logger.h" #include "src/turbomind/utils/memory_utils.h" -#include "tests/unittests/gtest_utils.h" +#include "gtest_utils.h" using namespace turbomind; diff --git a/tests/unittests/test_penalty_kernels.cu b/tests/csrc/unittests/test_penalty_kernels.cu similarity index 99% rename from tests/unittests/test_penalty_kernels.cu rename to tests/csrc/unittests/test_penalty_kernels.cu index 4a9d5bca8..3ddb1ab9f 100644 --- a/tests/unittests/test_penalty_kernels.cu +++ b/tests/csrc/unittests/test_penalty_kernels.cu @@ -31,9 +31,7 @@ #include "src/turbomind/kernels/sampling_penalty_kernels.h" #include "src/turbomind/utils/cuda_utils.h" #include "src/turbomind/utils/memory_utils.h" - -// #include "tests/unittests/unittest_utils.h" -#include "tests/unittests/gtest_utils.h" +#include "gtest_utils.h" using namespace turbomind; diff --git a/tests/unittests/test_sampling.cu b/tests/csrc/unittests/test_sampling.cu similarity index 100% rename from tests/unittests/test_sampling.cu rename to tests/csrc/unittests/test_sampling.cu diff --git a/tests/unittests/test_sampling_kernels.cu b/tests/csrc/unittests/test_sampling_kernels.cu similarity index 99% rename from tests/unittests/test_sampling_kernels.cu rename to tests/csrc/unittests/test_sampling_kernels.cu index 370bbcfdf..041b70d72 100644 --- a/tests/unittests/test_sampling_kernels.cu +++ b/tests/csrc/unittests/test_sampling_kernels.cu @@ -19,7 +19,7 @@ #include "src/turbomind/utils/cuda_utils.h" #include "src/turbomind/utils/memory_utils.h" -#include "tests/unittests/gtest_utils.h" +#include "gtest_utils.h" using namespace turbomind; diff --git a/tests/unittests/test_sampling_layer.cu b/tests/csrc/unittests/test_sampling_layer.cu similarity index 99% rename from tests/unittests/test_sampling_layer.cu rename to tests/csrc/unittests/test_sampling_layer.cu index b95fcb186..6b8bcce7c 100644 --- a/tests/unittests/test_sampling_layer.cu +++ b/tests/csrc/unittests/test_sampling_layer.cu @@ -17,8 +17,7 @@ #include "src/turbomind/utils/memory_utils.h" #include "src/turbomind/utils/Tensor.h" -// #include "tests/unittests/unittest_utils.h" -#include "tests/unittests/gtest_utils.h" +#include "gtest_utils.h" using namespace turbomind; diff --git a/tests/unittests/test_tensor.cu b/tests/csrc/unittests/test_tensor.cu similarity index 100% rename from tests/unittests/test_tensor.cu rename to tests/csrc/unittests/test_tensor.cu diff --git a/tests/unittests/unittest_utils.h b/tests/csrc/unittests/unittest_utils.h similarity index 100% rename from tests/unittests/unittest_utils.h rename to tests/csrc/unittests/unittest_utils.h