From 96fa583e88c64374e2f712149916638c3e219ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Fri, 7 Feb 2025 13:51:31 +0100 Subject: [PATCH 1/2] Don't set 'no-intel-lib' for icx, it breaks compiler's build Partially reverts changes from: https://github.com/oneapi-src/unified-memory-framework/pull/1030 --- cmake/helpers.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake index d6f12031d6..02aaf5c71e 100644 --- a/cmake/helpers.cmake +++ b/cmake/helpers.cmake @@ -378,9 +378,6 @@ 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() From 9ff9452dff66da5bdf478523d4253ba3d0a9f35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Fri, 7 Feb 2025 14:00:00 +0100 Subject: [PATCH 2/2] [CI] Fix icx build when 'no-intel-lib' is removed --- .github/workflows/reusable_basic.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable_basic.yml b/.github/workflows/reusable_basic.yml index 22bf0ea505..d4d583bfd7 100644 --- a/.github/workflows/reusable_basic.yml +++ b/.github/workflows/reusable_basic.yml @@ -179,7 +179,8 @@ jobs: - name: Run tests working-directory: ${{env.BUILD_DIR}} run: | - LD_LIBRARY_PATH=${{env.BUILD_DIR}}/lib/ ctest --output-on-failure # run all tests for better coverage + ${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }} + LD_LIBRARY_PATH="${{env.BUILD_DIR}}/lib/:${LD_LIBRARY_PATH}" ctest --output-on-failure - name: Check coverage if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}