|
|
|
--- a/CMakeLists.txt 2022-05-21 13:13:50.806813151 +0200
|
|
|
|
+++ b/CMakeLists.txt 2022-05-21 13:16:46.448969453 +0200
|
|
|
|
@@ -187,7 +187,7 @@
|
|
|
|
message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}")
|
|
|
|
message(WARNING "==========")
|
|
|
|
|
|
|
|
-if(NOT TARGET asmjit)
|
|
|
|
+if(FALSE)
|
|
|
|
#Download asmjit from github if ASMJIT_SRC_DIR is not specified.
|
|
|
|
if(NOT DEFINED ASMJIT_SRC_DIR)
|
|
|
|
set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit"
|
|
|
|
@@ -216,7 +216,7 @@
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
|
|
|
|
-if(NOT TARGET cpuinfo)
|
|
|
|
+if(FALSE)
|
|
|
|
#Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified.
|
|
|
|
if(NOT DEFINED CPUINFO_SOURCE_DIR)
|
|
|
|
set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo"
|
|
|
|
@@ -293,7 +293,6 @@
|
|
|
|
|
|
|
|
target_link_libraries(fbgemm $<BUILD_INTERFACE:asmjit>
|
|
|
|
$<BUILD_INTERFACE:cpuinfo>)
|
|
|
|
-add_dependencies(fbgemm asmjit cpuinfo)
|
|
|
|
|
|
|
|
install(TARGETS fbgemm EXPORT fbgemmLibraryConfig
|
|
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
|
|
@@ -302,6 +301,8 @@
|
|
|
|
|
|
|
|
install(FILES ${FBGEMM_PUBLIC_HEADERS}
|
|
|
|
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/fbgemm")
|
|
|
|
+install(FILES src/RefImplementations.h
|
|
|
|
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/fbgemm/src")
|
|
|
|
|
|
|
|
install(EXPORT fbgemmLibraryConfig DESTINATION share/cmake/fbgemm
|
|
|
|
FILE fbgemmLibraryConfig.cmake)
|
|
|
|
--- a/test/CMakeLists.txt 2022-05-21 13:15:34.140135199 +0200
|
|
|
|
+++ b/test/CMakeLists.txt 2022-05-21 13:17:59.170813431 +0200
|
|
|
|
@@ -1,6 +1,6 @@
|
|
|
|
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
|
|
|
|
|
|
|
|
-if(FBGEMM_BUILD_TESTS AND NOT TARGET gtest)
|
|
|
|
+if(FALSE)
|
|
|
|
#Download Googletest framework from github if
|
|
|
|
#GOOGLETEST_SOURCE_DIR is not specified.
|
|
|
|
if(NOT DEFINED GOOGLETEST_SOURCE_DIR)
|
|
|
|
@@ -67,7 +67,6 @@
|
|
|
|
target_link_libraries(${TESTNAME} ${OpenMP_CXX_LIBRARIES})
|
|
|
|
endif()
|
|
|
|
|
|
|
|
- add_dependencies(${TESTNAME} gtest fbgemm)
|
|
|
|
add_test(${TESTNAME} ${TESTNAME})
|
|
|
|
set_target_properties(${TESTNAME} PROPERTIES FOLDER test)
|
|
|
|
endmacro()
|
|
|
|
--- a/src/PackMatrix.cc 2022-05-24 08:19:00.639462626 +0200
|
|
|
|
+++ b/src/PackMatrix.cc 2022-05-24 08:27:59.127720548 +0200
|
|
|
|
@@ -30,6 +30,7 @@
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename PT, typename inpType, typename accType>
|
|
|
|
+FBGEMM_API
|
|
|
|
int PackMatrix<PT, inpType, accType>::packedBufferSize(
|
|
|
|
int rows,
|
|
|
|
int cols,
|