Set Intel oneAPI local build to 2026.1.0 - #636
Merged
Merged
Conversation
Contributor
|
Your PR requires formatting changes to meet the project's style guidelines. Click here to view the suggested changes.diff --git a/deps/build_local.jl b/deps/build_local.jl
index 8d64310..2aa6b83 100644
--- a/deps/build_local.jl
+++ b/deps/build_local.jl
@@ -79,11 +79,13 @@ include_dir = joinpath(oneAPI_Level_Zero_Headers_jll.artifact_dir, "include")
# oneAPI installation when one is on PATH (e.g. a site module), which then links against
# that installation's libsycl/oneMKL instead of the Conda toolkit the RPATH points at.
withenv("PATH"=>"$(ENV["PATH"]):$(Conda.bin_dir(conda_dir))",
- "LD_LIBRARY_PATH"=>Conda.lib_dir(conda_dir),
- "LIBRARY_PATH"=>Conda.lib_dir(conda_dir)) do
+ "LD_LIBRARY_PATH" => Conda.lib_dir(conda_dir),
+ "LIBRARY_PATH" => Conda.lib_dir(conda_dir)
+) do
cmake() do cmake_path
ninja() do ninja_path
- run(```$cmake_path -DCMAKE_CXX_COMPILER="$(Conda.bin_dir(conda_dir))/icpx"
+ run(
+ ```$cmake_path -DCMAKE_CXX_COMPILER="$(Conda.bin_dir(conda_dir))/icpx"
-DCMAKE_CXX_FLAGS="-fsycl -isystem $(conda_dir)/include -isystem $include_dir -fdiagnostics-color=always"
-DCMAKE_INSTALL_RPATH=$(Conda.lib_dir(conda_dir))
-DCMAKE_INSTALL_PREFIX=$install_dir
diff --git a/deps/generate_interfaces.jl b/deps/generate_interfaces.jl
index 57df7e7..751f2df 100644
--- a/deps/generate_interfaces.jl
+++ b/deps/generate_interfaces.jl
@@ -87,9 +87,9 @@ function generate_headers(library::String, filename::Vector{String}; pattern::St
# Check if the routine is a template
template = occursin("template", header)
if template
- # oneMKL <= 2025.3 spells the constraint `is_*floating_point<fp> = nullptr`,
- # oneMKL >= 2026.0 spells it `typename = is_*floating_point<fp>`
- header = replace(header, r"template <typename fp, (typename = )?oneapi::mkl::lapack::internal::is_(real_|complex_)?floating_point<fp>( = nullptr)?> *" => "")
+ # oneMKL <= 2025.3 spells the constraint `is_*floating_point<fp> = nullptr`,
+ # oneMKL >= 2026.0 spells it `typename = is_*floating_point<fp>`
+ header = replace(header, r"template <typename fp, (typename = )?oneapi::mkl::lapack::internal::is_(real_|complex_)?floating_point<fp>( = nullptr)?> *" => "")
header = replace(header, "template <typename data_t, oneapi::mkl::lapack::internal::is_floating_point<data_t> = nullptr>" => "")
header = replace(header, "template <typename data_t, oneapi::mkl::lapack::internal::is_real_floating_point<data_t> = nullptr>" => "")
@@ -208,8 +208,8 @@ function generate_headers(library::String, filename::Vector{String}; pattern::St
header = replace(header, " sycl::event" => "sycl::event")
header = replace(header, "* const* " => "**")
header = replace(header, "int64_t**" => "int64_t **")
- # a trailing space after the previous declaration's ';' leaves a leading space here
- header = String(strip(header))
+ # a trailing space after the previous declaration's ';' leaves a leading space here
+ header = String(strip(header))
ind1 = findfirst(' ', header)
ind2 = findfirst('(', header) |
build_local.jl passed a bare `icpx` to CMake, which resolves to a system oneAPI installation when one is on PATH (e.g. a site module). The library was then compiled against the Conda headers but linked against the system libsycl/oneMKL, failing at load time once the two versions differ (undefined symbol sycl::device::device(const device&) with 2026.1.0 headers on top of a 2025.3.1 libsycl.so.8). Use the Conda compiler by absolute path and put the Conda lib directory on LIBRARY_PATH. At run time LD_LIBRARY_PATH wins over the library's RUNPATH, so the site oneAPI module substitutes its libur_adapter_level_zero/libumf (same sonames across releases) underneath the Conda libsycl, which aborts in sycl::platform::get_platforms on a version mismatch. Drop the site oneAPI entries from LD_LIBRARY_PATH in the ALCF test job.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #636 +/- ##
==========================================
+ Coverage 81.53% 81.59% +0.05%
==========================================
Files 50 50
Lines 3607 3607
==========================================
+ Hits 2941 2943 +2
+ Misses 666 664 -2 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Regenerated the C API, which just changed the ordering, and it keeps backward ABI compatibility. The only new build output is a deprecation warning on the four Int32 COO setters, which oneMKL 2026.1 wants replaced by the 64-bit dimension overload.