Skip to content

Commit

Permalink
Merge pull request #318 from edoapra/oneapi2024
Browse files Browse the repository at this point in the history 
Intel Oneapi 2024 updates:
  • Loading branch information
@edoapra
edoapra authored Nov 23, 2023
2 parents c716434 + 976f896 commit 8bf1026
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 19 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/github_actions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
armci_network: sockets
config_opts: --enable-i4
f77: ifort
cc: icc
cc: icx
oneapi: /opt/intel/oneapi
- os: ubuntu-latest
experimental: true
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
brew install gcc coreutils automake || true
;;
esac
if [[ "$F77" == "ifort" ]] || [[ "$CC" == "icc" ]] ; then ./travis/install-intel.sh; source ${{ matrix.oneapi }}/setvars.sh --force; fi
if [[ "$F77" == "ifort" ]] || [[ "$CC" == "icc" ]] || [[ "$CC" == "icx" ]]; then ./travis/install-intel.sh; source ${{ matrix.oneapi }}/setvars.sh --force; fi
echo F77 is `which "$F77"`
echo F77 compiler version `"$F77" -v`
- name: before_install
Expand All @@ -174,20 +174,21 @@ jobs:
pwd
ls -lart
mkdir -p $GITHUB_WORKSPACE/apps
if [[ "$F77" == "ifort" ]] || [[ "$CC" == "icc" ]] ; then source ${{ matrix.oneapi }}/setvars.sh --force; fi
sh ./travis/install-autotools.sh $GITHUB_WORKSPACE/apps
AUTO_CC="$CC"
if [[ "$F77" == "ifort" ]] || [[ "$CC" == "icc" ]] || [[ "$CC" == "icx" ]]; then source ${{ matrix.oneapi }}/setvars.sh --force; AUTO_CC=cc; fi
CC="$AUTO_CC" sh ./travis/install-autotools.sh $GITHUB_WORKSPACE/apps
- name: install
run: |
export CI_ROOT=$GITHUB_WORKSPACE/apps
if [[ "$F77" == "ifort" ]] || [[ "$CC" == "icc" ]] ; then source ${{ matrix.oneapi }}/setvars.sh --force; fi
if [[ "$F77" == "ifort" ]] || [[ "$CC" == "icc" ]] || [[ "$CC" == "icx" ]]; then source ${{ matrix.oneapi }}/setvars.sh --force; fi
./travis/install-mpi.sh $CI_ROOT $MPI_IMPL
if [[ "$PORT" == "ofi" ]]; then ./travis/install-libfabric.sh $CI_ROOT; else true; fi
if [[ "$PORT" == "armci" ]]; then ./travis/install-armci-mpi.sh $CI_ROOT; else true; fi
if [[ "$USE_SICM" == "Y" ]]; then ./travis/install-sicm.sh $HOME/no_cache; else true; fi
- name: compile and test global arrays
if: ${{ success() }}
run: |
if [[ "$F77" == "ifort" ]] || [[ "$CC" == "icc" ]] ; then source ${{ matrix.oneapi }}/setvars.sh --force; fi
if [[ "$F77" == "ifort" ]] || [[ "$CC" == "icc" ]] || [[ "$CC" == "icx" ]] ; then source ${{ matrix.oneapi }}/setvars.sh --force; fi
./travis/build-run.sh $GITHUB_WORKSPACE/apps $PORT $MPI_IMPL $USE_CMAKE $F77
- name: after_failure
if: ${{ failure() }}
Expand Down
56 changes: 43 additions & 13 deletions travis/install-intel.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ case "$os" in
Darwin)
mkdir -p ~/mntdmg ~/apps/oneapi || true
cd ~/Downloads
dir_base="18342"
dir_hpc="18341"
base="m_BaseKit_p_2022.1.0.92_offline"
hpc="m_HPCKit_p_2022.1.0.86_offline"
curl -LJO https://registrationcenter-download.intel.com/akdlm/irc_nas/"$dir_base"/"$base".dmg
curl -LJO https://registrationcenter-download.intel.com/akdlm/irc_nas/"$dir_hpc"/"$hpc".dmg
dir_base="cd013e6c-49c4-488b-8b86-25df6693a9b7"
dir_hpc="edb4dc2f-266f-47f2-8d56-21bc7764e119"
base="m_BaseKit_p_2023.2.0.49398"
hpc="m_HPCKit_p_2023.2.0.49443"
curl -sS -LJO https://registrationcenter-download.intel.com/akdlm/IRC_NAS/"$dir_base"/"$base".dmg
curl -sS -LJO https://registrationcenter-download.intel.com/akdlm/IRC_NAS/"$dir_hpc"/"$hpc".dmg
echo "installing BaseKit"
hdiutil attach "$base".dmg -mountpoint ~/mntdmg -nobrowse
sudo ~/mntdmg/bootstrapper.app/Contents/MacOS/install.sh --cli --eula accept \
Expand Down Expand Up @@ -62,13 +62,43 @@ case "$os" in
;;
Linux)
export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
&& sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
&& echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list \
&& sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main" \
&& sudo apt-get update \
&& sudo apt-get -y install intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-mkl \
&& sudo apt-get -y install intel-oneapi-mpi-devel
export TERM=dumb
rm -f l_Base*sh l_HP*sh
tries=0 ; until [ "$tries" -ge 10 ] ; do \
dir_base="20f4e6a1-6b0b-4752-b8c1-e5eacba10e01"
dir_hpc="1b2baedd-a757-4a79-8abb-a5bf15adae9a"
base="l_BaseKit_p_2024.0.0.49564"
hpc="l_HPCKit_p_2024.0.0.49589"
wget -nv https://registrationcenter-download.intel.com/akdlm/IRC_NAS/"$dir_hpc"/"$hpc".sh \
&& wget -nv https://registrationcenter-download.intel.com/akdlm/IRC_NAS/"$dir_base"/"$base".sh \
&& break ;\
tries=$((tries+1)) ; echo attempt no. $tries ; sleep 30 ; done
sh ./"$base".sh -a -c -s --action install --components intel.oneapi.lin.mkl.devel --install-dir $IONEAPI_ROOT --eula accept
if [[ "$?" != 0 ]]; then
df -h
echo "base kit install failed: exit code " "${?}"
exit 1
fi
rm -rf $IONEAPI_ROOT/mkl/latest/lib/ia32
rm -rf $IONEAPI_ROOT/mkl/latest/lib/intel64/*sycl*
rm -rf $IONEAPI_ROOT/mkl/latest/lib/intel64/*_pgi_*
rm -rf $IONEAPI_ROOT/mkl/latest/lib/intel64/*_gf_*
intel_components="intel.oneapi.lin.ifort-compiler:intel.oneapi.lin.dpcpp-cpp-compiler"
if [[ "$MPI_IMPL" == "intel" ]]; then
intel_components+=":intel.oneapi.lin.mpi.devel"
fi
sh ./"$hpc".sh -a -c -s --action install \
--components "$intel_components" \
--install-dir $IONEAPI_ROOT --eula accept
if [[ "$?" != 0 ]]; then
df -h
echo "hpc kit install failed: exit code " "${?}"
exit 1
fi
rm -rf $IONEAPI_ROOT/compiler/latest/linux/lib/oclfpga
rm -f ./"$hpc".sh ./"$base".sh
rm -rf $IONEAPI_ROOT/compiler/latest/linux/lib/oclfpga || true

source "$IONEAPI_ROOT"/setvars.sh --force || true
export I_MPI_F90=ifort
export I_MPI_F77=ifort
Expand Down

0 comments on commit 8bf1026

Please sign in to comment.