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.

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

Update to oneMKL 2025 #29

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 7 additions & 10 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ env:

jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read
Expand All @@ -41,20 +40,18 @@ jobs:
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name != 'pull_request'
uses: sigstore/cosign-installer@7e0881f8fe90b25e305bbf0309761e9314607e25
uses: sigstore/cosign-installer@v3.7.0
with:
cosign-release: 'v1.9.0'

cosign-release: "v2.4.1"

# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
uses: docker/setup-buildx-action@v3.7.1

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
uses: docker/login-action@v3.3.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand All @@ -64,15 +61,15 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
uses: docker/metadata-action@v5.5.1
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
uses: docker/build-push-action@v6.9.0
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand All @@ -90,4 +87,4 @@ jobs:
COSIGN_EXPERIMENTAL: "true"
# This step uses the identity token to provision an ephemeral certificate
# against the sigstore community Fulcio instance.
run: echo "${{ steps.meta.outputs.tags }}" | xargs -I {} cosign sign {}@${{ steps.build-and-push.outputs.digest }}
run: echo "${{ steps.meta.outputs.tags }}" | xargs -I {} cosign sign --yes {}@${{ steps.build-and-push.outputs.digest }}
6 changes: 3 additions & 3 deletions .github/workflows/pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
linux:
runs-on: ubuntu-22.04
container:
image: rust:1.63.0
image: rust:1.82.0
steps:
- uses: actions/checkout@v1

Expand Down Expand Up @@ -63,8 +63,8 @@ jobs:
# Create oci-archive
- name: Get MKL using NuGet
run: |
nuget install intelmkl.devel.cluster.win-x64 -Version 2022.0.3.171
nuget install intelmkl.static.cluster.win-x64 -Version 2022.0.3.171
nuget install intelmkl.devel.cluster.win-x64 -Version 2025.0.0.928
nuget install intelmkl.static.cluster.win-x64 -Version 2025.0.0.928
- uses: actions-rs/cargo@v1
with:
command: run
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.72.0
FROM rust:1.82.0

# Setup Intel-MKL
WORKDIR /mkl
Expand All @@ -8,16 +8,15 @@ RUN apt update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

COPY install-mkl.sh silent.cfg /mkl/
COPY install-mkl.sh /mkl/
RUN /mkl/install-mkl.sh

# Setup linker to find shared library
COPY intel-mkl.conf /etc/ld.so.conf.d/
RUN ldconfig

# Setup pkg-config
ENV PKG_CONFIG_PATH /opt/intel/mkl/bin/pkgconfig
RUN sed -i "s/MKLROOT/prefix/g" ${PKG_CONFIG_PATH}/*.pc
ENV PKG_CONFIG_PATH /opt/intel/mkl/latest/lib/pkgconfig

WORKDIR /src
RUN chmod -R a+w /src
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ Usage
- With docker:

```
docker pull ghcr.io/rust-math/rust-mkl:1.62.1-2020.1
docker pull ghcr.io/rust-math/rust-mkl:1.82.0-2025.0
```

- In GitHub Actions:
```
runs-on: ubuntu-latest
container:
image: ghcr.io/rust-math/rust-mkl:1.62.1-2020.1
image: ghcr.io/rust-math/rust-mkl:1.82.0-2025.0
```
See [`jobs.<job_id>.container`](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idcontainer) section of the workflow syntax.

Expand Down
13 changes: 5 additions & 8 deletions install-mkl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ set -eux

SCRIPT_DIR=$(cd $(dirname $0); pwd)

VERSION_YEAR=2020
VERSION_UPDATE=1
VERSION_REV=217
PREFIX=l_mkl_${VERSION_YEAR}.${VERSION_UPDATE}.${VERSION_REV}
VERSION="2025.0.0.940"
PREFIX=intel-onemkl-${VERSION}_offline

curl -sfLO http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16533/${PREFIX}.tgz
tar xf ${PREFIX}.tgz
cd ${PREFIX}
./install.sh -s ${SCRIPT_DIR}/silent.cfg
curl -sfLO http://registrationcenter-download.intel.com/akdlm/IRC_NAS/79153e0f-74d7-45af-b8c2-258941adf58a/${PREFIX}.sh
chmod +x ${PREFIX}.sh
./${PREFIX}.sh -a -s --eula accept --ignore-errors --install-dir /opt/intel
34 changes: 0 additions & 34 deletions silent.cfg

This file was deleted.