From 6488df718b081deea898b37338d9d0064788afe5 Mon Sep 17 00:00:00 2001
From: David Williams-Young <dbwy@lbl.gov>
Date: Mon, 29 Apr 2024 12:32:49 -0700
Subject: [PATCH] [CI] Fix Intel MKL APT bindings to OneAPI path, update env
 vars in cmake.yml

---
 .github/workflows/cmake.yml       |  6 +++---
 .github/workflows/linalg/Makefile | 18 +++++-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index fd0d508..33781ab 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -34,8 +34,8 @@ jobs:
           - linalg_lib: netlib
             thread: tbb
     env:
-      MKLROOT: /opt/intel/mkl
-      TBBROOT: /opt/intel/compilers_and_libraries_2020.4.304/linux/tbb 
+      MKLROOT: /opt/intel/oneapi/mkl/latest
+      TBBROOT: /opt/intel/oneapi/tbb/latest
       TBB_IGNORE_HEADERS: TRUE
       CMAKE_PREFIX_PATH: '/home/software/install/${{matrix.linalg_lib}}-${{matrix.int_interface}}-${{matrix.thread}};/home/software/install/netlib-lp64-sequential'
 
@@ -232,7 +232,7 @@ jobs:
   check-kitware-compatability:
     runs-on: ubuntu-22.04
     env:
-      MKLROOT: /opt/intel/mkl
+      MKLROOT: /opt/intel/oneapi/mkl/latest
       CMAKE_PREFIX_PATH: '/home/software/install/blis-lp64-sequential;/home/software/install/netlib-lp64-sequential'
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/linalg/Makefile b/.github/workflows/linalg/Makefile
index 4836b3d..f9ea5d6 100644
--- a/.github/workflows/linalg/Makefile
+++ b/.github/workflows/linalg/Makefile
@@ -9,9 +9,6 @@ export DEBIAN_FRONTEND=noninteractive
 ubuntu_release = $(shell lsb_release -sr)
 
 
-intel_mkl_version ?= 2020.4-304
-intel_mkl := intel-mkl-\*-${intel_mkl_version}
-
 install/main:
 	apt-get update
 	apt-get -yq install \
@@ -72,18 +69,13 @@ install/openmpi:
 
 # Intel
 apt-add-repository/intel-mkl:
-	wget -O - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB | apt-key add -
-	apt-add-repository "deb https://apt.repos.intel.com/mkl all main"
-	apt-get -yq update
-
-download/intel-mkl:
-	apt-get install -yq --download-only ${intel_mkl}
+	apt install -y build-essential wget make gpg
+	wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
+	echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list	
+	apt update
 
 install/intel-mkl:
-	apt-get -yq install ${intel_mkl}
-	rm -rf /opt/intel/mkl
-	ln -s /opt/intel/compilers_and_libraries_$(subst -,.,${intel_mkl_version})/linux/mkl /opt/intel/mkl
-	test -x /opt/intel/mkl/bin/mklvars.sh
+	apt -y install intel-oneapi-mkl-core intel-oneapi-mkl-core-devel 
 
 install/intel-mkl/lp64-sequential:  install/intel-mkl
 install/intel-mkl/lp64-openmp:  install/intel-mkl