Source tbb because of the new default threading backend for CPU

arrayfire · Aug 15, 2023 · 0514a5d · 0514a5d
1 parent 2648633
commit 0514a5d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.github/workflows/unix_cpu_build.yml b/.github/workflows/unix_cpu_build.yml
@@ -151,7 +151,7 @@ jobs:
                   sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
                   sudo sh -c 'echo deb https://apt.repos.intel.com/oneapi all main > /etc/apt/sources.list.d/oneAPI.list'
                   sudo apt-get -qq update
-                  sudo apt-get install -y intel-oneapi-mkl-devel
+                  sudo apt-get install -y intel-oneapi-mkl-devel intel-oneapi-tbb-devel
                   if [ "$CC" == 'icx' ]; then sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp; fi
                   echo "MKLROOT=/opt/intel/oneapi/mkl/latest" >> ${GITHUB_ENV}
 
@@ -171,10 +171,10 @@ jobs:
                   branch=$(git rev-parse --abbrev-ref HEAD)
                   buildname=$(if [ -z "$prnum" ]; then echo "$branch"; else echo "PR-$prnum"; fi)
                   dashboard=$(if [ -z "$prnum" ]; then echo "Continuous"; else echo "Experimental"; fi)
-                  backend=$(if [ "$USE_MKL" == 1 ]; then echo "Intel-MKL"; else echo "FFTW/LAPACK/BLAS"; fi)
+                  backend=$(if [ "$USE_MKL" == true ]; then echo "Intel-MKL"; else echo "FFTW/LAPACK/BLAS"; fi)
                   buildname="$buildname-cpu-$BLAS_BACKEND"
                   cmake_rpath=$(if [ $OS_NAME == 'macos-latest' ]; then echo "-DCMAKE_INSTALL_RPATH=/opt/arrayfire/lib"; fi)
-                  if [ "$CC" == 'icx' ]; then source /opt/intel/oneapi/setvars.sh intel64; fi
+                  if [ "$CC" == 'icx' ] || [ "$USE_MKL" == true ]; then source /opt/intel/oneapi/setvars.sh; fi
                   mkdir build && cd build && unset VCPKG_ROOT
                   ${CMAKE_PROGRAM} -G Ninja \
                       -DCMAKE_MAKE_PROGRAM:FILEPATH=${GITHUB_WORKSPACE}/ninja \
@@ -189,7 +189,8 @@ jobs:
             - name: Build and Test
               env:
                   CC: ${{ matrix.compiler }}
+                  USE_MKL: ${{ matrix.blas_backend == 'MKL' }}
               run: |
                   cd ${GITHUB_WORKSPACE}/build
-                  if [ "$CC" == 'icx' ]; then source /opt/intel/oneapi/setvars.sh intel64; fi
+                  if [ "$CC" == 'icx' ] || [ "$USE_MKL" == true ]; then source /opt/intel/oneapi/setvars.sh; fi
                   ctest -D Experimental --track ${CTEST_DASHBOARD} -T Test -T Submit -R cpu -j2