Harden conda install check

Author: prigoyal

.jenkins/build.sh

@@ -9,27 +9,27 @@ source /etc/lsb-release
 # condition: if any and non-conda, simply build TC from scratch
 
 if [[ "$DISTRIB_RELEASE" == 14.04 ]]; then
-  if which conda &> /dev/null; then
+  if [[ $(conda --version | wc -c) -ne 0 ]]; then
     echo "Building TC in conda env"
     source activate
     conda install -y -c pytorch pytorch
     conda install -y pyyaml
-    WITH_PYTHON_C2=OFF CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all
+    WITH_PYTHON_C2=OFF CORES=$(nproc) CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all
   else
     echo "Building TC in non-conda env"
-    WITH_PYTHON_C2=OFF CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all
+    WITH_PYTHON_C2=OFF CORES=$(nproc) CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all
   fi
 fi
 
 if [[ "$DISTRIB_RELEASE" == 16.04 ]]; then
-  if which conda &> /dev/null; then
+  if [[ $(conda --version | wc -c) -ne 0 ]]; then
     echo "Building TC in conda env"
     source activate
     conda install -y pytorch cuda90 -c pytorch
     conda install -y pyyaml
-    WITH_PYTHON_C2=OFF CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all
+    WITH_PYTHON_C2=OFF CORES=$(nproc) CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all
   else
     echo "Building TC in non-conda env"
-    WITH_PYTHON_C2=OFF CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all
+    WITH_PYTHON_C2=OFF CORES=$(nproc) CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all
   fi
 fi

.jenkins/run_test.sh

@@ -11,15 +11,15 @@ source /etc/lsb-release
 if [[ "$DISTRIB_RELEASE" == 14.04 ]]; then
   echo "Running TC backend tests"
   ./test.sh
-  if which conda &> /dev/null; then
+  if [[ $(conda --version | wc -c) -ne 0 ]]; then
     source activate
     echo "Running TC PyTorch tests"
     ./test_python/run_test.sh
   fi
 fi
 
 if [[ "$DISTRIB_RELEASE" == 16.04 ]]; then
-  if which conda &> /dev/null; then
+  if [[ $(conda --version | wc -c) -ne 0 ]]; then
     echo "Running TC PyTorch tests"
     source activate
     ./test_python/run_test.sh

build.sh

@@ -327,7 +327,7 @@ function install_tc_python() {
       export PYTHONPATH=${TC_DIR}/build/tensor_comprehensions/pybinds:${PYTHONPATH}
       echo "PYTHONPATH: ${PYTHONPATH}"
     else
-      if which conda &> /dev/null; then
+      if [[ $(conda --version | wc -c) -ne 0 ]]; then
           echo "Found conda, going to install Python packages"
           cd ${TC_DIR}
           export CONDA_PYTHON=$(which python3)