Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ability to compile using MinGW build tools #2114

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Ability to compile using MinGW build tools #2114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
210b7a4
Adding mingw headers, so that it compiles with msys2 buildtools
Nov 4, 2023
992299d
Undo adding asmjit shared on mingw
Nov 4, 2023
77cb1f9
Remove Mingw dependent things
Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,14 @@ else(MSVC)
string(APPEND CMAKE_CXX_FLAGS " -Werror")
string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations")
string(APPEND CMAKE_CXX_FLAGS " -Wimplicit-fallthrough")
if(MINGW)
if(FBGEMM_LIBRARY_TYPE STREQUAL "static")
target_compile_definitions(fbgemm_generic PRIVATE ASMJIT_STATIC)
target_compile_definitions(fbgemm_avx2 PRIVATE ASMJIT_STATIC)
target_compile_definitions(fbgemm_avx512 PRIVATE ASMJIT_STATIC)
endif()
endif()

target_compile_options(fbgemm_avx2 PRIVATE
"-m64" "-mavx2" "-mf16c" "-mfma")
target_compile_options(fbgemm_avx512 PRIVATE
Expand Down Expand Up @@ -244,7 +252,7 @@ if(NOT TARGET asmjit)

#build asmjit
#For MSVC shared build, asmjit needs to be shared also.
if (MSVC AND (FBGEMM_LIBRARY_TYPE STREQUAL "shared"))
if ((MSVC OR MINGW) AND (FBGEMM_LIBRARY_TYPE STREQUAL "shared"))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MSVC or MINGW is probably same as WIN32.

set(ASMJIT_STATIC OFF)
else()
set(ASMJIT_STATIC ON)
Expand Down
4 changes: 2 additions & 2 deletions bench/AlignedVec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class aligned_allocator {
// Mallocator wraps malloc().
void* pv = nullptr;
int ret;
#ifdef _MSC_VER
#ifdef _WIN32
pv = _aligned_malloc(n * sizeof(T), Alignment);
ret = 0;
#else
Expand All @@ -126,7 +126,7 @@ class aligned_allocator {
}

void deallocate(T* const p, const std::size_t /*n*/) const {
#ifdef _MSC_VER
#ifdef _WIN32
_aligned_free(p);
#else
free(p);
Expand Down
27 changes: 15 additions & 12 deletions bench/BenchUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,19 +367,22 @@ void performance_test(
}

#if defined(USE_MKL) || defined(USE_BLAS)
// Compare results
for (size_t i = 0; i < C_ref[0].size(); i++) {
if (std::abs(C_ref[0][i] - C_fb[0][i]) > 1e-3) {
fprintf(
stderr,
"Error: too high diff between fp32 ref %f and fp16 %f at %ld\n",
C_ref[0][i],
C_fb[0][i],
i);
return;
}
}
// Compare results
for (size_t i = 0; i < C_ref[0].size(); i++) {
if (std::abs(C_ref[0][i] - C_fb[0][i]) > 1e-3) {
// Use different format specifiers for MinGW and others
#ifdef __MINGW32__
fprintf(stderr, "Error: too high diff between fp32 ref %f and fp16 %f at %llu\n",
C_ref[0][i], C_fb[0][i], static_cast<unsigned long long>(i));
#else
fprintf(stderr, "Error: too high diff between fp32 ref %f and fp16 %f at %zu\n",
C_ref[0][i], C_fb[0][i], i);
#endif
return;
}
}
#endif

}

#ifdef USE_MKL
Expand Down
6 changes: 5 additions & 1 deletion bench/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,13 @@ macro(add_benchmark BENCHNAME)
if (${BLAS_FOUND})
target_compile_options(${BENCHNAME} PRIVATE "-DUSE_BLAS")
target_link_libraries(${BENCHNAME} "${BLAS_LIBRARIES}")
target_include_directories(${BENCHNAME} PRIVATE "${BLAS_INCLUDE_DIRS}")
endif()

set_target_properties(${BENCHNAME} PROPERTIES FOLDER test)
endmacro()

if(FBGEMM_BUILD_BENCHMARKS)
if(FBGEMM_BUILD_BENCHMARKS)

set(BENCHMARKS "")

Expand All @@ -80,6 +81,9 @@ if(FBGEMM_BUILD_BENCHMARKS)
get_filename_component(BENCH_FILE_ONLY "${BENCH_FILE}" NAME)
add_benchmark("${BENCH_NAME}"
"${BENCH_FILE_ONLY}")
if(FBGEMM_LIBRARY_TYPE STREQUAL "static") #Needed by MSVC and MinGW
target_compile_definitions("${BENCH_NAME}" PRIVATE FBGEMM_STATIC)
endif()
list(APPEND BENCHMARKS "${BENCH_NAME}")
endforeach()

Expand Down
28 changes: 18 additions & 10 deletions bench/RowwiseAdagradBenchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,19 +167,27 @@ void run_benchmark(
}
}

for (size_t i = 0; i < w.size(); ++i) {
assert(fabs(w[i] - w_ref[i]) < 1e-5);
if (fabs(w[i] - w_ref[i]) >= 1e-5) {
fprintf(stderr, "%ld %f %f\n", i, w[i], w_ref[i]);
}
for (size_t i = 0; i < w.size(); ++i) {
assert(fabs(w[i] - w_ref[i]) < 1e-5);
if (fabs(w[i] - w_ref[i]) >= 1e-5) {
#ifdef __MINGW32__
fprintf(stderr, "%llu %f %f\n", static_cast<unsigned long long>(i), w[i], w_ref[i]);
#else
fprintf(stderr, "%zu %f %f\n", i, w[i], w_ref[i]);
#endif
}
}

for (size_t i = 0; i < h.size(); ++i) {
assert(fabs(h[i] - h_ref[i]) < 1e-5);
if (fabs(h[i] - h_ref[i]) >= 1e-5) {
fprintf(stderr, "%ld %f %f\n", i, h[i], h_ref[i]);
}
for (size_t i = 0; i < h.size(); ++i) {
assert(fabs(h[i] - h_ref[i]) < 1e-5);
if (fabs(h[i] - h_ref[i]) >= 1e-5) {
#ifdef __MINGW32__
fprintf(stderr, "%llu %f %f\n", static_cast<unsigned long long>(i), h[i], h_ref[i]);
#else
fprintf(stderr, "%zu %f %f\n", i, h[i], h_ref[i]);
#endif
}
}

cout << "indices: " << (isIndex64b ? " 64bits " : " 32bits ") << " | ";
cout << "weight_decay: " << setw(1) << adjust_weight_decay << " | ";
Expand Down
29 changes: 19 additions & 10 deletions bench/SparseAdagradBenchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,19 +174,28 @@ void run_benchmark(
}
}

for (size_t i = 0; i < w.size(); ++i) {
assert(fabs(w[i] - w_ref[i]) < 1e-5);
if (fabs(w[i] - w_ref[i]) >= 1e-5) {
fprintf(stderr, "%ld %f %f\n", i, w[i], w_ref[i]);
}
for (size_t i = 0; i < w.size(); ++i) {
assert(fabs(w[i] - w_ref[i]) < 1e-5);
if (fabs(w[i] - w_ref[i]) >= 1e-5) {
#ifdef __MINGW32__
fprintf(stderr, "%llu %f %f\n", static_cast<unsigned long long>(i), w[i], w_ref[i]);
#else
fprintf(stderr, "%zu %f %f\n", i, w[i], w_ref[i]);
#endif
}
}

for (size_t i = 0; i < h.size(); ++i) {
assert(fabs(h[i] - h_ref[i]) < 1e-5);
if (fabs(h[i] - h_ref[i]) >= 1e-5) {
fprintf(stderr, "%ld %f %f\n", i, h[i], h_ref[i]);
}
for (size_t i = 0; i < h.size(); ++i) {
assert(fabs(h[i] - h_ref[i]) < 1e-5);
if (fabs(h[i] - h_ref[i]) >= 1e-5) {
#ifdef __MINGW32__
fprintf(stderr, "%llu %f %f\n", static_cast<unsigned long long>(i), h[i], h_ref[i]);
#else
fprintf(stderr, "%zu %f %f\n", i, h[i], h_ref[i]);
#endif
}
}


cout << "indices: " << (isIndex64b ? " 64bits " : " 32bits ") << " | ";
cout << "weight_decay: " << setw(1) << adjust_weight_decay << " | ";
Expand Down
14 changes: 8 additions & 6 deletions bench/SparseDenseMMFP32Benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,18 @@ int main(int, char**) {
// Compare results
for (size_t i = 0; i < ctDataRef.size(); i++) {
if (std::abs(ctDataRef[i] - ctDataIntrin[i]) > 1e-3) {
fprintf(
stderr,
"Error: Results differ ref %f and test %f at %ld\n",
ctDataRef[i],
ctDataIntrin[i],
i);
#ifdef __MINGW32__
fprintf(stderr, "Error: Results differ ref %f and test %f at %llu\n",
ctDataRef[i], ctDataIntrin[i], static_cast<unsigned long long>(i));
#else
fprintf(stderr, "Error: Results differ ref %f and test %f at %zu\n",
ctDataRef[i], ctDataIntrin[i], i);
#endif
return 1;
}
}


double effective_gflops_intrin = effective_flop / secs_intrin / 1e9;
cout << "[" << setw(5) << index << "]" << setw(7) << m << setw(7) << n
<< setw(7) << k << fixed << setw(7) << setprecision(2) << fnz
Expand Down
16 changes: 9 additions & 7 deletions bench/SparseDenseMMInt8Benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,20 @@ int main(int, char**) {
// "ctDataIntrin_u8");
//
// Compare results
for (size_t i = 0; i < ctDataRef.size(); i++) {
for (size_t i = 0; i < ctDataRef.size(); i++) {
if (std::abs(ctDataRef_u8[i] - ctDataIntrin_u8[i]) > 0) {
fprintf(
stderr,
"Error: Results differ ref %d and test %d at %ld\n",
ctDataRef_u8[i],
ctDataIntrin_u8[i],
i);
#ifdef __MINGW32__
fprintf(stderr, "Error: Results differ ref %hhu and test %hhu at %llu\n",
ctDataRef_u8[i], ctDataIntrin_u8[i], static_cast<unsigned long long>(i));
#else
fprintf(stderr, "Error: Results differ ref %hhu and test %hhu at %zu\n",
ctDataRef_u8[i], ctDataIntrin_u8[i], i);
#endif
return 1;
}
}


double effective_gflops_intrin = effective_flop / secs_intrin / 1e9;
cout << "[" << setw(5) << index << "]" << setw(7) << m << setw(7) << n
<< setw(7) << k << fixed << setw(7) << setprecision(2) << fnz
Expand Down
4 changes: 2 additions & 2 deletions src/Utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ void* fbgemmAlignedAlloc(
bool raiseException /*=false*/) {
void* aligned_mem = nullptr;
int ret;
#ifdef _MSC_VER
#ifdef _WIN32
aligned_mem = _aligned_malloc(size, align);
ret = 0;
#else
Expand All @@ -443,7 +443,7 @@ void* fbgemmAlignedAlloc(
}

void fbgemmAlignedFree(void* p) {
#ifdef _MSC_VER
#ifdef _WIN32
_aligned_free(p);
#else
free(p);
Expand Down
6 changes: 6 additions & 0 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if(${OpenMP_FOUND})
endif()

macro(add_gtest TESTNAME)

add_executable(${TESTNAME} ${ARGN}
../bench/BenchUtils.cc
EmbeddingSpMDMTestUtils.cc
Expand All @@ -62,6 +63,11 @@ macro(add_gtest TESTNAME)
target_compile_definitions(${TESTNAME} PRIVATE FBGEMM_STATIC)
endif()
else(MSVC)
if(MINGW)
#if (FBGEMM_LIBRARY_TYPE STREQUAL "static")
target_compile_definitions(${TESTNAME} PRIVATE FBGEMM_STATIC)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume the macro should not be defined for all cases. That static library condition should be present, right?

#endif()
endif()
target_compile_options(${TESTNAME} PRIVATE
"-m64" "-mavx2" "-mfma" "-masm=intel")
endif(MSVC)
Expand Down
Loading