Skip to content
Snippets Groups Projects
Commit 678f9504 authored by yuzhenhua's avatar yuzhenhua
Browse files

fix pip version and opp path issue

parent 5d680791
No related branches found
No related tags found
No related merge requests found
Showing
with 17 additions and 61 deletions
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -70,19 +70,7 @@ else ...@@ -70,19 +70,7 @@ else
export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages:$ASCEND_HOME/atc/python/site-packages:$PYTHONPATH export PYTHONPATH=$ASCEND_HOME/fwkacllib/python/site-packages:$ASCEND_HOME/atc/python/site-packages:$PYTHONPATH
export ASCEND_OPP_PATH=$ASCEND_HOME/opp export ASCEND_OPP_PATH=$ASCEND_HOME/opp
fi 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() function preprocess_data()
{ {
if [ -d preprocess_Result ]; then if [ -d preprocess_Result ]; then
......
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -55,20 +55,6 @@ else ...@@ -55,20 +55,6 @@ else
export ASCEND_OPP_PATH=$ASCEND_HOME/opp export ASCEND_OPP_PATH=$ASCEND_HOME/opp
fi 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() function preprocess_data()
{ {
if [ -d preprocess_Result ]; then if [ -d preprocess_Result ]; then
......
...@@ -25,6 +25,6 @@ if [ -f "Makefile" ]; then ...@@ -25,6 +25,6 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
...@@ -71,24 +71,6 @@ else ...@@ -71,24 +71,6 @@ else
export ASCEND_OPP_PATH=$ASCEND_HOME/opp export ASCEND_OPP_PATH=$ASCEND_HOME/opp
fi 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() function preprocess_data()
{ {
if [ -d preprocess_Result ]; then if [ -d preprocess_Result ]; then
......
...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then ...@@ -25,5 +25,5 @@ if [ -f "Makefile" ]; then
fi fi
cmake .. \ 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 make
\ No newline at end of file
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
# limitations under the License. # 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 make
\ No newline at end of file
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
# limitations under the License. # 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 make
\ No newline at end of file
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
# limitations under the License. # 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 make
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment