Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MKL in CI Pipeline #17

Merged
merged 3 commits into from
Apr 29, 2024
Merged

Fix MKL in CI Pipeline #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1217491
[CI] Fix Intel MKL APT bindings to OneAPI path, update env vars in cm…
wavefunction91 Apr 29, 2024
4883f7e
Add missing dummy target to Makefile for download/intel-mkl
wavefunction91 Apr 29, 2024
03307da
[CI] Add Intel Cluster to OneAPI packages
wavefunction91 Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -211,7 +211,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
Expand Down
20 changes: 7 additions & 13 deletions .github/workflows/linalg/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -72,18 +69,15 @@ 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 intel-oneapi-mpi intel-oneapi-mpi-devel intel-oneapi-mkl-cluster intel-oneapi-mkl-cluster-devel

download/intel-mkl: apt-add-repository/intel-mkl

install/intel-mkl/lp64-sequential: install/intel-mkl
install/intel-mkl/lp64-openmp: install/intel-mkl
Expand Down
Loading