Skip to content

Commit f2302b4

Browse files
committed
CI: tweak the ILP64 job
1 parent 48a011e commit f2302b4

1 file changed

Lines changed: 39 additions & 19 deletions

File tree

.github/workflows/linux_mkl_ilp64.yml

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ permissions:
3232

3333
jobs:
3434

35-
mkl:
36-
if: "github.repository == 'rgommers/scipy'"
35+
mkl-lp64:
36+
if: "github.repository == 'ev-br/scipy'"
3737
runs-on: ubuntu-latest
3838
name: "MKL (LP64 split, SDL)"
3939
steps:
@@ -47,24 +47,12 @@ jobs:
4747

4848
- name: Install dependencies
4949
run: |
50-
pip install -r requirements/all.txt
50+
sudo apt-get update
51+
sudo apt-get install -y gfortran
52+
pip install cython numpy pybind11 pythran pytest hypothesis pytest-xdist
53+
pip install -r requirements/dev.txt
5154
pip install git+https://github.com/numpy/meson.git@main-numpymeson
52-
pip install "mkl==2023.2.0" "mkl-devel==2023.2.0"
53-
54-
- name: Repair MKL pkg-config files and symlinks
55-
run: |
56-
# MKL 2023.2 works when installed from conda-forge (except for `-iomp`
57-
# and `-tbb` pkg-config files), Spack, or with the standalone Intel
58-
# installer. The standalone installer is the worst option, since it's
59-
# large and clumsy to install and requires running a setvars.sh script
60-
# before things work. The PyPI MKL packages are broken and need the
61-
# fixes in this step. For details, see
62-
# https://github.com/conda-forge/intel_repack-feedstock/issues/34
63-
cd $Python3_ROOT_DIR/lib/pkgconfig
64-
sed -i 's/\/intel64//g' mkl*.pc
65-
# add the expected .so -> .so.2 symlinks to fix linking
66-
cd ..
67-
for i in $( ls libmkl*.so.2 ); do ln -s $i ${i%.*}; done
55+
pip install mkl mkl-devel
6856
6957
- name: Build with defaults (LP64)
7058
run: |
@@ -86,3 +74,35 @@ jobs:
8674
- name: Test
8775
run: python dev.py test
8876

77+
78+
mkl-ilp64:
79+
if: "github.repository == 'ev-br/scipy'"
80+
runs-on: ubuntu-latest
81+
name: "MKL ILP64"
82+
steps:
83+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
84+
with:
85+
submodules: recursive
86+
fetch-depth: 0
87+
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
88+
with:
89+
python-version: '3.11'
90+
91+
- name: Install dependencies
92+
run: |
93+
sudo apt-get update
94+
sudo apt-get install -y gfortran
95+
pip install cython numpy pybind11 pythran pytest hypothesis pytest-xdist
96+
pip install -r requirements/dev.txt
97+
pip install git+https://github.com/numpy/meson.git@main-numpymeson
98+
pip install mkl mkl-devel
99+
100+
- name: Build with ILP64
101+
run: |
102+
pkg-config --libs mkl-dynamic-ilp64-seq # check link flags
103+
python dev.py build -C-Dblas-order=mkl -C-Duse-ilp64=true
104+
105+
- name: Test
106+
run: python dev.py test -j 2
107+
108+

0 commit comments

Comments
 (0)