[Metal] fix metallib path on ci

Tencent · Nov 16, 2020 · 6d4be13 · 6d4be13
1 parent d7153c9
commit 6d4be13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/scripts/build_macos.sh b/scripts/build_macos.sh
@@ -3,11 +3,12 @@
 SHARED_LIB="ON"
 METAL="ON"
 
-CWD=$(cd `dirname $0`; pwd)
+SD=$(cd `dirname $0`; pwd)
 if [ -z $TNN_ROOT_PATH ]
 then
-    TNN_ROOT_PATH=${CWD}/..
+    TNN_ROOT_PATH=${SD}/..
 fi
+CWD=$(pwd)
 
 function CheckRtnAndPrintMsg()
 {
@@ -43,7 +44,7 @@ BUILD_PATH=${CWD}/build_macos
 echo "check ${BUILD_PATH}"
 if [ ! -f ${BUILD_PATH}/tnn.metallib ]; then
     echo "No metallib found!"
-    exit 0
+    exit -1
 fi
 ./unit_test --lp ${BUILD_PATH}/tnn.metallib --dt METAL
 

diff --git a/source/tnn/device/metal/build_tnn_metallib.sh b/source/tnn/device/metal/build_tnn_metallib.sh
@@ -41,9 +41,6 @@ function BuildMetalLib()
 
    #build metallib
    xcrun -sdk macosx metallib ${TNNAllMetalAIRFiles[@]} -o ${TNNMetallibPath}
-   echo "=============================="
-   echo ${TNNMetallibPath}
-   echo "=============================="
 
    #delete air files
    for file in ${TNNAllMetalAIRFiles[@]}