add Caffe two tests (#1034)

PaddlePaddle · Jul 17, 2024 · 6da99e6 · 6da99e6
1 parent 4a5d64e
commit 6da99e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/test_benchmark/Caffe/convert.sh b/test_benchmark/Caffe/convert.sh
@@ -21,17 +21,14 @@ counter=1
 for model in $(ls -d */ | grep "[A-Z0-9]")
 do
     echo "[X2Paddle-Caffe] ${counter}/${num_of_models} $model ..."
-    if [ $model != "FaceDetction/" -a $model != "SSD/" ]
-    then 
-        cd $model
-        sh run_convert.sh $model 1>run.log 2>run.err &
-        cd ..
-        counter=$(($counter+1))
-        step=$(( $counter % 3 ))
-        if [ $step = 0 ]
-        then
-            wait
-        fi
+    cd $model
+    sh run_convert.sh $model 1>run.log 2>run.err &
+    cd ..
+    counter=$(($counter+1))
+    step=$(( $counter % 3 ))
+    if [ $step = 0 ]
+    then
+        wait
     fi
 done
 
@@ -41,10 +38,7 @@ rm -rf result.txt
 touch result.txt
 for model in $(ls -d */ | grep "[A-Z0-9]")
 do
-    if [ $model != "FaceDetction/" -a $model != "SSD/" ]
-    then
-        cat ${model}/result.txt >> ./result.txt
-    fi
+    cat ${model}/result.txt >> ./result.txt
 done
 
 cd tools

diff --git a/test_benchmark/test_ci.sh b/test_benchmark/test_ci.sh
@@ -9,6 +9,7 @@ python setup.py install;
     exit -1;
 fi;
 
+# convert.sh 会自动下载数据集
 cd test_benchmark/Caffe;
 bash convert.sh;
 
@@ -20,5 +21,4 @@ cd ../ONNX;
 bash convert.sh;
 
 cd ../TensorFlow;
-mv KerasBert ..; #暂时取消，会hang
 bash convert.sh;