Skip to content

Update Windows version used by GitHub CI #1841

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

Merged
merged 5 commits into from
Jun 3, 2025
Merged
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
8 changes: 4 additions & 4 deletions .github/workflows/check-mkl-interfaces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ jobs:
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
python: ['3.12']
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
os: [ubuntu-22.04] # windows-2022 - no DFT support for Windows in oneMKL

runs-on: ${{ matrix.os }}

defaults:
run:
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}

steps:
- name: Checkout DPNP repo
Expand Down Expand Up @@ -158,13 +158,13 @@ jobs:
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
python: ['3.12']
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
os: [ubuntu-22.04] # windows-2022 - no DFT support for Windows in oneMKL

runs-on: ${{ matrix.os }}

defaults:
run:
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}

env:
onemkl-source-dir: '${{ github.workspace }}/onemkl/'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/conda-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
python: ['3.9', '3.10', '3.11', '3.12']
os: [ubuntu-22.04, windows-2019]
os: [ubuntu-22.04, windows-2022]

permissions:
# Needed to cancel any previous runs that are not completed for a given workflow
Expand All @@ -44,7 +44,7 @@ jobs:

defaults:
run:
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}

env:
build-conda-pkg-env: 'environments/build_conda_pkg.yml'
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
matrix:
# python 3.13 is blocked due to MKL issue
python: ['3.9', '3.10', '3.11', '3.12']
os: [windows-2019]
os: [windows-2022]

env:
dpnp-repo-path: '${{ github.workspace }}\source'
Expand Down Expand Up @@ -422,13 +422,13 @@ jobs:
matrix:
# python 3.13 is blocked due to MKL issue
python: ['3.9', '3.10', '3.11', '3.12']
os: [ubuntu-22.04, windows-2019]
os: [ubuntu-22.04, windows-2022]

runs-on: ${{ matrix.os }}

defaults:
run:
shell: ${{ matrix.os == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
shell: ${{ matrix.os == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}

env:
upload-conda-pkg-env: 'environments/upload_cleanup_conda_pkg.yml'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/cron-run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

defaults:
run:
shell: ${{ matrix.runner == 'windows-2019' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
shell: ${{ matrix.runner == 'windows-2022' && 'cmd /C CALL {0}' || 'bash -el {0}' }}

permissions:
# Needed to cancel any previous runs that are not completed for a given workflow
Expand All @@ -41,7 +41,7 @@ jobs:
# python 3.13 is blocked since BLAS requires "mkl<2025.0" (see https://github.com/conda-forge/blas-feedstock/pull/128
# which depends on resolving MKL issue https://github.com/conda-forge/intel_repack-feedstock/issues/83)
python: ['3.9', '3.10', '3.11', '3.12']
runner: [ubuntu-22.04, ubuntu-24.04, windows-2019]
runner: [ubuntu-22.04, ubuntu-24.04, windows-2022]

steps:
- name: Cancel Previous Runs
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
run: mamba list

- name: Activate OCL CPU RT
if: matrix.runner == 'windows-2019'
if: matrix.runner == 'windows-2022'
shell: pwsh
run: |
$script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
Expand All @@ -125,7 +125,7 @@ jobs:
SYCL_CACHE_PERSISTENT: 1

- name: ReRun tests on Linux
if: steps.run_tests.outcome == 'failure' && matrix.runner != 'windows-2019'
if: steps.run_tests.outcome == 'failure' && matrix.runner != 'windows-2022'
id: run_tests_linux
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
with:
Expand All @@ -142,7 +142,7 @@ jobs:
SYCL_CACHE_PERSISTENT: 1

- name: ReRun tests on Windows
if: steps.run_tests.outcome == 'failure' && matrix.runner == 'windows-2019'
if: steps.run_tests.outcome == 'failure' && matrix.runner == 'windows-2022'
id: run_tests_win
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
with:
Expand Down
18 changes: 17 additions & 1 deletion conda-recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
numpy:
- 1.23
- '1.25'
c_compiler: # [linux]
- gcc # [linux]
cxx_compiler: # [linux]
- gxx # [linux]
cxx_compiler_version: # [linux]
- '14' # [linux]
c_stdlib: # [linux]
- sysroot # [linux]
c_stdlib_version: # [linux]
- '2.28' # [linux]
c_stdlib: # [win]
- vs # [win]
cxx_compiler: # [win]
- vs2022 # [win]
c_compiler: # [win]
- vs2022 # [win]
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ requirements:
- tbb-devel
build:
- {{ compiler('cxx') }}
- {{ stdlib('c') }}
- {{ compiler('dpcpp') }} >={{ required_compiler_and_mkl_version }},<{{ max_compiler_and_mkl_version }}
- sysroot_linux-64 >=2.28 # [linux]
run:
- python
- {{ pin_compatible('dpctl', min_pin='x.x.x', max_pin=None) }}
Expand Down
Loading