move src test cases to tests/csrc

lvhan028 · Aug 1, 2023 · 1d7847d · 1d7847d
1 parent b373f0b
commit 1d7847d
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 11 deletions.
diff --git 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 → tests/csrc/CMakeLists.txt b/tests/CMakeLists.txt → 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 → tests/csrc/gemm_dequantize/CMakeLists.txt b/tests/gemm_dequantize/CMakeLists.txt → tests/csrc/gemm_dequantize/CMakeLists.txt
diff --git a/tests/gemm_dequantize/th_gemm_dequantize.cc → ...src/gemm_dequantize/th_gemm_dequantize.cc b/tests/gemm_dequantize/th_gemm_dequantize.cc → ...src/gemm_dequantize/th_gemm_dequantize.cc
diff --git a/tests/gemm_dequantize/th_gemm_dequantize.py → ...src/gemm_dequantize/th_gemm_dequantize.py b/tests/gemm_dequantize/th_gemm_dequantize.py → ...src/gemm_dequantize/th_gemm_dequantize.py
diff --git a/tests/int8_gemm/CMakeLists.txt → tests/csrc/int8_gemm/CMakeLists.txt b/tests/int8_gemm/CMakeLists.txt → tests/csrc/int8_gemm/CMakeLists.txt
diff --git a/tests/int8_gemm/int8_gemm_test.cu → tests/csrc/int8_gemm/int8_gemm_test.cu b/tests/int8_gemm/int8_gemm_test.cu → tests/csrc/int8_gemm/int8_gemm_test.cu
diff --git a/tests/unittests/CMakeLists.txt → tests/csrc/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt → tests/csrc/unittests/CMakeLists.txt
diff --git a/tests/unittests/gtest_utils.h → tests/csrc/unittests/gtest_utils.h b/tests/unittests/gtest_utils.h → tests/csrc/unittests/gtest_utils.h
diff --git a/tests/unittests/test_attention_kernels.cu → .../csrc/unittests/test_attention_kernels.cu b/tests/unittests/test_attention_kernels.cu → .../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 <curand.h>
 #include <sstream>

diff --git a/...unittests/test_context_attention_layer.cu → ...unittests/test_context_attention_layer.cu b/...unittests/test_context_attention_layer.cu → ...unittests/test_context_attention_layer.cu
diff --git a/tests/unittests/test_gemm.cu → tests/csrc/unittests/test_gemm.cu b/tests/unittests/test_gemm.cu → tests/csrc/unittests/test_gemm.cu
diff --git a/tests/unittests/test_gpt_kernels.cu → tests/csrc/unittests/test_gpt_kernels.cu b/tests/unittests/test_gpt_kernels.cu → tests/csrc/unittests/test_gpt_kernels.cu
diff --git a/tests/unittests/test_int8.cu → tests/csrc/unittests/test_int8.cu b/tests/unittests/test_int8.cu → tests/csrc/unittests/test_int8.cu
@@ -14,7 +14,7 @@
 #include <iostream>
 #include <random>
 
-#include "tests/unittests/gtest_utils.h"
+#include "gtest_utils.h"
 
 using namespace turbomind;
 

diff --git a/tests/unittests/test_logprob_kernels.cu → tests/csrc/unittests/test_logprob_kernels.cu b/tests/unittests/test_logprob_kernels.cu → 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 → tests/csrc/unittests/test_penalty_kernels.cu b/tests/unittests/test_penalty_kernels.cu → 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 → tests/csrc/unittests/test_sampling.cu b/tests/unittests/test_sampling.cu → tests/csrc/unittests/test_sampling.cu
diff --git a/tests/unittests/test_sampling_kernels.cu → ...s/csrc/unittests/test_sampling_kernels.cu b/tests/unittests/test_sampling_kernels.cu → ...s/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 → tests/csrc/unittests/test_sampling_layer.cu b/tests/unittests/test_sampling_layer.cu → 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 → tests/csrc/unittests/test_tensor.cu b/tests/unittests/test_tensor.cu → tests/csrc/unittests/test_tensor.cu
diff --git a/tests/unittests/unittest_utils.h → tests/csrc/unittests/unittest_utils.h b/tests/unittests/unittest_utils.h → tests/csrc/unittests/unittest_utils.h