Skip to content

Commit 613e883

Browse files
committed
Add extension/llm/custom_ops/spinquant/test to CMake
Need to run it to make sure build changes in this directory aren't breaking things ghstack-source-id: 331d7ab ghstack-comment-id: 2648964965 Pull Request resolved: #8345
1 parent dba00d9 commit 613e883

File tree

8 files changed

+64
-4
lines changed

8 files changed

+64
-4
lines changed

build/Test.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ function(et_cxx_test target_name)
3636
cmake_parse_arguments(ET_CXX_TEST "" "" "${multi_arg_names}" ${ARGN})
3737

3838
add_executable(${target_name} ${ET_CXX_TEST_SOURCES} ${EXECUTORCH_ROOT}/runtime/core/exec_aten/testing_util/tensor_util.cpp)
39+
find_package(GTest)
3940
# Includes gtest, gmock, executorch by default
4041
target_link_libraries(
4142
${target_name} GTest::gtest GTest::gtest_main GTest::gmock executorch

build/build_android_llm_demo.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ build_android_native_library() {
4040
EXECUTORCH_BUILD_NEURON=OFF
4141
fi
4242

43-
cmake . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
43+
cmake --trace . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
4444
-DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \
4545
-DANDROID_ABI="${ANDROID_ABI}" \
4646
-DANDROID_PLATFORM=android-26 \
@@ -69,7 +69,7 @@ build_android_native_library() {
6969
fi
7070
cmake --build "${CMAKE_OUT}" -j "${CMAKE_JOBS}" --target install --config "${EXECUTORCH_CMAKE_BUILD_TYPE}"
7171

72-
cmake extension/android \
72+
cmake --trace extension/android \
7373
-DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
7474
-DANDROID_ABI="${ANDROID_ABI}" \
7575
-DANDROID_PLATFORM=android-26 \

extension/android_test/setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ build_native_library() {
1818
CMAKE_OUT="cmake-out-android-${ANDROID_ABI}"
1919
ANDROID_NDK="${ANDROID_NDK:-/opt/ndk}"
2020
EXECUTORCH_CMAKE_BUILD_TYPE="${EXECUTORCH_CMAKE_BUILD_TYPE:-Release}"
21-
cmake . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
21+
cmake --trace . -DCMAKE_INSTALL_PREFIX="${CMAKE_OUT}" \
2222
-DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" \
2323
-DANDROID_ABI="${ANDROID_ABI}" \
2424
-DEXECUTORCH_BUILD_XNNPACK=ON \
@@ -33,7 +33,7 @@ build_native_library() {
3333

3434
cmake --build "${CMAKE_OUT}" -j16 --target install
3535

36-
cmake extension/android \
36+
cmake --trace extension/android \
3737
-DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}"/build/cmake/android.toolchain.cmake \
3838
-DANDROID_ABI="${ANDROID_ABI}" \
3939
-DCMAKE_INSTALL_PREFIX=c"${CMAKE_OUT}" \

extension/llm/custom_ops/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,8 @@ if(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT)
121121
LIBRARY DESTINATION executorch/extension/llm/custom_ops
122122
)
123123
endif()
124+
125+
add_subdirectory(spinquant/third-party/FFHT)
126+
if(BUILD_TESTING)
127+
add_subdirectory(spinquant/test)
128+
endif()
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright (c) Meta Platforms, Inc. and affiliates.
2+
# All rights reserved.
3+
#
4+
# This source code is licensed under the BSD-style license found in the
5+
# LICENSE file in the root directory of this source tree.
6+
7+
# @generated by test/utils/generate_gtest_cmakelists.py
8+
#
9+
# This file should be formatted with
10+
# ~~~
11+
# cmake-format -i CMakeLists.txt
12+
# ~~~
13+
# It should also be cmake-lint clean.
14+
#
15+
16+
cmake_minimum_required(VERSION 3.19)
17+
18+
set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../..)
19+
20+
include(${EXECUTORCH_ROOT}/build/Test.cmake)
21+
22+
set(_test_srcs
23+
fast_hadamard_transform_test.cpp fast_hadamard_transform_test_impl.cpp
24+
op_fast_hadamard_transform_test.cpp
25+
)
26+
27+
et_cxx_test(
28+
extension_llm_custom_ops_spinquant_test SOURCES ${_test_srcs} EXTRA_LIBS
29+
custom_ops dumb_fht
30+
)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Copyright (c) Meta Platforms, Inc. and affiliates.
2+
# All rights reserved.
3+
#
4+
# This source code is licensed under the BSD-style license found in the
5+
# LICENSE file in the root directory of this source tree.
6+
7+
# Please this file formatted by running:
8+
# ~~~
9+
# cmake-format -i CMakeLists.txt
10+
# ~~~
11+
12+
add_library(dumb_fht dumb_fht.c)

test/run_oss_cpp_tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ build_executorch() {
3535
cmake . \
3636
-DCMAKE_INSTALL_PREFIX=cmake-out \
3737
-DEXECUTORCH_USE_CPP_CODE_COVERAGE=ON \
38+
-DEXECUTORCH_BUILD_KERNELS_CUSTOM=ON \
3839
-DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON \
3940
-DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \
4041
-DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \

test/utils/OSSTestConfig.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
{ "tests": [
2+
{
3+
"directory": "extension/llm/custom_ops/spinquant/test",
4+
"sources": [
5+
"fast_hadamard_transform_test.cpp",
6+
"fast_hadamard_transform_test_impl.cpp",
7+
"op_fast_hadamard_transform_test.cpp"
8+
],
9+
"additional_libs": [
10+
"custom_ops"
11+
]
12+
},
213
{
314
"directory": "extension/data_loader/test",
415
"sources": [

0 commit comments

Comments
 (0)