Skip to content

Commit 4f22b46

Browse files
vtavanavtavana
authored
Merge branch 'master' into bump-version
2 parents b143fd2 + 95e2b7b commit 4f22b46

File tree

7 files changed

+72
-20
lines changed

7 files changed

+72
-20
lines changed

‎.github/workflows/conda-package-cf.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
4747
4848
- name: Cache conda packages
49-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
49+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
5050
env:
5151
CACHE_NUMBER: 0 # Increase to reset cache
5252
with:
@@ -97,7 +97,7 @@ jobs:
9797

9898
steps:
9999
- name: Download artifact
100-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
100+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
101101
with:
102102
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_ver }}
103103

@@ -128,7 +128,7 @@ jobs:
128128
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
129129
130130
- name: Cache conda packages
131-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
131+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
132132
env:
133133
CACHE_NUMBER: 0 # Increase to reset cache
134134
with:
@@ -190,7 +190,7 @@ jobs:
190190
run: conda install -n base conda-build
191191

192192
- name: Cache conda packages
193-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
193+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
194194
env:
195195
CACHE_NUMBER: 3 # Increase to reset cache
196196
with:
@@ -240,7 +240,7 @@ jobs:
240240

241241
steps:
242242
- name: Download artifact
243-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
243+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
244244
with:
245245
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_ver }}
246246

@@ -296,7 +296,7 @@ jobs:
296296
run: Get-Content -Path .\lockfile
297297

298298
- name: Cache conda packages
299-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
299+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
300300
env:
301301
CACHE_NUMBER: 0 # Increase to reset cache
302302
with:

‎.github/workflows/conda-package.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
3737
3838
- name: Cache conda packages
39-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
39+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
4040
env:
4141
CACHE_NUMBER: 0 # Increase to reset cache
4242
with:
@@ -86,7 +86,7 @@ jobs:
8686

8787
steps:
8888
- name: Download artifact
89-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
89+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
9090
with:
9191
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
9292

@@ -126,7 +126,7 @@ jobs:
126126
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
127127
128128
- name: Cache conda packages
129-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
129+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
130130
env:
131131
CACHE_NUMBER: 0 # Increase to reset cache
132132
with:
@@ -140,7 +140,13 @@ jobs:
140140
- name: Install mkl_fft
141141
run: |
142142
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
143-
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest "scipy>=1.10" $CHANNELS
143+
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest $CHANNELS
144+
if [[ "${{ matrix.python }}" != 3.9* ]]; then
145+
# Intel channel only has scipy=1.10 for Python 3.9, which needs mkl<2025
146+
# while scipy needs to install numpy and mkl_random and mkl_random-1.2.11 requires mkl>=2025
147+
# so avoid installing scipy for Python 3.9 which means third_party/scipy tests will not run
148+
conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" $CHANNELS
149+
fi
144150
# Test installed packages
145151
conda list -n ${{ env.TEST_ENV_NAME }}
146152
@@ -180,7 +186,7 @@ jobs:
180186
conda install -n base conda-build
181187
182188
- name: Cache conda packages
183-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
189+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
184190
env:
185191
CACHE_NUMBER: 3 # Increase to reset cache
186192
with:
@@ -229,7 +235,7 @@ jobs:
229235

230236
steps:
231237
- name: Download artifact
232-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
238+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
233239
with:
234240
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
235241

@@ -285,7 +291,7 @@ jobs:
285291
run: Get-Content -Path .\lockfile
286292

287293
- name: Cache conda packages
288-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
294+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
289295
env:
290296
CACHE_NUMBER: 0 # Increase to reset cache
291297
with:
@@ -307,8 +313,11 @@ jobs:
307313
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
308314
SET PACKAGE_VERSION=%%F
309315
)
310-
SET "TEST_DEPENDENCIES=pytest scipy"
316+
SET "TEST_DEPENDENCIES=pytest"
311317
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
318+
if ("${{ matrix.python }}" -ne "3.9") {
319+
conda install -n ${{ env.TEST_ENV_NAME }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
320+
}
312321
313322
- name: Report content of test environment
314323
shell: cmd /C CALL {0}

‎.github/workflows/openssf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ jobs:
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
72+
uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
7373
with:
7474
sarif_file: results.sarif

‎conda-recipe/bld.bat

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
set MKLROOT=%PREFIX%
2-
%PYTHON% -m pip install --no-build-isolation --no-deps .
3-
if errorlevel 1 exit 1
2+
3+
rem Build wheel package
4+
if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
5+
%PYTHON% -m pip wheel --no-build-isolation --no-deps .
6+
if errorlevel 1 exit 1
7+
copy mkl_fft*.whl %WHEELS_OUTPUT_FOLDER%
8+
if errorlevel 1 exit 1
9+
) ELSE (
10+
rem Build conda package
11+
%PYTHON% -m pip install --no-build-isolation --no-deps .
12+
if errorlevel 1 exit 1
13+
)

‎conda-recipe/build.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,17 @@
22

33
export MKLROOT=$PREFIX
44
export CFLAGS="-I$PREFIX/include $CFLAGS"
5-
$PYTHON -m pip install --no-build-isolation --no-deps .
5+
export LDFLAGS="-Wl,-rpath,\$ORIGIN/../.. -Wl,-rpath,\$ORIGIN/../../.. -L${PREFIX}/lib ${LDFLAGS}"
6+
7+
read -r GLIBC_MAJOR GLIBC_MINOR <<<"$(conda list '^sysroot_linux-64$' \
8+
| tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')"
9+
10+
# Build wheel package
11+
if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then
12+
$PYTHON -m pip wheel --no-build-isolation --no-deps .
13+
${PYTHON} -m wheel tags --remove --platform-tag "manylinux_${GLIBC_MAJOR}_${GLIBC_MINOR}_x86_64" mkl_fft*.whl
14+
cp mkl_fft*.whl "${WHEELS_OUTPUT_FOLDER}"
15+
else
16+
# Build conda package
17+
$PYTHON -m pip install --no-build-isolation --no-deps .
18+
fi

‎conda-recipe/conda_build_config.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
c_compiler: # [linux]
2+
- gcc # [linux]
3+
cxx_compiler: # [linux]
4+
- gxx # [linux]
5+
cxx_compiler_version: # [linux]
6+
- '14' # [linux]
7+
c_stdlib: # [linux]
8+
- sysroot # [linux]
9+
c_stdlib_version: # [linux]
10+
- '2.28' # [linux]
11+
c_stdlib: # [win]
12+
- vs # [win]
13+
cxx_compiler: # [win]
14+
- vs2017 # [win]
15+
c_compiler: # [win]
16+
- vs2017 # [win]

‎conda-recipe/meta.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,27 @@ source:
1010

1111
build:
1212
number: {{ buildnumber }}
13+
script_env:
14+
- WHEELS_OUTPUT_FOLDER
1315
ignore_run_exports:
1416
- blas
1517

1618
requirements:
1719
build:
1820
- {{ compiler('c') }}
21+
- {{ stdlib('c') }}
1922
host:
2023
- python
24+
- pip
2125
- setuptools >=77
2226
- mkl-devel
23-
- mkl-devel 2024.2.* # [py==39]
2427
- cython
2528
- numpy-base
29+
- wheel >=0.41.3
2630
run:
2731
- python
2832
- mkl-service
29-
- {{ pin_compatible('numpy') }}
33+
- {{ pin_compatible('numpy-base') }}
3034

3135
test:
3236
commands:

0 commit comments

Comments
 (0)