Auto-update fbgemm to v0.8.0 (#4810)
* Update fbgemm to v0.8.0 * add patch * fix msvc v142 bug --------- Co-authored-by: star9029 <hengxings783@gmail.com>pull/4397/merge
parent
fe429cdbf3
commit
59044d027e
3 changed files with 73 additions and 0 deletions
@ -0,0 +1,55 @@ |
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 35f0a967..bac7b4a2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -246,7 +246,8 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}")
|
||||
message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}")
|
||||
message(WARNING "==========")
|
||||
|
||||
-if(NOT TARGET asmjit)
|
||||
+find_package(asmjit CONFIG REQUIRED)
|
||||
+if(0)
|
||||
# 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"
|
||||
@@ -279,7 +280,8 @@ if(NOT TARGET asmjit)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-if(NOT TARGET cpuinfo)
|
||||
+find_package(cpuinfo CONFIG REQUIRED)
|
||||
+if(0)
|
||||
#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"
|
||||
@@ -363,12 +365,7 @@ target_include_directories(fbgemm BEFORE
|
||||
PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
|
||||
PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}/include>)
|
||||
|
||||
-target_link_libraries(fbgemm
|
||||
- $<BUILD_INTERFACE:asmjit>
|
||||
- $<BUILD_INTERFACE:cpuinfo>)
|
||||
-add_dependencies(fbgemm
|
||||
- asmjit
|
||||
- cpuinfo)
|
||||
+target_link_libraries(fbgemm asmjit cpuinfo)
|
||||
|
||||
if(OpenMP_FOUND)
|
||||
target_link_libraries(fbgemm OpenMP::OpenMP_CXX)
|
||||
@@ -392,12 +389,12 @@ install(
|
||||
|
||||
if(MSVC)
|
||||
if(FBGEMM_LIBRARY_TYPE STREQUAL "shared")
|
||||
- install(
|
||||
- FILES $<TARGET_PDB_FILE:fbgemm> $<TARGET_PDB_FILE:asmjit>
|
||||
- DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL)
|
||||
+ # install(
|
||||
+ # FILES $<TARGET_PDB_FILE:fbgemm> $<TARGET_PDB_FILE:asmjit>
|
||||
+ # DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL)
|
||||
endif()
|
||||
install(TARGETS fbgemm DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
- install(TARGETS asmjit DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+ # install(TARGETS asmjit DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
endif()
|
||||
|
||||
#Make project importable from the build directory
|
@ -0,0 +1,12 @@ |
||||
diff --git a/src/Utils.cc b/src/Utils.cc
|
||||
index bd970432..a3829247 100644
|
||||
--- a/src/Utils.cc
|
||||
+++ b/src/Utils.cc
|
||||
@@ -801,6 +801,7 @@ std::pair<K*, V*> radix_sort_parallel(
|
||||
std::swap(input_keys, output_keys);
|
||||
std::swap(input_values, output_values);
|
||||
#pragma omp barrier
|
||||
+{}
|
||||
}
|
||||
}
|
||||
#ifdef _MSC_VER
|
Loading…
Reference in new issue