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.

Sign up for GitHub

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 2024.2 and conda-forge #33

Merged
merged 3 commits into from
Jul 22, 2024
Merged

Update to 2024.2 and conda-forge #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5abdf69
Update to 2024.2 and conda-forge
ZzEeKkAa Jul 22, 2024
7d089f2
Add compiler
ZzEeKkAa Jul 22, 2024
c093512
Add compiler
ZzEeKkAa Jul 22, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/conda-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
build:
strategy:
matrix:
python: ["3.9", "3.10", "3.11"]
python: ["3.9", "3.10", "3.11", "3.12"]
os: ["ubuntu-latest", "windows-latest"]
runs-on: ${{ matrix.os }}
defaults:
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:

- name: Build conda package
env:
CHANNELS: -c intel -c conda-forge --override-channels
CHANNELS: -c conda-forge --override-channels
run: conda build --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe

- name: Upload artifact
Expand Down
13 changes: 7 additions & 6 deletions conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% set version = "2024.0.0" %}
{% set intel_build_number = "49819" %} # [linux]
{% set intel_build_number = "49840" %} # [win]
{% set version = "2024.2.0" %}
{% set forge_build_number = "981" %} # [linux]
{% set forge_build_number = "978" %} # [win]
{% set target_platform = "linux-64" %} # [linux64]
{% set target_platform = "win-64" %} # [win64]

# use this if our build script changes and we need to increment beyond intel's version
{% set dst_build_number = '0' %}
{% set build_number = intel_build_number|int + dst_build_number|int %}
{% set build_number = forge_build_number|int + dst_build_number|int %}

package:
name: vendored-dpcpp-llvm-spirv
Expand All @@ -33,8 +33,9 @@ outputs:
- WHEELS_OUTPUT_FOLDER
requirements:
build:
- dpcpp_linux-64 =={{ version }}=intel_{{ intel_build_number }} #[linux]
- dpcpp_win-64 =={{ version }}=intel_{{ intel_build_number }} #[win]
- {{ compiler('c') }}
- dpcpp_linux-64 =={{ version }}=*_{{ forge_build_number }} #[linux]
- dpcpp_win-64 =={{ version }}=*_{{ forge_build_number }} #[win]
host:
- python
- setuptools
Expand Down
Loading