Skip to content

introduce WebGPU via Emdawnwebgpu #6631

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

Draft
NKID00 wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −4
Draft

introduce WebGPU via Emdawnwebgpu #6631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,9 +786,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "cmake")

if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s FORCE_FILESYSTEM=1 -s INITIAL_MEMORY=256MB -s EXIT_RUNTIME=1")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s FORCE_FILESYSTEM=1 -s INITIAL_MEMORY=256MB -s EXIT_RUNTIME=1")
set(CMAKE_EXECUTBLE_LINKER_FLAGS "${CMAKE_EXECUTBLE_LINKER_FLAGS} -s FORCE_FILESYSTEM=1 -s INITIAL_MEMORY=256MB -s EXIT_RUNTIME=1")
set(CMAKE_EXECUTBLE_LINKER_FLAGS "${CMAKE_EXECUTBLE_LINKER_FLAGS} -s FORCE_FILESYSTEM=1 -s INITIAL_MEMORY=256MB -s EXIT_RUNTIME=1 --closure 1")

if(NCNN_OPENMP AND NCNN_SIMPLEOMP)
# TODO better flags for emscripten
Expand Down Expand Up @@ -871,6 +869,12 @@ if(NCNN_VULKAN)
endif()
endif()
endif()

if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --use-port=emdawnwebgpu")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --use-port=emdawnwebgpu")
set(CMAKE_EXECUTBLE_LINKER_FLAGS "${CMAKE_EXECUTBLE_LINKER_FLAGS} --use-port=emdawnwebgpu")
endif()
endif()

add_subdirectory(src)
Expand Down
5 changes: 4 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ set(ncnn_SRCS
simplestl.cpp
simplemath.cpp
simplevk.cpp
webgpu.cpp
)

if(ANDROID)
Expand Down Expand Up @@ -309,7 +310,9 @@ if(NCNN_VULKAN)
target_link_libraries(ncnn PRIVATE "-Wl,-weak_library,${SIMPLEVK_TBD}")
endif()
endif()
target_link_libraries(ncnn PRIVATE ${CMAKE_DL_LIBS})
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
target_link_libraries(ncnn PRIVATE ${CMAKE_DL_LIBS})
endif()
else()
find_package(Vulkan QUIET)
if(NOT Vulkan_FOUND)
Expand Down
11 changes: 11 additions & 0 deletions src/webgpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#include "gpu.h"

#if defined(__EMSCRIPTEN__) && NCNN_VULKAN

#include <webgpu/webgpu.h>

namespace ncnn {

};

#endif // defined(__EMSCRIPTEN__) && NCNN_VULKAN