separate tests/ dir

billyzs · Jul 10, 2024 · 25691fe · 25691fe
1 parent 411af42
commit 25691fe
Show file tree

Hide file tree

Showing 12 changed files with 86 additions and 69 deletions.
diff --git a/.github/workflows/cmake-ninja-macos.yml b/.github/workflows/cmake-ninja-macos.yml
@@ -86,6 +86,7 @@ jobs:
         -D CMAKE_CXX_COMPILER_LAUNCHER="${{ steps.variables.outputs.tools-cache-dir }}/bin/ccache"
         -D CPM_SOURCE_CACHE=${{ steps.variables.outputs.ccache-cache-dir }}
         -D CMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -D BUILD_TESTING=ON
         -B ${{ steps.variables.outputs.build-output-dir }}
         -S ${{ github.workspace }}
 
@@ -102,4 +103,4 @@ jobs:
       # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       run: >
-        ctest --progress --output-on-failure --schedule-random --build-config ${{ matrix.build_type }}
+        ctest --progress --output-on-failure --schedule-random --no-tests=error --test-dir tests --build-config ${{ matrix.build_type }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ project(
 )
 message(
   STATUS
-    "Using CMake version: ${CMAKE_VERSION}"
+    "Using CMake version: ${CMAKE_VERSION} on ${CMAKE_SYSTEM_PROCESSOR}"
 )
 message(
   STATUS
@@ -169,73 +169,14 @@ endif()
 
 include(cmake/CompileOptions.cmake)
 set_project_compile_options()
-
-add_library(
-  tutorial
-  STATIC
-  tutorial.cpp
-)
-target_link_libraries(
-  tutorial
-  PUBLIC
-    $<BUILD_INTERFACE:mlx>
-  PRIVATE
-    bench_compile_opts
+target_include_directories(
+  bench_compile_opts
+  INTERFACE
+    "include/"
 )
 
-if(TARGET
-   Eigen3::Eigen
-)
-  add_library(
-    test_eigen
-    STATIC
-    test_eigen.cpp
-  )
-  target_link_libraries(
-    test_eigen
-    PRIVATE
-      Eigen3::Eigen bench_compile_opts benchmark::benchmark
-  )
-endif()
-
-if(OpenMP_CXX_FOUND)
-  add_library(
-    test_openmp
-    STATIC
-    test_openmp.cpp
-  )
-  target_link_libraries(
-    test_openmp
-    PRIVATE
-      OpenMP::OpenMP_CXX bench_compile_opts benchmark::benchmark
-  )
-endif()
-
-add_executable(
-  main
-  test_mlx.cpp
-  main.cpp
-)
+add_subdirectory(src)
 
-target_link_libraries(
-  main
-  PRIVATE
-    bench_compile_opts tutorial $<TARGET_NAME_IF_EXISTS::test_openmp>
-    $<TARGET_NAME_IF_EXISTS:test_eigen> benchmark::benchmark
-)
-if(CMAKE_CXX_COMPILER_ID
-   STREQUAL
-   "AppleClang"
-)
-  add_dependencies(
-    main
-    test_openmp
-  ) # HACK until #3 is solved
+if(BUILD_TESTING)
+  add_subdirectory(tests)
 endif()
-
-enable_testing()
-add_test(
-  NAME benchmark_main.list_tests
-  COMMAND
-    main --benchmark_list_tests=true
-)
diff --git a/cmake/download-build-tools.cmake b/cmake/download-build-tools.cmake
@@ -24,7 +24,7 @@ set(TMP
 
 message(
   WARNING
-    "Using host CMake version: ${CMAKE_VERSION} on architecture ${CMAKE_HOST_SYSTEM_PROCESSOR}"
+    "Using host CMake version: ${CMAKE_VERSION} on architecture ${CMAKE_SYSTEM_PROCESSOR}"
 )
 
 if(${CMAKE_HOST_SYSTEM_NAME}

diff --git a/config.h → include/config.h b/config.h → include/config.h
diff --git a/tutorial.h → include/tutorial.h b/tutorial.h → include/tutorial.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library(
+  mlx_tutorial
+  STATIC
+  tutorial.cpp
+)
+target_link_libraries(
+  mlx_tutorial
+  PUBLIC
+    $<BUILD_INTERFACE:mlx>
+  PRIVATE
+    bench_compile_opts
+)
diff --git a/tutorial.cpp → src/tutorial.cpp b/tutorial.cpp → src/tutorial.cpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -0,0 +1,63 @@
+if(TARGET
+   Eigen3::Eigen
+)
+  add_library(
+    test_eigen
+    STATIC
+    test_eigen.cpp
+  )
+  target_link_libraries(
+    test_eigen
+    PRIVATE
+      Eigen3::Eigen bench_compile_opts benchmark::benchmark
+  )
+endif()
+
+if(OpenMP_CXX_FOUND)
+  add_library(
+    test_openmp
+    STATIC
+    test_openmp.cpp
+  )
+  target_link_libraries(
+    test_openmp
+    PRIVATE
+      OpenMP::OpenMP_CXX bench_compile_opts benchmark::benchmark
+  )
+endif()
+
+add_executable(
+  main
+  test_mlx.cpp
+  main.cpp
+)
+
+target_include_directories(
+  main
+  PRIVATE
+    ../
+)
+
+target_link_libraries(
+  main
+  PRIVATE
+    bench_compile_opts mlx_tutorial $<TARGET_NAME_IF_EXISTS::test_openmp>
+    $<TARGET_NAME_IF_EXISTS:test_eigen> benchmark::benchmark
+)
+
+if(CMAKE_CXX_COMPILER_ID
+   STREQUAL
+   "AppleClang"
+)
+  add_dependencies(
+    main
+    test_openmp
+  ) # HACK until #3 is solved
+endif()
+
+enable_testing()
+add_test(
+  NAME benchmark_main.smoke_test
+  COMMAND
+    main --benchmark_list_tests=true
+)
diff --git a/main.cpp → tests/main.cpp b/main.cpp → tests/main.cpp
diff --git a/test_eigen.cpp → tests/test_eigen.cpp b/test_eigen.cpp → tests/test_eigen.cpp
diff --git a/test_mlx.cpp → tests/test_mlx.cpp b/test_mlx.cpp → tests/test_mlx.cpp
diff --git a/test_openmp.cpp → tests/test_openmp.cpp b/test_openmp.cpp → tests/test_openmp.cpp