From 600ed5f264a9980d4c7356e409fc80ce562a4ee0 Mon Sep 17 00:00:00 2001 From: vlad-perevezentsev Date: Mon, 8 May 2023 12:41:35 +0200 Subject: [PATCH 1/4] Update meta.yaml (#1392) * Pin DPC++ 2023.1.0 * Require minimum version of sysroot >= 2.17 --- conda-recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index bef7e00618c0..d03e8741c95d 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -21,7 +21,8 @@ requirements: - scikit-build build: - {{ compiler('cxx') }} - - {{ compiler('dpcpp') }} >=2023.0 # [not osx] + - {{ compiler('dpcpp') }} =2023.1.0 # [not osx] + - sysroot_linux-64 >=2.17 # [linux] run: - python - dpctl >=0.14.2 From f579f82372c23ea2dac756b39bbe2cff00a61146 Mon Sep 17 00:00:00 2001 From: Vladislav Perevezentsev Date: Thu, 11 May 2023 16:13:03 +0200 Subject: [PATCH 2/4] Use current Cmake version for PLATFORM_DIR variable --- conda-recipe/bld.bat | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index 5793f9f5d5e7..0d8e1a3e3ec5 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -29,7 +29,15 @@ FOR %%V IN (14.0.0 14 15.0.0 15 16.0.0 16) DO @( ) ) -set "PLATFORM_DIR=%PREFIX%\Library\share\cmake-3.22\Modules\Platform" +@echo off +for /f "tokens=3" %%a in ('cmake --version ^| find "cmake version"') do set CMAKE_VERSION=%%a +for /f "tokens=1-3 delims=." %%a in ("%CMAKE_VERSION%") do ( + set CMAKE_VERSION_MAJOR=%%a + set CMAKE_VERSION_MINOR=%%b +) +@echo on + +set "PLATFORM_DIR=%PREFIX%\Library\share\cmake-%CMAKE_VERSION_MAJOR%.%CMAKE_VERSION_MINOR%\Modules\Platform" set "FN=Windows-IntelLLVM.cmake" rem Save the original file, and copy patched file to From 6e69ed4b85e63749e60886c01524975afae842e9 Mon Sep 17 00:00:00 2001 From: Vladislav Perevezentsev Date: Thu, 11 May 2023 16:49:29 +0200 Subject: [PATCH 3/4] Remove echo on/off --- conda-recipe/bld.bat | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index 0d8e1a3e3ec5..2f119dd5d1da 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -29,13 +29,11 @@ FOR %%V IN (14.0.0 14 15.0.0 15 16.0.0 16) DO @( ) ) -@echo off for /f "tokens=3" %%a in ('cmake --version ^| find "cmake version"') do set CMAKE_VERSION=%%a for /f "tokens=1-3 delims=." %%a in ("%CMAKE_VERSION%") do ( set CMAKE_VERSION_MAJOR=%%a set CMAKE_VERSION_MINOR=%%b ) -@echo on set "PLATFORM_DIR=%PREFIX%\Library\share\cmake-%CMAKE_VERSION_MAJOR%.%CMAKE_VERSION_MINOR%\Modules\Platform" set "FN=Windows-IntelLLVM.cmake" From fc4d28e5ae2a5247d5bc044ff973210dfd0fd628 Mon Sep 17 00:00:00 2001 From: Vladislav Perevezentsev Date: Fri, 12 May 2023 00:03:27 +0200 Subject: [PATCH 4/4] Add CMAKE_PATH env variable --- conda-recipe/bld.bat | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index 2f119dd5d1da..bef5d19d85fc 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -29,8 +29,11 @@ FOR %%V IN (14.0.0 14 15.0.0 15 16.0.0 16) DO @( ) ) -for /f "tokens=3" %%a in ('cmake --version ^| find "cmake version"') do set CMAKE_VERSION=%%a -for /f "tokens=1-3 delims=." %%a in ("%CMAKE_VERSION%") do ( +for /f "tokens=*" %%p in ('where cmake') do set CMAKE_PATH=%%p & goto :continue +:continue +for /f "tokens=3" %%a in ('%CMAKE_PATH% --version') do set CMAKE_VERSION=%%a & goto :continue +:continue +for /f "tokens=1-2 delims=." %%a in ("%CMAKE_VERSION%") do ( set CMAKE_VERSION_MAJOR=%%a set CMAKE_VERSION_MINOR=%%b )