Permalink
Browse files
Resolve Python related MKL env conflict (#1332)
* Avoid overriding user configured OpenMP env.
- Loading branch information...
Showing
with
74 additions
and
11 deletions.
-
+22
−3
pyzoo/dev/prepare_env.sh
-
+26
−4
scripts/jupyter-with-zoo.sh
-
+26
−4
scripts/pyspark-with-zoo.sh
|
|
@@ -38,7 +38,26 @@ echo "ANALYTICS_ZOO_CLASSPATH": $ANALYTICS_ZOO_CLASSPATH |
|
|
|
export BIGDL_CLASSPATH=$ANALYTICS_ZOO_CLASSPATH |
|
|
|
echo "BIGDL_CLASSPATH": $BIGDL_CLASSPATH |
|
|
|
|
|
|
|
export KMP_BLOCKTIME=0 |
|
|
|
export KMP_AFFINITY=granularity=fine,verbose,compact,1,0 |
|
|
|
if [ -z "${KMP_AFFINITY}" ]; then |
|
|
|
export KMP_AFFINITY=granularity=fine,compact,1,0 |
|
|
|
fi |
|
|
|
|
|
|
|
if [ -z "${OMP_NUM_THREADS}" ]; then |
|
|
|
if [ -z "${ZOO_NUM_MKLTHREADS}" ]; then |
|
|
|
export OMP_NUM_THREADS=1 |
|
|
|
else |
|
|
|
if [ `echo $ZOO_NUM_MKLTHREADS | tr '[A-Z]' '[a-z]'` == "all" ]; then |
|
|
|
export OMP_NUM_THREADS=`nproc` |
|
|
|
else |
|
|
|
export OMP_NUM_THREADS=${ZOO_NUM_MKLTHREADS} |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
if [ -z "${KMP_BLOCKTIME}" ]; then |
|
|
|
export KMP_BLOCKTIME=0 |
|
|
|
fi |
|
|
|
|
|
|
|
# verbose for OpenMP |
|
|
|
export KMP_SETTINGS=1 |
|
|
|
export OMP_NUM_THREADS=1 |
|
|
|
export KMP_AFFINITY=${KMP_AFFINITY},verbose |
|
|
@@ -18,10 +18,32 @@ export ANALYTICS_ZOO_JAR=`find ${ANALYTICS_ZOO_HOME}/lib -type f -name "analytic |
|
|
|
export ANALYTICS_ZOO_PY_ZIP=`find ${ANALYTICS_ZOO_HOME}/lib -type f -name "analytics-zoo*python-api.zip"` |
|
|
|
export ANALYTICS_ZOO_CONF=${ANALYTICS_ZOO_HOME}/conf/spark-analytics-zoo.conf |
|
|
|
export PYTHONPATH=${ANALYTICS_ZOO_PY_ZIP}:${PYTHONPATH} |
|
|
|
export KMP_BLOCKTIME=0 |
|
|
|
export KMP_AFFINITY=granularity=fine,verbose,compact,1,0 |
|
|
|
export KMP_SETTINGS=1 |
|
|
|
export OMP_NUM_THREADS=1 |
|
|
|
|
|
|
|
if [ -z "${KMP_AFFINITY}" ]; then |
|
|
|
export KMP_AFFINITY=granularity=fine,compact,1,0 |
|
|
|
fi |
|
|
|
|
|
|
|
if [ -z "${OMP_NUM_THREADS}" ]; then |
|
|
|
if [ -z "${ZOO_NUM_MKLTHREADS}" ]; then |
|
|
|
export OMP_NUM_THREADS=1 |
|
|
|
else |
|
|
|
if [ `echo $ZOO_NUM_MKLTHREADS | tr '[A-Z]' '[a-z]'` == "all" ]; then |
|
|
|
export OMP_NUM_THREADS=`nproc` |
|
|
|
else |
|
|
|
export OMP_NUM_THREADS=${ZOO_NUM_MKLTHREADS} |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
if [ -z "${KMP_BLOCKTIME}" ]; then |
|
|
|
export KMP_BLOCKTIME=0 |
|
|
|
fi |
|
|
|
|
|
|
|
# verbose for OpenMP |
|
|
|
if [[ $* == *"verbose"* ]]; then |
|
|
|
export KMP_SETTINGS=1 |
|
|
|
export KMP_AFFINITY=${KMP_AFFINITY},verbose |
|
|
|
fi |
|
|
|
|
|
|
|
# Check files |
|
|
|
if [ ! -f ${ANALYTICS_ZOO_CONF} ]; then |
|
|
|
|
|
@@ -16,10 +16,32 @@ export ANALYTICS_ZOO_JAR=`find ${ANALYTICS_ZOO_HOME}/lib -type f -name "analytic |
|
|
|
export ANALYTICS_ZOO_PY_ZIP=`find ${ANALYTICS_ZOO_HOME}/lib -type f -name "analytics-zoo*python-api.zip"` |
|
|
|
export ANALYTICS_ZOO_CONF=${ANALYTICS_ZOO_HOME}/conf/spark-analytics-zoo.conf |
|
|
|
export PYTHONPATH=${ANALYTICS_ZOO_PY_ZIP}:${PYTHONPATH} |
|
|
|
export KMP_BLOCKTIME=0 |
|
|
|
export KMP_AFFINITY=granularity=fine,verbose,compact,1,0 |
|
|
|
export KMP_SETTINGS=1 |
|
|
|
export OMP_NUM_THREADS=1 |
|
|
|
|
|
|
|
if [ -z "${KMP_AFFINITY}" ]; then |
|
|
|
export KMP_AFFINITY=granularity=fine,compact,1,0 |
|
|
|
fi |
|
|
|
|
|
|
|
if [ -z "${OMP_NUM_THREADS}" ]; then |
|
|
|
if [ -z "${ZOO_NUM_MKLTHREADS}" ]; then |
|
|
|
export OMP_NUM_THREADS=1 |
|
|
|
else |
|
|
|
if [ `echo $ZOO_NUM_MKLTHREADS | tr '[A-Z]' '[a-z]'` == "all" ]; then |
|
|
|
export OMP_NUM_THREADS=`nproc` |
|
|
|
else |
|
|
|
export OMP_NUM_THREADS=${ZOO_NUM_MKLTHREADS} |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
if [ -z "${KMP_BLOCKTIME}" ]; then |
|
|
|
export KMP_BLOCKTIME=0 |
|
|
|
fi |
|
|
|
|
|
|
|
# verbose for OpenMP |
|
|
|
if [[ $* == *"verbose"* ]]; then |
|
|
|
export KMP_SETTINGS=1 |
|
|
|
export KMP_AFFINITY=${KMP_AFFINITY},verbose |
|
|
|
fi |
|
|
|
|
|
|
|
# Check files |
|
|
|
if [ ! -f ${ANALYTICS_ZOO_CONF} ]; then |
|
|
|
0 comments on commit
07e24e4