Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/android-release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ jobs:

FLAVOR="${{ inputs.flavor }}"
if [[ "$FLAVOR" == "vulkan+xnnpack" || -z "$FLAVOR" ]]; then
curl -O https://sdk.lunarg.com/sdk/download/1.4.321.1/linux/vulkansdk-linux-x86_64-1.4.321.1.tar.xz
tar xf vulkansdk-linux-x86_64-1.4.321.1.tar.xz -C /tmp
export PATH="/tmp/1.4.321.1/x86_64/bin:$PATH"
export EXECUTORCH_BUILD_VULKAN=ON
fi

Expand Down
25 changes: 10 additions & 15 deletions backends/vulkan/cmake/ShaderLibrary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,17 @@ if(NOT EXECUTORCH_ROOT)
message("WARNING: EXECUTORCH_ROOT is not set! A failure is likely imminent.")
endif()

if(ANDROID)
if(NOT ANDROID_NDK)
message(FATAL_ERROR "ANDROID_NDK not set")
endif()

if(NOT GLSLC_PATH)
set(GLSLC_PATH
"${ANDROID_NDK}/shader-tools/${ANDROID_NDK_HOST_SYSTEM_NAME}/glslc"
)
endif()
else()
find_program(GLSLC_PATH glslc PATHS $ENV{PATH})
find_program(GLSLC_PATH glslc PATHS $ENV{PATH})

if(NOT GLSLC_PATH)
message(FATAL_ERROR "USE_VULKAN glslc not found")
endif()
if(NOT GLSLC_PATH)
message(
FATAL_ERROR
"glslc from the Vulkan SDK must be installed to build the Vulkan backend. "
"Please install the Vulkan SDK 1.4.321.0 or newer from "
"https://vulkan.lunarg.com/sdk/home and ensure that the glslc binary is in your PATH. "
"Note that the glslc distributed with the Android NDK is not compatible since it "
"does not support the GL_EXT_integer_dot_product extension. "
)
endif()

# Required to enable linking with --whole-archive
Expand Down
Loading