diff --git a/official/cv/Deepsort/ascend310_infer/build.sh b/official/cv/Deepsort/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/Deepsort/ascend310_infer/build.sh +++ b/official/cv/Deepsort/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/FCN8s/ascend310_infer/build.sh b/official/cv/FCN8s/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/FCN8s/ascend310_infer/build.sh +++ b/official/cv/FCN8s/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/alexnet/ascend310_infer/build.sh b/official/cv/alexnet/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/alexnet/ascend310_infer/build.sh +++ b/official/cv/alexnet/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/alexnet/scripts/run_infer_310.sh b/official/cv/alexnet/scripts/run_infer_310.sh index d32e4eda08b1d5ae4289d66d9717e89a8ca36ed6..6d87f25e8f082b65dd97779e41570226fb0e8997 100644 --- a/official/cv/alexnet/scripts/run_infer_310.sh +++ b/official/cv/alexnet/scripts/run_infer_310.sh @@ -70,19 +70,7 @@ else export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages:$ASCEND_HOME/atc/python/site-packages:$PYTHONPATH export ASCEND_OPP_PATH=$ASCEND_HOME/opp fi -export ASCEND_HOME=/usr/local/Ascend -export PATH=$ASCEND_HOME/fwkacllib/ccec_compiler/bin:$ASCEND_HOME/fwkacllib/bin:$ASCEND_HOME/toolkit/bin:$PATH - -export LD_LIBRARY_PATH=/usr/local/lib/:/usr/local/fwkacllib/lib64:$ASCEND_HOME/driver/lib64:$ASCEND_HOME/add-ons:/usr/local/Ascend/toolkit/lib64:$LD_LIBRARY_PATH - -export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages - -export PATH=/usr/local/python375/bin:$PATH -export NPU_HOST_LIB=/usr/local/Ascend/acllib/lib64/stub -export ASCEND_OPP_PATH=/usr/local/Ascend/opp -export ASCEND_AICPU_PATH=/usr/local/Ascend -export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH function preprocess_data() { if [ -d preprocess_Result ]; then diff --git a/official/cv/brdnet/ascend310_infer/build.sh b/official/cv/brdnet/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/brdnet/ascend310_infer/build.sh +++ b/official/cv/brdnet/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/crnn_seq2seq_ocr/ascend310_infer/build.sh b/official/cv/crnn_seq2seq_ocr/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/crnn_seq2seq_ocr/ascend310_infer/build.sh +++ b/official/cv/crnn_seq2seq_ocr/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/deeplabv3/ascend310_infer/build.sh b/official/cv/deeplabv3/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/deeplabv3/ascend310_infer/build.sh +++ b/official/cv/deeplabv3/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/dpn/ascend310_infer/build.sh b/official/cv/dpn/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/dpn/ascend310_infer/build.sh +++ b/official/cv/dpn/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/dpn/scripts/run_infer_310.sh b/official/cv/dpn/scripts/run_infer_310.sh index 5fb6ecb4250984584cf76096158d9d60717a603c..de7ded26923908d35edd3b16f607d705fdc7d174 100644 --- a/official/cv/dpn/scripts/run_infer_310.sh +++ b/official/cv/dpn/scripts/run_infer_310.sh @@ -55,20 +55,6 @@ else export ASCEND_OPP_PATH=$ASCEND_HOME/opp fi -export ASCEND_HOME=/usr/local/Ascend - -export PATH=$ASCEND_HOME/fwkacllib/ccec_compiler/bin:$ASCEND_HOME/fwkacllib/bin:$ASCEND_HOME/toolkit/bin:$PATH - -export LD_LIBRARY_PATH=/usr/local/lib/:/usr/local/fwkacllib/lib64:$ASCEND_HOME/driver/lib64:$ASCEND_HOME/add-ons:/usr/local/Ascend/toolkit/lib64:$LD_LIBRARY_PATH - -export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages - -export PATH=/usr/local/python375/bin:$PATH -export NPU_HOST_LIB=/usr/local/Ascend/acllib/lib64/stub -export ASCEND_OPP_PATH=/usr/local/Ascend/opp -export ASCEND_AICPU_PATH=/usr/local/Ascend -export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH - function preprocess_data() { if [ -d preprocess_Result ]; then diff --git a/official/cv/east/ascend310_infer/build.sh b/official/cv/east/ascend310_infer/build.sh index 402068723ef9d81a586c534dc7bfcc3d34c2c415..7571e9c03ff03aa3bc523d70969082ce19d1253b 100644 --- a/official/cv/east/ascend310_infer/build.sh +++ b/official/cv/east/ascend310_infer/build.sh @@ -25,6 +25,6 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/faster_rcnn/ascend310_infer/build.sh b/official/cv/faster_rcnn/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/faster_rcnn/ascend310_infer/build.sh +++ b/official/cv/faster_rcnn/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/fastscnn/ascend310_infer/build.sh b/official/cv/fastscnn/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/fastscnn/ascend310_infer/build.sh +++ b/official/cv/fastscnn/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/maskrcnn/ascend310_infer/build.sh b/official/cv/maskrcnn/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/maskrcnn/ascend310_infer/build.sh +++ b/official/cv/maskrcnn/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/maskrcnn_mobilenetv1/ascend310_infer/build.sh b/official/cv/maskrcnn_mobilenetv1/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/maskrcnn_mobilenetv1/ascend310_infer/build.sh +++ b/official/cv/maskrcnn_mobilenetv1/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/mobilenetv1/ascend310_infer/build.sh b/official/cv/mobilenetv1/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/mobilenetv1/ascend310_infer/build.sh +++ b/official/cv/mobilenetv1/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/mobilenetv1/scripts/run_infer_310.sh b/official/cv/mobilenetv1/scripts/run_infer_310.sh index 439d674440518a7e1097c5fabeaa6cb73b95b39b..42616694d03d8e020c1345a660eefe147b26f372 100644 --- a/official/cv/mobilenetv1/scripts/run_infer_310.sh +++ b/official/cv/mobilenetv1/scripts/run_infer_310.sh @@ -71,24 +71,6 @@ else export ASCEND_OPP_PATH=$ASCEND_HOME/opp fi -export SLOG_PRINT_to_STDOUT=0 -export GLOG_v=2 -export DUMP_GE_GRAPH=2 - -export ASCEND_HOME=/usr/local/Ascend - -export PATH=$ASCEND_HOME/fwkacllib/ccec_compiler/bin:$ASCEND_HOME/fwkacllib/bin:$ASCEND_HOME/toolkit/bin:$PATH - -export LD_LIBRARY_PATH=/usr/local/lib/:/usr/local/fwkacllib/lib64:$ASCEND_HOME/driver/lib64:$ASCEND_HOME/add-ons:/usr/local/Ascend/toolkit/lib64:$LD_LIBRARY_PATH - -export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages - -export PATH=/usr/local/python375/bin:$PATH -export NPU_HOST_LIB=/usr/local/Ascend/acllib/lib64/stub -export ASCEND_OPP_PATH=/usr/local/Ascend/opp -export ASCEND_AICPU_PATH=/usr/local/Ascend -export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH - function preprocess_data() { if [ -d preprocess_Result ]; then diff --git a/official/cv/psenet/ascend310_infer/build.sh b/official/cv/psenet/ascend310_infer/build.sh index d8ea19ff828dc682c646ef37bf0f513a2523a808..c7aac7196661fcfa50c3de063336355bf3831286 100644 --- a/official/cv/psenet/ascend310_infer/build.sh +++ b/official/cv/psenet/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make \ No newline at end of file diff --git a/official/cv/resnet/ascend310_infer/src/build.sh b/official/cv/resnet/ascend310_infer/src/build.sh index 7fac9cff3a98c83bce7e8f66053fab2ecebab86d..724c787b3646000019ded20c52854b2039cf295b 100644 --- a/official/cv/resnet/ascend310_infer/src/build.sh +++ b/official/cv/resnet/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make \ No newline at end of file diff --git a/official/cv/resnext/ascend310_infer/src/build.sh b/official/cv/resnext/ascend310_infer/src/build.sh index 7fac9cff3a98c83bce7e8f66053fab2ecebab86d..724c787b3646000019ded20c52854b2039cf295b 100644 --- a/official/cv/resnext/ascend310_infer/src/build.sh +++ b/official/cv/resnext/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make \ No newline at end of file diff --git a/official/cv/se_resnext50/ascend310_infer/src/build.sh b/official/cv/se_resnext50/ascend310_infer/src/build.sh index 7fac9cff3a98c83bce7e8f66053fab2ecebab86d..724c787b3646000019ded20c52854b2039cf295b 100644 --- a/official/cv/se_resnext50/ascend310_infer/src/build.sh +++ b/official/cv/se_resnext50/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make \ No newline at end of file diff --git a/official/cv/simclr/ascend310_infer/build.sh b/official/cv/simclr/ascend310_infer/build.sh index 402068723ef9d81a586c534dc7bfcc3d34c2c415..7571e9c03ff03aa3bc523d70969082ce19d1253b 100644 --- a/official/cv/simclr/ascend310_infer/build.sh +++ b/official/cv/simclr/ascend310_infer/build.sh @@ -25,6 +25,6 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/simple_pose/ascend310_infer/build.sh b/official/cv/simple_pose/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/simple_pose/ascend310_infer/build.sh +++ b/official/cv/simple_pose/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/ssd/ascend310_infer/build.sh b/official/cv/ssd/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/ssd/ascend310_infer/build.sh +++ b/official/cv/ssd/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/unet/ascend310_infer/src/build.sh b/official/cv/unet/ascend310_infer/src/build.sh index 3e205ecce78d6a271dc909b78fd1b9e06b72a999..abcb999930ca5d62345b204d7fcfe4e097e8f0bb 100644 --- a/official/cv/unet/ascend310_infer/src/build.sh +++ b/official/cv/unet/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/unet3d/ascend310_infer/build.sh b/official/cv/unet3d/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/unet3d/ascend310_infer/build.sh +++ b/official/cv/unet3d/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/vgg16/ascend310_infer/build.sh b/official/cv/vgg16/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/vgg16/ascend310_infer/build.sh +++ b/official/cv/vgg16/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/vit/ascend310_infer/src/build.sh b/official/cv/vit/ascend310_infer/src/build.sh index 7fac9cff3a98c83bce7e8f66053fab2ecebab86d..724c787b3646000019ded20c52854b2039cf295b 100644 --- a/official/cv/vit/ascend310_infer/src/build.sh +++ b/official/cv/vit/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make \ No newline at end of file diff --git a/official/cv/yolov3_darknet53/ascend310_infer/build.sh b/official/cv/yolov3_darknet53/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/yolov3_darknet53/ascend310_infer/build.sh +++ b/official/cv/yolov3_darknet53/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/yolov3_resnet18/ascend310_infer/build.sh b/official/cv/yolov3_resnet18/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/cv/yolov3_resnet18/ascend310_infer/build.sh +++ b/official/cv/yolov3_resnet18/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/cv/yolov4/ascend310_infer/src/build.sh b/official/cv/yolov4/ascend310_infer/src/build.sh index 3e205ecce78d6a271dc909b78fd1b9e06b72a999..abcb999930ca5d62345b204d7fcfe4e097e8f0bb 100644 --- a/official/cv/yolov4/ascend310_infer/src/build.sh +++ b/official/cv/yolov4/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/gnn/bgcf/ascend310_infer/build.sh b/official/gnn/bgcf/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/gnn/bgcf/ascend310_infer/build.sh +++ b/official/gnn/bgcf/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/gnn/gat/ascend310_infer/build.sh b/official/gnn/gat/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/gnn/gat/ascend310_infer/build.sh +++ b/official/gnn/gat/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/gnn/gcn/ascend310_infer/build.sh b/official/gnn/gcn/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/gnn/gcn/ascend310_infer/build.sh +++ b/official/gnn/gcn/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/nlp/bert/ascend310_infer/build.sh b/official/nlp/bert/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/nlp/bert/ascend310_infer/build.sh +++ b/official/nlp/bert/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/nlp/dgu/ascend310_infer/build.sh b/official/nlp/dgu/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/nlp/dgu/ascend310_infer/build.sh +++ b/official/nlp/dgu/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/nlp/emotect/ascend310_infer/build.sh b/official/nlp/emotect/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/nlp/emotect/ascend310_infer/build.sh +++ b/official/nlp/emotect/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/nlp/ernie/ascend310_infer/build.sh b/official/nlp/ernie/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/nlp/ernie/ascend310_infer/build.sh +++ b/official/nlp/ernie/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/nlp/gru/ascend310_infer/build.sh b/official/nlp/gru/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/nlp/gru/ascend310_infer/build.sh +++ b/official/nlp/gru/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/nlp/lstm/ascend310_infer/build.sh b/official/nlp/lstm/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/nlp/lstm/ascend310_infer/build.sh +++ b/official/nlp/lstm/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/nlp/mass/ascend310_infer/build.sh b/official/nlp/mass/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/nlp/mass/ascend310_infer/build.sh +++ b/official/nlp/mass/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/nlp/textcnn/ascend310_infer/build.sh b/official/nlp/textcnn/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/nlp/textcnn/ascend310_infer/build.sh +++ b/official/nlp/textcnn/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/nlp/tinybert/ascend310_infer/build.sh b/official/nlp/tinybert/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/nlp/tinybert/ascend310_infer/build.sh +++ b/official/nlp/tinybert/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/nlp/transformer/ascend310_infer/build.sh b/official/nlp/transformer/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/nlp/transformer/ascend310_infer/build.sh +++ b/official/nlp/transformer/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/recommend/deepfm/ascend310_infer/build.sh b/official/recommend/deepfm/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/recommend/deepfm/ascend310_infer/build.sh +++ b/official/recommend/deepfm/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/recommend/ncf/ascend310_infer/build.sh b/official/recommend/ncf/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/official/recommend/ncf/ascend310_infer/build.sh +++ b/official/recommend/ncf/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/official/recommend/wide_and_deep/ascend310_infer/build.sh b/official/recommend/wide_and_deep/ascend310_infer/build.sh index 265486af905be56182e116303eb8cf440204e61a..32ff98d8f5270f34e6470c7cbab7eb47a4aac8ab 100644 --- a/official/recommend/wide_and_deep/ascend310_infer/build.sh +++ b/official/recommend/wide_and_deep/ascend310_infer/build.sh @@ -26,5 +26,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/audio/fcn-4/ascend310_infer/build.sh b/research/audio/fcn-4/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/audio/fcn-4/ascend310_infer/build.sh +++ b/research/audio/fcn-4/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/AttGAN/ascend310_infer/build.sh b/research/cv/AttGAN/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/AttGAN/ascend310_infer/build.sh +++ b/research/cv/AttGAN/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/FaceAttribute/ascend310_infer/build.sh b/research/cv/FaceAttribute/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/FaceAttribute/ascend310_infer/build.sh +++ b/research/cv/FaceAttribute/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/FaceAttribute/scripts/run_infer_310.sh b/research/cv/FaceAttribute/scripts/run_infer_310.sh index 15ba20926917871019aa4791eb63a9be0db20ea1..c77add91cdb8092d2414b636e1e2028255ebbd71 100644 --- a/research/cv/FaceAttribute/scripts/run_infer_310.sh +++ b/research/cv/FaceAttribute/scripts/run_infer_310.sh @@ -51,15 +51,6 @@ else export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages:$ASCEND_HOME/atc/python/site-packages:$PYTHONPATH export ASCEND_OPP_PATH=$ASCEND_HOME/opp fi -export ASCEND_HOME=/usr/local/Ascend -export PATH=$ASCEND_HOME/fwkacllib/ccec_compiler/bin:$ASCEND_HOME/fwkacllib/bin:$ASCEND_HOME/toolkit/bin:$PATH -export LD_LIBRARY_PATH=/usr/local/lib/:/usr/local/fwkacllib/lib64:$ASCEND_HOME/driver/lib64:$ASCEND_HOME/add-ons:/usr/local/Ascend/toolkit/lib64:$LD_LIBRARY_PATH -export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages -export PATH=/usr/local/python375/bin:$PATH -export NPU_HOST_LIB=/usr/local/Ascend/acllib/lib64/stub -export ASCEND_OPP_PATH=/usr/local/Ascend/opp -export ASCEND_AICPU_PATH=/usr/local/Ascend -export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH function preprocess_data() { diff --git a/research/cv/FaceQualityAssessment/ascend310_infer/build.sh b/research/cv/FaceQualityAssessment/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/FaceQualityAssessment/ascend310_infer/build.sh +++ b/research/cv/FaceQualityAssessment/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/FaceQualityAssessment/scripts/run_infer_310.sh b/research/cv/FaceQualityAssessment/scripts/run_infer_310.sh index 2d349c2316ee7b7261a7f7c717cb81d22cc0783b..346009d9d5251efc800ab8e8fc69d5e1621a3784 100644 --- a/research/cv/FaceQualityAssessment/scripts/run_infer_310.sh +++ b/research/cv/FaceQualityAssessment/scripts/run_infer_310.sh @@ -54,19 +54,6 @@ else export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages:$ASCEND_HOME/atc/python/site-packages:$PYTHONPATH export ASCEND_OPP_PATH=$ASCEND_HOME/opp fi -export ASCEND_HOME=/usr/local/Ascend - -export PATH=$ASCEND_HOME/fwkacllib/ccec_compiler/bin:$ASCEND_HOME/fwkacllib/bin:$ASCEND_HOME/toolkit/bin:$PATH - -export LD_LIBRARY_PATH=/usr/local/lib/:/usr/local/fwkacllib/lib64:$ASCEND_HOME/driver/lib64:$ASCEND_HOME/add-ons:/usr/local/Ascend/toolkit/lib64:$LD_LIBRARY_PATH - -export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages - -export PATH=/usr/local/python375/bin:$PATH -export NPU_HOST_LIB=/usr/local/Ascend/acllib/lib64/stub -export ASCEND_OPP_PATH=/usr/local/Ascend/opp -export ASCEND_AICPU_PATH=/usr/local/Ascend -export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH function preprocess_data() { diff --git a/research/cv/FaceRecognition/ascend310_infer/build.sh b/research/cv/FaceRecognition/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/FaceRecognition/ascend310_infer/build.sh +++ b/research/cv/FaceRecognition/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/FaceRecognition/scripts/run_infer_310.sh b/research/cv/FaceRecognition/scripts/run_infer_310.sh index ff318e9b4291e7523e172c2d0dff846b6da7ceb5..4d67c70ffdbd6416f42686e1cda7a97ec8c0a9e8 100644 --- a/research/cv/FaceRecognition/scripts/run_infer_310.sh +++ b/research/cv/FaceRecognition/scripts/run_infer_310.sh @@ -51,19 +51,6 @@ else export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages:$ASCEND_HOME/atc/python/site-packages:$PYTHONPATH export ASCEND_OPP_PATH=$ASCEND_HOME/opp fi -export ASCEND_HOME=/usr/local/Ascend - -export PATH=$ASCEND_HOME/fwkacllib/ccec_compiler/bin:$ASCEND_HOME/fwkacllib/bin:$ASCEND_HOME/toolkit/bin:$PATH - -export LD_LIBRARY_PATH=/usr/local/lib/:/usr/local/fwkacllib/lib64:$ASCEND_HOME/driver/lib64:$ASCEND_HOME/add-ons:/usr/local/Ascend/toolkit/lib64:$LD_LIBRARY_PATH - -export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages - -export PATH=/usr/local/python375/bin:$PATH -export NPU_HOST_LIB=/usr/local/Ascend/acllib/lib64/stub -export ASCEND_OPP_PATH=/usr/local/Ascend/opp -export ASCEND_AICPU_PATH=/usr/local/Ascend -export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH function preprocess_data() { diff --git a/research/cv/LearningToSeeInTheDark/ascend310_infer/src/build.sh b/research/cv/LearningToSeeInTheDark/ascend310_infer/src/build.sh index 3e205ecce78d6a271dc909b78fd1b9e06b72a999..abcb999930ca5d62345b204d7fcfe4e097e8f0bb 100644 --- a/research/cv/LearningToSeeInTheDark/ascend310_infer/src/build.sh +++ b/research/cv/LearningToSeeInTheDark/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/Pix2Pix/ascend310_infer/build.sh b/research/cv/Pix2Pix/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/Pix2Pix/ascend310_infer/build.sh +++ b/research/cv/Pix2Pix/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/SE_ResNeXt50/ascend310_infer/build.sh b/research/cv/SE_ResNeXt50/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/SE_ResNeXt50/ascend310_infer/build.sh +++ b/research/cv/SE_ResNeXt50/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/SE_ResNeXt50/scripts/run_infer_310.sh b/research/cv/SE_ResNeXt50/scripts/run_infer_310.sh index d32e4eda08b1d5ae4289d66d9717e89a8ca36ed6..6d87f25e8f082b65dd97779e41570226fb0e8997 100644 --- a/research/cv/SE_ResNeXt50/scripts/run_infer_310.sh +++ b/research/cv/SE_ResNeXt50/scripts/run_infer_310.sh @@ -70,19 +70,7 @@ else export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages:$ASCEND_HOME/atc/python/site-packages:$PYTHONPATH export ASCEND_OPP_PATH=$ASCEND_HOME/opp fi -export ASCEND_HOME=/usr/local/Ascend -export PATH=$ASCEND_HOME/fwkacllib/ccec_compiler/bin:$ASCEND_HOME/fwkacllib/bin:$ASCEND_HOME/toolkit/bin:$PATH - -export LD_LIBRARY_PATH=/usr/local/lib/:/usr/local/fwkacllib/lib64:$ASCEND_HOME/driver/lib64:$ASCEND_HOME/add-ons:/usr/local/Ascend/toolkit/lib64:$LD_LIBRARY_PATH - -export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages - -export PATH=/usr/local/python375/bin:$PATH -export NPU_HOST_LIB=/usr/local/Ascend/acllib/lib64/stub -export ASCEND_OPP_PATH=/usr/local/Ascend/opp -export ASCEND_AICPU_PATH=/usr/local/Ascend -export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH function preprocess_data() { if [ -d preprocess_Result ]; then diff --git a/research/cv/advanced_east/ascend310_infer/build.sh b/research/cv/advanced_east/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/advanced_east/ascend310_infer/build.sh +++ b/research/cv/advanced_east/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/autoaugment/ascend310_infer/build.sh b/research/cv/autoaugment/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/autoaugment/ascend310_infer/build.sh +++ b/research/cv/autoaugment/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/autoaugment/scripts/run_infer_310.sh b/research/cv/autoaugment/scripts/run_infer_310.sh index 03ef1f13d725e34e56e9510cecd6537f22c47067..dc7c42dc2d2fbc6f475c169ad946e1cf4d277e2f 100644 --- a/research/cv/autoaugment/scripts/run_infer_310.sh +++ b/research/cv/autoaugment/scripts/run_infer_310.sh @@ -62,19 +62,7 @@ else export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages:$ASCEND_HOME/atc/python/site-packages:$PYTHONPATH export ASCEND_OPP_PATH=$ASCEND_HOME/opp fi -export ASCEND_HOME=/usr/local/Ascend -export PATH=$ASCEND_HOME/fwkacllib/ccec_compiler/bin:$ASCEND_HOME/fwkacllib/bin:$ASCEND_HOME/toolkit/bin:$PATH - -export LD_LIBRARY_PATH=/usr/local/lib/:/usr/local/fwkacllib/lib64:$ASCEND_HOME/driver/lib64:$ASCEND_HOME/add-ons:/usr/local/Ascend/toolkit/lib64:$LD_LIBRARY_PATH - -export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages - -export PATH=/usr/local/python375/bin:$PATH -export NPU_HOST_LIB=/usr/local/Ascend/acllib/lib64/stub -export ASCEND_OPP_PATH=/usr/local/Ascend/opp -export ASCEND_AICPU_PATH=/usr/local/Ascend -export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH function preprocess_data() { if [ -d preprocess_Result ]; then diff --git a/research/cv/centernet_det/ascend310_infer/build.sh b/research/cv/centernet_det/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/centernet_det/ascend310_infer/build.sh +++ b/research/cv/centernet_det/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/centernet_resnet101/ascend310_infer/build.sh b/research/cv/centernet_resnet101/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/centernet_resnet101/ascend310_infer/build.sh +++ b/research/cv/centernet_resnet101/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/fishnet99/ascend310_infer/src/build.sh b/research/cv/fishnet99/ascend310_infer/src/build.sh index 7fac9cff3a98c83bce7e8f66053fab2ecebab86d..724c787b3646000019ded20c52854b2039cf295b 100644 --- a/research/cv/fishnet99/ascend310_infer/src/build.sh +++ b/research/cv/fishnet99/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make \ No newline at end of file diff --git a/research/cv/ghostnet/ascend310_infer/src/build.sh b/research/cv/ghostnet/ascend310_infer/src/build.sh index 2e25c8650d0b9e4640ea19f7083b6b6ab20f0028..580828e1cd2240bc4ac6178d60a628e2ff931dd3 100644 --- a/research/cv/ghostnet/ascend310_infer/src/build.sh +++ b/research/cv/ghostnet/ascend310_infer/src/build.sh @@ -15,5 +15,5 @@ # ============================================================================ # shellcheck disable=SC2006 -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/hardnet/ascend310_infer/build.sh b/research/cv/hardnet/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/hardnet/ascend310_infer/build.sh +++ b/research/cv/hardnet/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/hardnet/scripts/run_infer_310.sh b/research/cv/hardnet/scripts/run_infer_310.sh index acf73c1fcd99ef81036e3fbbcce00e75536e1412..5a2199cc87a39d8411d8c35717f127b331ceda03 100644 --- a/research/cv/hardnet/scripts/run_infer_310.sh +++ b/research/cv/hardnet/scripts/run_infer_310.sh @@ -55,15 +55,7 @@ else export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages:$ASCEND_HOME/atc/python/site-packages:$PYTHONPATH export ASCEND_OPP_PATH=$ASCEND_HOME/opp fi -export ASCEND_HOME=/usr/local/Ascend -export PATH=$ASCEND_HOME/fwkacllib/ccec_compiler/bin:$ASCEND_HOME/fwkacllib/bin:$ASCEND_HOME/toolkit/bin:$PATH -export LD_LIBRARY_PATH=/usr/local/lib/:/usr/local/fwkacllib/lib64:$ASCEND_HOME/driver/lib64:$ASCEND_HOME/add-ons:/usr/local/Ascend/toolkit/lib64:$LD_LIBRARY_PATH -export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages -export PATH=/usr/local/python375/bin:$PATH -export NPU_HOST_LIB=/usr/local/Ascend/acllib/lib64/stub -export ASCEND_OPP_PATH=/usr/local/Ascend/opp -export ASCEND_AICPU_PATH=/usr/local/Ascend -export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH + function preprocess_data() { if [ -d preprocess_Result ]; then diff --git a/research/cv/inception_resnet_v2/ascend310_infer/build.sh b/research/cv/inception_resnet_v2/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/inception_resnet_v2/ascend310_infer/build.sh +++ b/research/cv/inception_resnet_v2/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/metric_learn/ascend310_infer/src/build.sh b/research/cv/metric_learn/ascend310_infer/src/build.sh index 7fac9cff3a98c83bce7e8f66053fab2ecebab86d..724c787b3646000019ded20c52854b2039cf295b 100644 --- a/research/cv/metric_learn/ascend310_infer/src/build.sh +++ b/research/cv/metric_learn/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make \ No newline at end of file diff --git a/research/cv/mnasnet/ascend310_infer/build.sh b/research/cv/mnasnet/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/mnasnet/ascend310_infer/build.sh +++ b/research/cv/mnasnet/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/resnet50_bam/ascend310_infer/src/build.sh b/research/cv/resnet50_bam/ascend310_infer/src/build.sh index 7fac9cff3a98c83bce7e8f66053fab2ecebab86d..724c787b3646000019ded20c52854b2039cf295b 100644 --- a/research/cv/resnet50_bam/ascend310_infer/src/build.sh +++ b/research/cv/resnet50_bam/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make \ No newline at end of file diff --git a/research/cv/resnetv2/ascend310_infer/build.sh b/research/cv/resnetv2/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/resnetv2/ascend310_infer/build.sh +++ b/research/cv/resnetv2/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/retinaface/ascend310_infer/build.sh b/research/cv/retinaface/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/retinaface/ascend310_infer/build.sh +++ b/research/cv/retinaface/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/retinaface/scripts/run_infer_310.sh b/research/cv/retinaface/scripts/run_infer_310.sh index 93ed51b084fc9bde39c09bd92b7419f7069dc5bc..1b38ef9208213a3047aa396ac2fcf4e3cc88966c 100644 --- a/research/cv/retinaface/scripts/run_infer_310.sh +++ b/research/cv/retinaface/scripts/run_infer_310.sh @@ -55,20 +55,6 @@ else export ASCEND_OPP_PATH=$ASCEND_HOME/opp fi -export ASCEND_HOME=/usr/local/Ascend - -export PATH=$ASCEND_HOME/fwkacllib/ccec_compiler/bin:$ASCEND_HOME/fwkacllib/bin:$ASCEND_HOME/toolkit/bin:$PATH - -export LD_LIBRARY_PATH=/usr/local/lib/:/usr/local/fwkacllib/lib64:$ASCEND_HOME/driver/lib64:$ASCEND_HOME/add-ons:/usr/local/Ascend/toolkit/lib64:$LD_LIBRARY_PATH - -export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages - -export PATH=/usr/local/python375/bin:$PATH -export NPU_HOST_LIB=/usr/local/Ascend/acllib/lib64/stub -export ASCEND_OPP_PATH=/usr/local/Ascend/opp -export ASCEND_AICPU_PATH=/usr/local/Ascend -export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH - function preprocess_data() { if [ -d preprocess_Result ]; then diff --git a/research/cv/single_path_nas/ascend310_infer/src/build.sh b/research/cv/single_path_nas/ascend310_infer/src/build.sh index 7fac9cff3a98c83bce7e8f66053fab2ecebab86d..724c787b3646000019ded20c52854b2039cf295b 100644 --- a/research/cv/single_path_nas/ascend310_infer/src/build.sh +++ b/research/cv/single_path_nas/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make \ No newline at end of file diff --git a/research/cv/squeezenet1_1/ascend310_infer/build.sh b/research/cv/squeezenet1_1/ascend310_infer/build.sh index 3e205ecce78d6a271dc909b78fd1b9e06b72a999..abcb999930ca5d62345b204d7fcfe4e097e8f0bb 100644 --- a/research/cv/squeezenet1_1/ascend310_infer/build.sh +++ b/research/cv/squeezenet1_1/ascend310_infer/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/ssd_mobilenetV2/ascend310_infer/build.sh b/research/cv/ssd_mobilenetV2/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/ssd_mobilenetV2/ascend310_infer/build.sh +++ b/research/cv/ssd_mobilenetV2/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/ssd_mobilenetV2_FPNlite/ascend310_infer/build.sh b/research/cv/ssd_mobilenetV2_FPNlite/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/ssd_mobilenetV2_FPNlite/ascend310_infer/build.sh +++ b/research/cv/ssd_mobilenetV2_FPNlite/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/ssd_resnet50/ascend310_infer/build.sh b/research/cv/ssd_resnet50/ascend310_infer/build.sh index 68255919420d6270a91677f9052af77434187068..f7594032591a65d6c70e484b302da1bf542b524b 100644 --- a/research/cv/ssd_resnet50/ascend310_infer/build.sh +++ b/research/cv/ssd_resnet50/ascend310_infer/build.sh @@ -24,5 +24,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/stgcn/ascend310_infer/build.sh b/research/cv/stgcn/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/stgcn/ascend310_infer/build.sh +++ b/research/cv/stgcn/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/vgg19/ascend310_infer/build.sh b/research/cv/vgg19/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/vgg19/ascend310_infer/build.sh +++ b/research/cv/vgg19/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/wgan/ascend310_infer/build.sh b/research/cv/wgan/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/wgan/ascend310_infer/build.sh +++ b/research/cv/wgan/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/cv/wideresnet/ascend310_infer/src/build.sh b/research/cv/wideresnet/ascend310_infer/src/build.sh index 7fac9cff3a98c83bce7e8f66053fab2ecebab86d..724c787b3646000019ded20c52854b2039cf295b 100644 --- a/research/cv/wideresnet/ascend310_infer/src/build.sh +++ b/research/cv/wideresnet/ascend310_infer/src/build.sh @@ -14,5 +14,5 @@ # limitations under the License. # ============================================================================ -cmake . -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" +cmake . -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make \ No newline at end of file diff --git a/research/cv/yolov3_tiny/ascend310_infer/build.sh b/research/cv/yolov3_tiny/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/cv/yolov3_tiny/ascend310_infer/build.sh +++ b/research/cv/yolov3_tiny/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/nlp/dscnn/ascend310_infer/build.sh b/research/nlp/dscnn/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/nlp/dscnn/ascend310_infer/build.sh +++ b/research/nlp/dscnn/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/nlp/ktnet/ascend310_infer/build.sh b/research/nlp/ktnet/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/nlp/ktnet/ascend310_infer/build.sh +++ b/research/nlp/ktnet/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/nlp/senta/ascend310_infer/build.sh b/research/nlp/senta/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/nlp/senta/ascend310_infer/build.sh +++ b/research/nlp/senta/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/nlp/textrcnn/ascend310_infer/build.sh b/research/nlp/textrcnn/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/nlp/textrcnn/ascend310_infer/build.sh +++ b/research/nlp/textrcnn/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/recommend/Fat-DeepFFM/ascend310/build.sh b/research/recommend/Fat-DeepFFM/ascend310/build.sh index 817a8059574b0405f18a7864df5c56b4b49513a3..abe392474b5422c8cb9245a9282f246db7ed4845 100644 --- a/research/recommend/Fat-DeepFFM/ascend310/build.sh +++ b/research/recommend/Fat-DeepFFM/ascend310/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/research/recommend/autodis/ascend310_infer/build.sh b/research/recommend/autodis/ascend310_infer/build.sh index 285514e19f2a1878a7bf8f0eed3c99fbc73868c4..713d7f657ddfa5f75b069351c55f8447f77c72d0 100644 --- a/research/recommend/autodis/ascend310_infer/build.sh +++ b/research/recommend/autodis/ascend310_infer/build.sh @@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then fi cmake .. \ - -DMINDSPORE_PATH="`pip3.7 show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" + -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make