Skip to content

Make ICX enabled again #1030

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

Merged
merged 3 commits into from
Jan 10, 2025
Merged

Make ICX enabled again #1030

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
da8cfb8
Revert "Disable temporarily failing CI job with ICX compiler"
lukaszstolarczuk Nov 6, 2024
e94647d
Change linking to static for ICX Intel libraries
KFilipek Jan 7, 2025
e349520
Remove all Intel libs from main library
KFilipek Jan 9, 2025
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
21 changes: 10 additions & 11 deletions .github/workflows/reusable_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ jobs:
disable_hwloc: 'OFF'
link_hwloc_statically: 'OFF'
# test icx compiler
# - os: 'ubuntu-22.04'
# build_type: Release
# compiler: {c: icx, cxx: icpx}
# shared_library: 'ON'
# level_zero_provider: 'ON'
# cuda_provider: 'ON'
# install_tbb: 'ON'
# disable_hwloc: 'OFF'
# link_hwloc_statically: 'OFF'
- os: 'ubuntu-22.04'
build_type: Release
compiler: {c: icx, cxx: icpx}
shared_library: 'ON'
level_zero_provider: 'ON'
cuda_provider: 'ON'
install_tbb: 'ON'
disable_hwloc: 'OFF'
link_hwloc_statically: 'OFF'
# test without installing TBB
- os: 'ubuntu-22.04'
build_type: Release
Expand Down Expand Up @@ -182,8 +182,7 @@ jobs:
- name: Run tests
working-directory: ${{env.BUILD_DIR}}
run: |
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
ctest --output-on-failure # run all tests for better coverage
LD_LIBRARY_PATH=${{env.BUILD_DIR}}/lib/ ctest --output-on-failure # run all tests for better coverage

- name: Check coverage
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/reusable_sanitizers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ jobs:
ASAN_OPTIONS: allocator_may_return_null=1
TSAN_OPTIONS: allocator_may_return_null=1
run: |
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
ctest --output-on-failure

windows-build:
Expand Down
5 changes: 4 additions & 1 deletion cmake/helpers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2023-2024 Intel Corporation
# Copyright (C) 2023-2025 Intel Corporation
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

Expand Down Expand Up @@ -378,6 +378,9 @@ function(add_umf_library)
elseif(LINUX)
target_link_options(${ARG_NAME} PRIVATE
"-Wl,--version-script=${ARG_LINUX_MAP_FILE}")
if(CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM")
target_link_options(${ARG_NAME} PRIVATE -no-intel-lib)
endif()
endif()
endif()

Expand Down
8 changes: 7 additions & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
# Copyright (C) 2022-2024 Intel Corporation
# Copyright (C) 2022-2025 Intel Corporation
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED YES)

if(CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM")
# Compiler dependencies needs to be in library path or to be linked
# statically
add_link_options(-static-intel)
endif()

include(FetchContent)
FetchContent_Declare(
googletest
Expand Down
Loading