[tvm] branch main updated: [DOCKER][ADRENO] Docker setup changes for multi user environments (#15003)

[echuraev]

This is an automated email from the ASF dual-hosted git repository.

echuraev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git


The following commit(s) were added to refs/heads/main by this push:
     new ca30b13668 [DOCKER][ADRENO] Docker setup changes for multi user 
environments (#15003)
ca30b13668 is described below

commit ca30b136686747e2817fb48b302dfa08eda935de
Author: Siva <quic_s...@quicinc.com>
AuthorDate: Thu Jun 1 21:13:25 2023 +0530

    [DOCKER][ADRENO] Docker setup changes for multi user environments (#15003)
    
    Docker setup changes for multi user environments
    
    Target setup shouldn't conflict while multiple users on the same target 
device
    libc++_shared.so may not be available for some android devices from system
---
 tests/scripts/setup-adreno-env.sh   | 13 +++++++++----
 tests/scripts/task_python_adreno.sh | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/tests/scripts/setup-adreno-env.sh 
b/tests/scripts/setup-adreno-env.sh
index 44eb7edce8..55a92c5f61 100755
--- a/tests/scripts/setup-adreno-env.sh
+++ b/tests/scripts/setup-adreno-env.sh
@@ -90,15 +90,20 @@ case ${ENVIRONMENT} in
     def_environment
     export ANDROID_SERIAL=${ADB_SERIAL}
 
-    adb shell "mkdir -p /data/local/tmp/tvm_ci"
-    adb push build-adreno-target/tvm_rpc /data/local/tmp/tvm_ci/tvm_rpc_ci
-    adb push build-adreno-target/libtvm_runtime.so /data/local/tmp/tvm_ci
+    TARGET_FOLDER=/data/local/tmp/tvm_ci-${USER}
+    CPP_LIB=`find ${ANDROID_NDK_HOME} -name libc++_shared.so | grep aarch64`
+    adb shell "mkdir -p ${TARGET_FOLDER}"
+    adb push build-adreno-target/tvm_rpc ${TARGET_FOLDER}/tvm_rpc-${USER}
+    adb push build-adreno-target/libtvm_runtime.so ${TARGET_FOLDER}
+    if [ -f ${CPP_LIB} ] ; then
+        adb push ${CPP_LIB} ${TARGET_FOLDER}
+    fi
 
     adb reverse tcp:${TVM_TRACKER_PORT} tcp:${TVM_TRACKER_PORT}
     adb forward tcp:5000 tcp:5000
     adb forward tcp:5001 tcp:5001
     adb forward tcp:5002 tcp:5002
-    adb shell "cd /data/local/tmp/tvm_ci; killall -9 tvm_rpc_ci; sleep 2; 
LD_LIBRARY_PATH=/data/local/tmp/tvm_ci/ ./tvm_rpc_ci server --host=0.0.0.0 
--port=5000 --port-end=5010 --tracker=127.0.0.1:${TVM_TRACKER_PORT} 
--key=${RPC_DEVICE_KEY}"
+    adb shell "cd ${TARGET_FOLDER}; killall -9 tvm_rpc-${USER}; sleep 2; 
LD_LIBRARY_PATH=${TARGET_FOLDER}/ ./tvm_rpc-${USER} server --host=0.0.0.0 
--port=5000 --port-end=5010 --tracker=127.0.0.1:${TVM_TRACKER_PORT} 
--key=${RPC_DEVICE_KEY}"
     ;;
 
   "query")
diff --git a/tests/scripts/task_python_adreno.sh 
b/tests/scripts/task_python_adreno.sh
index 809df1ed2d..6d9c370aec 100755
--- a/tests/scripts/task_python_adreno.sh
+++ b/tests/scripts/task_python_adreno.sh
@@ -38,15 +38,20 @@ sleep 5   # Wait for tracker to bind
 
 export ANDROID_SERIAL=$1
 
-adb shell "mkdir -p /data/local/tmp/tvm_ci"
-adb push build-adreno-target/tvm_rpc /data/local/tmp/tvm_ci/tvm_rpc_ci
-adb push build-adreno-target/libtvm_runtime.so /data/local/tmp/tvm_ci
+TARGET_FOLDER=/data/local/tmp/tvm_ci-${USER}
+adb shell "mkdir -p ${TARGET_FOLDER}"
+adb push build-adreno-target/tvm_rpc ${TARGET_FOLDER}/tvm_rpc-${USER}
+adb push build-adreno-target/libtvm_runtime.so ${TARGET_FOLDER}
+CPP_LIB=`find ${ANDROID_NDK_HOME} -name libc++_shared.so | grep aarch64`
+if [ -f ${CPP_LIB} ] ; then
+    adb push ${CPP_LIB} ${TARGET_FOLDER}
+fi
 
 adb reverse tcp:${TVM_TRACKER_PORT} tcp:${TVM_TRACKER_PORT}
 adb forward tcp:5000 tcp:5000
 adb forward tcp:5001 tcp:5001
 adb forward tcp:5002 tcp:5002
-env adb shell "cd /data/local/tmp/tvm_ci; killall -9 tvm_rpc_ci; sleep 2; 
LD_LIBRARY_PATH=/data/local/tmp/tvm_ci/ ./tvm_rpc_ci server --host=0.0.0.0 
--port=5000 --port-end=5010 --tracker=127.0.0.1:${TVM_TRACKER_PORT} 
--key=${RPC_DEVICE_KEY}" &
+env adb shell "cd ${TARGET_FOLDER}; killall -9 tvm_rpc-${USER}; sleep 2; 
LD_LIBRARY_PATH=${TARGET_FOLDER}/ ./tvm_rpc-${USER} server --host=0.0.0.0 
--port=5000 --port-end=5010 --tracker=127.0.0.1:${TVM_TRACKER_PORT} 
--key=${RPC_DEVICE_KEY}" &
 DEVICE_PID=$!
 sleep 5 # Wait for the device connections
 trap "{ kill ${TRACKER_PID}; kill ${DEVICE_PID}; }" 0