zhangyiss/mlx
1
0
Fork 0
mirror of https://github.com/ml-explore/mlx.git synced 2025-06-24 09:21:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

MinGW support (#1806)

Browse Source 
* Changed /bin/bash to bash for generating compiling preamble

* Fix wrt jit_compiler mingw like msvc wrt. WEXITSTATUS

* Solved ambiguity wrt. bernoulli test shape

* Disabled distributed/ring on Windows

* Fixed jit_compiler command wrt. MinGW

* Extended jit_compiler patch wrt. WEXITSTATUS to FreeBSD
This commit is contained in:
Jesper Stemann Andersen 2025-02-01 21:40:06 +01:00 committed by GitHub
parent 80c863b972
commit 2d8e667400
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mlx/backend/common/CMakeLists.txt
View File

@ -22,7 +22,7 @@ if(MSVC)
set(SHELL_CMD powershell -ExecutionPolicy Bypass -File) set(SHELL_CMD powershell -ExecutionPolicy Bypass -File)
else() else()
set(SHELL_EXT sh) set(SHELL_EXT sh)
set(SHELL_CMD /bin/bash) set(SHELL_CMD bash)
endif() endif()
add_custom_command( add_custom_command(

4
mlx/backend/common/jit_compiler.cpp
View File

@ -96,7 +96,7 @@ std::string JitCompiler::build_command(
libpaths); libpaths);
#else #else
return fmt::format( return fmt::format(
"g++ -std=c++17 -O3 -Wall -fPIC -shared '{0}' -o '{1}' 2>&1", "g++ -std=c++17 -O3 -Wall -fPIC -shared \"{0}\" -o \"{1}\" 2>&1",
(dir / source_file_name).string(), (dir / source_file_name).string(),
(dir / shared_lib_name).string()); (dir / shared_lib_name).string());
#endif #endif
@ -133,7 +133,7 @@ std::string JitCompiler::exec(const std::string& cmd) {
if (status == -1) { if (status == -1) {
throw std::runtime_error("pclose() failed."); throw std::runtime_error("pclose() failed.");
} }
#ifdef _MSC_VER #if defined(_WIN32) || defined(__FreeBSD__)
int code = status; int code = status;
#else #else
int code = WEXITSTATUS(status); int code = WEXITSTATUS(status);

2
mlx/backend/metal/CMakeLists.txt
View File

@ -12,7 +12,7 @@ function(make_jit_source SRC_FILE)
add_custom_command( add_custom_command(
OUTPUT jit/${SRC_NAME}.cpp OUTPUT jit/${SRC_NAME}.cpp
COMMAND COMMAND
/bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/make_compiled_preamble.sh bash ${CMAKE_CURRENT_SOURCE_DIR}/make_compiled_preamble.sh
${CMAKE_CURRENT_BINARY_DIR}/jit ${CMAKE_C_COMPILER} ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/jit ${CMAKE_C_COMPILER} ${PROJECT_SOURCE_DIR}
${SRC_FILE} ${SRC_FILE}
DEPENDS make_compiled_preamble.sh kernels/${SRC_FILE}.h ${ARGN}) DEPENDS make_compiled_preamble.sh kernels/${SRC_FILE}.h ${ARGN})

2
mlx/distributed/ring/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if(MLX_BUILD_CPU) if(MLX_BUILD_CPU AND NOT WIN32)
target_sources(mlx PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ring.cpp) target_sources(mlx PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ring.cpp)
else() else()
target_sources(mlx PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/no_ring.cpp) target_sources(mlx PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/no_ring.cpp)

2
tests/random_tests.cpp
View File

@ -556,7 +556,7 @@ TEST_CASE("test random bernoulli") {
p = array({0.1, 0.2, 0.3}); p = array({0.1, 0.2, 0.3});
// Ask for the wrong shape => throws // Ask for the wrong shape => throws
CHECK_THROWS_AS(random::bernoulli(p, {2}), std::invalid_argument); CHECK_THROWS_AS(random::bernoulli(p, Shape({2})), std::invalid_argument);
// Check wrong key type or shape // Check wrong key type or shape
auto key = array({0, 0}, {1, 2}); auto key = array({0, 0}, {1, 2});