Skip to content

Commit 2d0c918

Browse files
committed
Update on "[ET-VK] Move GPUMemoryLayout and StorageType to utils/"
``` find . -type f -exec sed -i 's/vkapi::kBuffer/utils::kBuffer/g' {} + find . -type f -exec sed -i 's/vkapi::kTexture/utils::kTexture/g' {} + find . -type f -exec sed -i 's/vkapi::kWidthPacked/utils::kWidthPacked/g' {} + find . -type f -exec sed -i 's/vkapi::kHeightPacked/utils::kHeightPacked/g' {} + find . -type f -exec sed -i 's/vkapi::kChannelsPacked/utils::kChannelsPacked/g' {} + find . -type f -exec sed -i 's/vkapi::to_packed_dim_nchw_offset/utils::to_packed_dim_nchw_offset/g' {} + find . -type f -exec sed -i 's/vkapi::GPUMemoryLayout/utils::GPUMemoryLayout/g' {} + find . -type f -exec sed -i 's/vkapi::StorageType/utils::StorageType/g' {} + ``` Differential Revision: [D59527913](https://our.internmc.facebook.com/intern/diff/D59527913/) [ghstack-poisoned]
2 parents 830bcd1 + f2d0d57 commit 2d0c918

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
uses: pytorch/test-infra/.github/workflows/mobile_job.yml@main
107107
with:
108108
device-type: android
109-
runner: ubuntu-latest
109+
runner: linux.2xlarge
110110
test-infra-ref: ''
111111
# This is the ARN of ExecuTorch project on AWS
112112
project-arn: arn:aws:devicefarm:us-west-2:308535385114:project:02a2cf0f-6d9b-45ee-ba1a-a086587469e6

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ endif()
553553
# Install `executorch` library as well as `executorch-config.cmake` under
554554
# ${CMAKE_INSTALL_PREFIX}/
555555
install(
556-
TARGETS executorch executorch_no_prim_ops
556+
TARGETS executorch executorch_no_prim_ops executorch_no_prim_ops_shared
557557
DESTINATION lib
558558
INCLUDES
559559
DESTINATION ${_common_include_directories}

build/executorch-config.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
cmake_minimum_required(VERSION 3.19)
1414

1515
set(_root "${CMAKE_CURRENT_LIST_DIR}/../..")
16-
set(required_lib_list executorch executorch_no_prim_ops portable_kernels)
16+
set(required_lib_list executorch executorch_no_prim_ops
17+
executorch_no_prim_ops_shared portable_kernels
18+
)
1719
foreach(lib ${required_lib_list})
1820
set(lib_var "LIB_${lib}")
1921
add_library(${lib} STATIC IMPORTED)

examples/portable/custom_ops/test_custom_ops.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ test_cmake_custom_op_2() {
103103

104104
EXT=$(get_shared_lib_ext)
105105
echo "Exporting ${model_name}.pte"
106-
${PYTHON_EXECUTABLE} -m "examples.portable.custom_ops.${model_name}" --so_library="cmake-out/examples/portable/custom_ops/libcustom_ops_aot_lib$EXT"
106+
DYLD_LIBRARY_PATH="cmake-out/lib" ${PYTHON_EXECUTABLE} -m "examples.portable.custom_ops.${model_name}" --so_library="cmake-out/examples/portable/custom_ops/libcustom_ops_aot_lib$EXT"
107107
# should save file custom_ops_2.pte
108108

109109
echo 'Running custom_ops_executor_runner'

0 commit comments

Comments
 (0)