From 22400b7bb9eb7e3866edc6852b260a22ff785880 Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Wed, 30 Oct 2024 10:26:13 +0000 Subject: [PATCH 01/15] Update oneTBB, oneMKL, oneDAL, MPI and OpenMP versions --- recipe/meta.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c3bdbd3..b948e4c 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,29 +1,29 @@ -{% set tbb_version = "2021.13.1" %} +{% set tbb_version = "2022.0.0" %} # this variable defines oneMKL specific version -{% set mkl_version = "2024.2.2" %} +{% set mkl_version = "2025.0.0" %} # this variable defines oneMKL specific buildnum {% set mkl_buildnum = "" %} -{% set mkl_buildnum = "15" %} # [linux] -{% set mkl_buildnum = "14" %} # [win] +{% set mkl_buildnum = "939" %} # [linux] +{% set mkl_buildnum = "928" %} # [win] # this variable defines oneDAL specific version -{% set dal_version = "2024.7.0" %} +{% set dal_version = "2025.0.0" %} # this variable defines oneDAL specific buildnum {% set dal_buildnum = "" %} -{% set dal_buildnum = "13" %} # [linux] -{% set dal_buildnum = "16" %} # [win] +{% set dal_buildnum = "957" %} # [linux] +{% set dal_buildnum = "947" %} # [win] # this variable defines openmp specific version -{% set openmp_version = "2024.2.0" %} +{% set openmp_version = "2025.0.0" %} # this variable defines openmp specific buildnum {% set openmp_buildnum = "" %} -{% set openmp_buildnum = "981" %} # [linux] -{% set openmp_buildnum = "978" %} # [win] +{% set openmp_buildnum = "1169" %} # [linux] +{% set openmp_buildnum = "1162" %} # [win] # this variable defines impi specific version -{% set impi_version = "2021.13.1" %} +{% set impi_version = "2021.14.0" %} # this variable defines impi specific buildnum {% set impi_buildnum = "" %} -{% set impi_buildnum = "767" %} # [linux] -{% set impi_buildnum = "766" %} # [win] +{% set impi_buildnum = "790" %} # [linux] +{% set impi_buildnum = "784" %} # [win] # this variable defines onedpl specific version {% set onedpl_version = "2022.6.1" %} From e320285c79b4f2ce485da53c0147cb14dee47d0e Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:39:26 +0000 Subject: [PATCH 02/15] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.0, and conda-forge-pinning 2024.10.30.09.36.02 --- .azure-pipelines/azure-pipelines-linux.yml | 16 +++++- .azure-pipelines/azure-pipelines-win.yml | 32 +++++------- .../linux_64_python3.10.____cpython.yaml | 18 +++++++ .../linux_64_python3.11.____cpython.yaml | 18 +++++++ .../linux_64_python3.12.____cpython.yaml | 18 +++++++ ...ml => linux_64_python3.9.____cpython.yaml} | 6 +++ .../win_64_python3.10.____cpython.yaml | 14 ++++++ .../win_64_python3.11.____cpython.yaml | 14 ++++++ .../win_64_python3.12.____cpython.yaml | 14 ++++++ ...yaml => win_64_python3.9.____cpython.yaml} | 6 +++ .scripts/build_steps.sh | 14 +++--- .scripts/run_win_build.bat | 42 ++++++++++++---- README.md | 50 +++++++++++++++++-- azure-pipelines.yml | 31 ++++++++++-- 14 files changed, 248 insertions(+), 45 deletions(-) create mode 100644 .ci_support/linux_64_python3.10.____cpython.yaml create mode 100644 .ci_support/linux_64_python3.11.____cpython.yaml create mode 100644 .ci_support/linux_64_python3.12.____cpython.yaml rename .ci_support/{linux_64_.yaml => linux_64_python3.9.____cpython.yaml} (67%) create mode 100644 .ci_support/win_64_python3.10.____cpython.yaml create mode 100644 .ci_support/win_64_python3.11.____cpython.yaml create mode 100644 .ci_support/win_64_python3.12.____cpython.yaml rename .ci_support/{win_64_.yaml => win_64_python3.9.____cpython.yaml} (54%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..3db01d7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_python3.10.____cpython: + CONFIG: linux_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.9.____cpython: + CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 204327b..8a6d3fd 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,37 +8,31 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_: - CONFIG: win_64_ + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.9.____cpython: + CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + MINIFORGE_HOME: D:\Miniforge UPLOAD_TEMP: D:\\tmp steps: - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build env: + MINIFORGE_HOME: $(MINIFORGE_HOME) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml new file mode 100644 index 0000000..32f08a5 --- /dev/null +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..d4dfade --- /dev/null +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..47d4e61 --- /dev/null +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml similarity index 67% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml index 8440e64..81feb1f 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -8,5 +8,11 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl: - '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython target_platform: - linux-64 diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml new file mode 100644 index 0000000..e0ce6e7 --- /dev/null +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -0,0 +1,14 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..760bea1 --- /dev/null +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -0,0 +1,14 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..3ad3b03 --- /dev/null +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -0,0 +1,14 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_python3.9.____cpython.yaml similarity index 54% rename from .ci_support/win_64_.yaml rename to .ci_support/win_64_python3.9.____cpython.yaml index f767e4d..40edb09 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -4,5 +4,11 @@ channel_targets: - conda-forge main mkl: - '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython target_platform: - win-64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index af0b9ac..f8051ab 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -73,8 +73,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 33f3277..752eec6 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,30 +3,52 @@ :: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also :: benefit from the improvement. -:: Note: we assume a Miniforge installation is available - :: INPUTS (required environment variables) :: CONFIG: name of the .ci_support/*.yaml file for this job :: CI: azure, github_actions, or unset +:: MINIFORGE_HOME: where to install the base conda environment :: UPLOAD_PACKAGES: true or false :: UPLOAD_ON_BRANCH: true or false setlocal enableextensions enabledelayedexpansion +if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" +:: Remove trailing backslash, if present +if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" +call :start_group "Provisioning base env with micromamba" +set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" +set "MICROMAMBA_VERSION=1.5.10-0" +set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" +set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" +set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" + +echo Downloading micromamba %MICROMAMBA_VERSION% +if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" +certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +if !errorlevel! neq 0 exit /b !errorlevel! + +echo Creating environment +call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ + --channel conda-forge ^ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Moving pkgs cache from %MAMBA_ROOT_PREFIX% to %MINIFORGE_HOME% +move /Y "%MAMBA_ROOT_PREFIX%\pkgs" "%MINIFORGE_HOME%" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Removing %MAMBA_ROOT_PREFIX% +del /S /Q "%MAMBA_ROOT_PREFIX%" +del /S /Q "%MICROMAMBA_TMPDIR%" +call :end_group + call :start_group "Configuring conda" :: Activate the base conda environment -call activate base +call "%MINIFORGE_HOME%\Scripts\activate.bat" :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" -:: Provision the necessary dependencies to build the recipe later -echo Installing dependencies -mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes -if !errorlevel! neq 0 exit /b !errorlevel! - :: Set basic configuration echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -54,8 +76,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" call :end_group :: Prepare some environment variables for the upload step diff --git a/README.md b/README.md index f32fa57..abacbd6 100644 --- a/README.md +++ b/README.md @@ -346,17 +346,59 @@ Current build status - + - + + + + + + + + + + + + + + + + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index baa1c2b..8b954b8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From 115df02c370a3b63913653dfa5d11158d34be644 Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Wed, 30 Oct 2024 10:46:20 +0000 Subject: [PATCH 03/15] Revert "MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.0, and conda-forge-pinning 2024.10.30.09.36.02" This reverts commit e320285c79b4f2ce485da53c0147cb14dee47d0e. --- .azure-pipelines/azure-pipelines-linux.yml | 16 +----- .azure-pipelines/azure-pipelines-win.yml | 32 +++++++----- ...hon3.9.____cpython.yaml => linux_64_.yaml} | 6 --- .../linux_64_python3.10.____cpython.yaml | 18 ------- .../linux_64_python3.11.____cpython.yaml | 18 ------- .../linux_64_python3.12.____cpython.yaml | 18 ------- ...ython3.9.____cpython.yaml => win_64_.yaml} | 6 --- .../win_64_python3.10.____cpython.yaml | 14 ------ .../win_64_python3.11.____cpython.yaml | 14 ------ .../win_64_python3.12.____cpython.yaml | 14 ------ .scripts/build_steps.sh | 14 +++--- .scripts/run_win_build.bat | 42 ++++------------ README.md | 50 ++----------------- azure-pipelines.yml | 31 ++---------- 14 files changed, 45 insertions(+), 248 deletions(-) rename .ci_support/{linux_64_python3.9.____cpython.yaml => linux_64_.yaml} (67%) delete mode 100644 .ci_support/linux_64_python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_64_python3.11.____cpython.yaml delete mode 100644 .ci_support/linux_64_python3.12.____cpython.yaml rename .ci_support/{win_64_python3.9.____cpython.yaml => win_64_.yaml} (54%) delete mode 100644 .ci_support/win_64_python3.10.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.11.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.12.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3db01d7..875d996 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,8 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.11.____cpython: - CONFIG: linux_64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.12.____cpython: - CONFIG: linux_64_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython + linux_64_: + CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a6d3fd..204327b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,31 +8,37 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.11.____cpython: - CONFIG: win_64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.12.____cpython: - CONFIG: win_64_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython + win_64_: + CONFIG: win_64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ - MINIFORGE_HOME: D:\Miniforge UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) + + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge + + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH + - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build env: - MINIFORGE_HOME: $(MINIFORGE_HOME) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_.yaml similarity index 67% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_.yaml index 81feb1f..8440e64 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_.yaml @@ -8,11 +8,5 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl: - '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython target_platform: - linux-64 diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml deleted file mode 100644 index 32f08a5..0000000 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ /dev/null @@ -1,18 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml deleted file mode 100644 index d4dfade..0000000 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ /dev/null @@ -1,18 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml deleted file mode 100644 index 47d4e61..0000000 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ /dev/null @@ -1,18 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_.yaml similarity index 54% rename from .ci_support/win_64_python3.9.____cpython.yaml rename to .ci_support/win_64_.yaml index 40edb09..f767e4d 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_.yaml @@ -4,11 +4,5 @@ channel_targets: - conda-forge main mkl: - '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython target_platform: - win-64 diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml deleted file mode 100644 index e0ce6e7..0000000 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ /dev/null @@ -1,14 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml deleted file mode 100644 index 760bea1..0000000 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ /dev/null @@ -1,14 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml deleted file mode 100644 index 3ad3b03..0000000 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ /dev/null @@ -1,14 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- win-64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f8051ab..af0b9ac 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ pkgs_dirs: solver: libmamba CONDARC -mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) -echo > /opt/conda/conda-meta/history -micromamba install --root-prefix ~/.conda --prefix /opt/conda \ - --yes --override-channels --channel conda-forge --strict-channel-priority \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -73,8 +73,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 752eec6..33f3277 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,52 +3,30 @@ :: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also :: benefit from the improvement. +:: Note: we assume a Miniforge installation is available + :: INPUTS (required environment variables) :: CONFIG: name of the .ci_support/*.yaml file for this job :: CI: azure, github_actions, or unset -:: MINIFORGE_HOME: where to install the base conda environment :: UPLOAD_PACKAGES: true or false :: UPLOAD_ON_BRANCH: true or false setlocal enableextensions enabledelayedexpansion -if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" -:: Remove trailing backslash, if present -if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" -call :start_group "Provisioning base env with micromamba" -set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" -set "MICROMAMBA_VERSION=1.5.10-0" -set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" -set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" -set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" - -echo Downloading micromamba %MICROMAMBA_VERSION% -if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" -certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" -if !errorlevel! neq 0 exit /b !errorlevel! - -echo Creating environment -call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ - --channel conda-forge ^ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -if !errorlevel! neq 0 exit /b !errorlevel! -echo Moving pkgs cache from %MAMBA_ROOT_PREFIX% to %MINIFORGE_HOME% -move /Y "%MAMBA_ROOT_PREFIX%\pkgs" "%MINIFORGE_HOME%" -if !errorlevel! neq 0 exit /b !errorlevel! -echo Removing %MAMBA_ROOT_PREFIX% -del /S /Q "%MAMBA_ROOT_PREFIX%" -del /S /Q "%MICROMAMBA_TMPDIR%" -call :end_group - call :start_group "Configuring conda" :: Activate the base conda environment -call "%MINIFORGE_HOME%\Scripts\activate.bat" +call activate base :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + :: Set basic configuration echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -76,8 +54,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" call :end_group :: Prepare some environment variables for the upload step diff --git a/README.md b/README.md index abacbd6..f32fa57 100644 --- a/README.md +++ b/README.md @@ -346,59 +346,17 @@ Current build status
VariantStatus
linux_64linux_64_python3.10.____cpython - variant + variant
win_64linux_64_python3.11.____cpython - variant + variant + +
linux_64_python3.12.____cpython + + variant + +
linux_64_python3.9.____cpython + + variant + +
win_64_python3.10.____cpython + + variant + +
win_64_python3.11.____cpython + + variant + +
win_64_python3.12.____cpython + + variant + +
win_64_python3.9.____cpython + + variant
- + - + - - - - - - - - - - - - - - - - - - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8b954b8..baa1c2b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,31 +2,6 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -stages: -- stage: Check - jobs: - - job: Skip - pool: - vmImage: 'ubuntu-22.04' - variables: - DECODE_PERCENTS: 'false' - RET: 'true' - steps: - - checkout: self - fetchDepth: '2' - - bash: | - git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` - echo "##vso[task.setvariable variable=log]$git_log" - displayName: Obtain commit message - - bash: echo "##vso[task.setvariable variable=RET]false" - condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) - displayName: Skip build? - - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" - name: result - displayName: Export result -- stage: Build - condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) - dependsOn: Check - jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From 3702036ec907a0a1996199b98e06fb8aed5c33a2 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:27:03 +0000 Subject: [PATCH 04/15] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.2, and conda-forge-pinning 2024.10.31.23.25.38 --- .azure-pipelines/azure-pipelines-linux.yml | 16 +++++- .azure-pipelines/azure-pipelines-win.yml | 32 +++++------- .../linux_64_python3.10.____cpython.yaml | 18 +++++++ .../linux_64_python3.11.____cpython.yaml | 18 +++++++ .../linux_64_python3.12.____cpython.yaml | 18 +++++++ ...ml => linux_64_python3.9.____cpython.yaml} | 6 +++ .../win_64_python3.10.____cpython.yaml | 14 ++++++ .../win_64_python3.11.____cpython.yaml | 14 ++++++ .../win_64_python3.12.____cpython.yaml | 14 ++++++ ...yaml => win_64_python3.9.____cpython.yaml} | 6 +++ .scripts/build_steps.sh | 14 +++--- .scripts/run_win_build.bat | 39 +++++++++++---- README.md | 50 +++++++++++++++++-- azure-pipelines.yml | 31 ++++++++++-- 14 files changed, 245 insertions(+), 45 deletions(-) create mode 100644 .ci_support/linux_64_python3.10.____cpython.yaml create mode 100644 .ci_support/linux_64_python3.11.____cpython.yaml create mode 100644 .ci_support/linux_64_python3.12.____cpython.yaml rename .ci_support/{linux_64_.yaml => linux_64_python3.9.____cpython.yaml} (67%) create mode 100644 .ci_support/win_64_python3.10.____cpython.yaml create mode 100644 .ci_support/win_64_python3.11.____cpython.yaml create mode 100644 .ci_support/win_64_python3.12.____cpython.yaml rename .ci_support/{win_64_.yaml => win_64_python3.9.____cpython.yaml} (54%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..3db01d7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_python3.10.____cpython: + CONFIG: linux_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.9.____cpython: + CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 204327b..8a6d3fd 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,37 +8,31 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_: - CONFIG: win_64_ + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.9.____cpython: + CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + MINIFORGE_HOME: D:\Miniforge UPLOAD_TEMP: D:\\tmp steps: - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build env: + MINIFORGE_HOME: $(MINIFORGE_HOME) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml new file mode 100644 index 0000000..32f08a5 --- /dev/null +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..d4dfade --- /dev/null +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..47d4e61 --- /dev/null +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml similarity index 67% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml index 8440e64..81feb1f 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -8,5 +8,11 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl: - '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython target_platform: - linux-64 diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml new file mode 100644 index 0000000..e0ce6e7 --- /dev/null +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -0,0 +1,14 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..760bea1 --- /dev/null +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -0,0 +1,14 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..3ad3b03 --- /dev/null +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -0,0 +1,14 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_python3.9.____cpython.yaml similarity index 54% rename from .ci_support/win_64_.yaml rename to .ci_support/win_64_python3.9.____cpython.yaml index f767e4d..40edb09 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -4,5 +4,11 @@ channel_targets: - conda-forge main mkl: - '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython target_platform: - win-64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index af0b9ac..f8051ab 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -73,8 +73,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 33f3277..e3ee03e 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,30 +3,49 @@ :: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also :: benefit from the improvement. -:: Note: we assume a Miniforge installation is available - :: INPUTS (required environment variables) :: CONFIG: name of the .ci_support/*.yaml file for this job :: CI: azure, github_actions, or unset +:: MINIFORGE_HOME: where to install the base conda environment :: UPLOAD_PACKAGES: true or false :: UPLOAD_ON_BRANCH: true or false setlocal enableextensions enabledelayedexpansion +if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" +:: Remove trailing backslash, if present +if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" +call :start_group "Provisioning base env with micromamba" +set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" +set "MICROMAMBA_VERSION=1.5.10-0" +set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" +set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" +set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" + +echo Downloading micromamba %MICROMAMBA_VERSION% +if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" +certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +if !errorlevel! neq 0 exit /b !errorlevel! + +echo Creating environment +call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ + --channel conda-forge ^ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Removing %MAMBA_ROOT_PREFIX% +del /S /Q "%MAMBA_ROOT_PREFIX%" +del /S /Q "%MICROMAMBA_TMPDIR%" +call :end_group + call :start_group "Configuring conda" :: Activate the base conda environment -call activate base +call "%MINIFORGE_HOME%\Scripts\activate.bat" :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" -:: Provision the necessary dependencies to build the recipe later -echo Installing dependencies -mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes -if !errorlevel! neq 0 exit /b !errorlevel! - :: Set basic configuration echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -54,8 +73,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" call :end_group :: Prepare some environment variables for the upload step diff --git a/README.md b/README.md index f32fa57..abacbd6 100644 --- a/README.md +++ b/README.md @@ -346,17 +346,59 @@ Current build status
VariantStatus
linux_64_python3.10.____cpythonlinux_64 - variant + variant
linux_64_python3.11.____cpythonwin_64 - variant - -
linux_64_python3.12.____cpython - - variant - -
linux_64_python3.9.____cpython - - variant - -
win_64_python3.10.____cpython - - variant - -
win_64_python3.11.____cpython - - variant - -
win_64_python3.12.____cpython - - variant - -
win_64_python3.9.____cpython - - variant + variant
- + - + + + + + + + + + + + + + + + + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index baa1c2b..773d216 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From f8a98f34cc535c97a9160eee93b05f218ee352e2 Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Sun, 3 Nov 2024 17:32:58 +0000 Subject: [PATCH 05/15] Revert "MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.2, and conda-forge-pinning 2024.10.31.23.25.38" This reverts commit 3702036ec907a0a1996199b98e06fb8aed5c33a2. --- .azure-pipelines/azure-pipelines-linux.yml | 16 +----- .azure-pipelines/azure-pipelines-win.yml | 32 +++++++----- ...hon3.9.____cpython.yaml => linux_64_.yaml} | 6 --- .../linux_64_python3.10.____cpython.yaml | 18 ------- .../linux_64_python3.11.____cpython.yaml | 18 ------- .../linux_64_python3.12.____cpython.yaml | 18 ------- ...ython3.9.____cpython.yaml => win_64_.yaml} | 6 --- .../win_64_python3.10.____cpython.yaml | 14 ------ .../win_64_python3.11.____cpython.yaml | 14 ------ .../win_64_python3.12.____cpython.yaml | 14 ------ .scripts/build_steps.sh | 14 +++--- .scripts/run_win_build.bat | 39 ++++----------- README.md | 50 ++----------------- azure-pipelines.yml | 31 ++---------- 14 files changed, 45 insertions(+), 245 deletions(-) rename .ci_support/{linux_64_python3.9.____cpython.yaml => linux_64_.yaml} (67%) delete mode 100644 .ci_support/linux_64_python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_64_python3.11.____cpython.yaml delete mode 100644 .ci_support/linux_64_python3.12.____cpython.yaml rename .ci_support/{win_64_python3.9.____cpython.yaml => win_64_.yaml} (54%) delete mode 100644 .ci_support/win_64_python3.10.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.11.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.12.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3db01d7..875d996 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,8 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.11.____cpython: - CONFIG: linux_64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.12.____cpython: - CONFIG: linux_64_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython + linux_64_: + CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a6d3fd..204327b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,31 +8,37 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.11.____cpython: - CONFIG: win_64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.12.____cpython: - CONFIG: win_64_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython + win_64_: + CONFIG: win_64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ - MINIFORGE_HOME: D:\Miniforge UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) + + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge + + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH + - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build env: - MINIFORGE_HOME: $(MINIFORGE_HOME) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_.yaml similarity index 67% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_.yaml index 81feb1f..8440e64 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_.yaml @@ -8,11 +8,5 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl: - '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython target_platform: - linux-64 diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml deleted file mode 100644 index 32f08a5..0000000 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ /dev/null @@ -1,18 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml deleted file mode 100644 index d4dfade..0000000 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ /dev/null @@ -1,18 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml deleted file mode 100644 index 47d4e61..0000000 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ /dev/null @@ -1,18 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_.yaml similarity index 54% rename from .ci_support/win_64_python3.9.____cpython.yaml rename to .ci_support/win_64_.yaml index 40edb09..f767e4d 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_.yaml @@ -4,11 +4,5 @@ channel_targets: - conda-forge main mkl: - '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython target_platform: - win-64 diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml deleted file mode 100644 index e0ce6e7..0000000 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ /dev/null @@ -1,14 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml deleted file mode 100644 index 760bea1..0000000 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ /dev/null @@ -1,14 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml deleted file mode 100644 index 3ad3b03..0000000 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ /dev/null @@ -1,14 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -mkl: -- '2023' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- win-64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f8051ab..af0b9ac 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ pkgs_dirs: solver: libmamba CONDARC -mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) -echo > /opt/conda/conda-meta/history -micromamba install --root-prefix ~/.conda --prefix /opt/conda \ - --yes --override-channels --channel conda-forge --strict-channel-priority \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -73,8 +73,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index e3ee03e..33f3277 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,49 +3,30 @@ :: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also :: benefit from the improvement. +:: Note: we assume a Miniforge installation is available + :: INPUTS (required environment variables) :: CONFIG: name of the .ci_support/*.yaml file for this job :: CI: azure, github_actions, or unset -:: MINIFORGE_HOME: where to install the base conda environment :: UPLOAD_PACKAGES: true or false :: UPLOAD_ON_BRANCH: true or false setlocal enableextensions enabledelayedexpansion -if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" -:: Remove trailing backslash, if present -if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" -call :start_group "Provisioning base env with micromamba" -set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" -set "MICROMAMBA_VERSION=1.5.10-0" -set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" -set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" -set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" - -echo Downloading micromamba %MICROMAMBA_VERSION% -if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" -certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" -if !errorlevel! neq 0 exit /b !errorlevel! - -echo Creating environment -call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ - --channel conda-forge ^ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -if !errorlevel! neq 0 exit /b !errorlevel! -echo Removing %MAMBA_ROOT_PREFIX% -del /S /Q "%MAMBA_ROOT_PREFIX%" -del /S /Q "%MICROMAMBA_TMPDIR%" -call :end_group - call :start_group "Configuring conda" :: Activate the base conda environment -call "%MINIFORGE_HOME%\Scripts\activate.bat" +call activate base :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + :: Set basic configuration echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -73,8 +54,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" call :end_group :: Prepare some environment variables for the upload step diff --git a/README.md b/README.md index abacbd6..f32fa57 100644 --- a/README.md +++ b/README.md @@ -346,59 +346,17 @@ Current build status
VariantStatus
linux_64linux_64_python3.10.____cpython - variant + variant
win_64linux_64_python3.11.____cpython - variant + variant + +
linux_64_python3.12.____cpython + + variant + +
linux_64_python3.9.____cpython + + variant + +
win_64_python3.10.____cpython + + variant + +
win_64_python3.11.____cpython + + variant + +
win_64_python3.12.____cpython + + variant + +
win_64_python3.9.____cpython + + variant
- + - + - - - - - - - - - - - - - - - - - - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 773d216..baa1c2b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,31 +2,6 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -stages: -- stage: Check - jobs: - - job: Skip - pool: - vmImage: 'ubuntu-22.04' - variables: - DECODE_PERCENTS: 'false' - RET: 'true' - steps: - - checkout: self - fetchDepth: '2' - - bash: | - git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` - echo "##vso[task.setvariable variable=log]$git_log" - displayName: Obtain commit message - - bash: echo "##vso[task.setvariable variable=RET]false" - condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) - displayName: Skip build? - - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" - name: result - displayName: Export result -- stage: Build - condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) - dependsOn: Check - jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From 5e2ea77f3f496e3b7db8a653cad9f0b9eba881f9 Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Sun, 3 Nov 2024 18:36:04 +0000 Subject: [PATCH 06/15] Update oneDAL binary version --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b948e4c..01cf9aa 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -576,8 +576,8 @@ outputs: doc_url: http://oneapi-src.github.io/oneDAL/ test: commands: - - test -f $PREFIX/lib/libonedal.so.2 # [linux] - - if not exist %LIBRARY_BIN%\\onedal.2.dll exit 1 # [win] + - test -f $PREFIX/lib/libonedal.so.3 # [linux] + - if not exist %LIBRARY_BIN%\\onedal.3.dll exit 1 # [win] - name: dal-include version: {{ dal_version }} From bd5de4691a1a24ae3f2e19eaf40225f9be44fe71 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 02:49:56 +0000 Subject: [PATCH 07/15] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.0, and conda-forge-pinning 2024.11.05.21.36.17 --- .azure-pipelines/azure-pipelines-linux.yml | 16 +++++- .azure-pipelines/azure-pipelines-win.yml | 32 +++++------- .../linux_64_python3.10.____cpython.yaml | 18 +++++++ .../linux_64_python3.11.____cpython.yaml | 18 +++++++ .../linux_64_python3.12.____cpython.yaml | 18 +++++++ ...ml => linux_64_python3.9.____cpython.yaml} | 6 +++ .../win_64_python3.10.____cpython.yaml | 14 ++++++ .../win_64_python3.11.____cpython.yaml | 14 ++++++ .../win_64_python3.12.____cpython.yaml | 14 ++++++ ...yaml => win_64_python3.9.____cpython.yaml} | 6 +++ .github/workflows/automerge.yml | 17 ------- .github/workflows/webservices.yml | 13 ----- .scripts/build_steps.sh | 14 +++--- .scripts/run_win_build.bat | 40 +++++++++++---- README.md | 50 +++++++++++++++++-- azure-pipelines.yml | 31 ++++++++++-- 16 files changed, 246 insertions(+), 75 deletions(-) create mode 100644 .ci_support/linux_64_python3.10.____cpython.yaml create mode 100644 .ci_support/linux_64_python3.11.____cpython.yaml create mode 100644 .ci_support/linux_64_python3.12.____cpython.yaml rename .ci_support/{linux_64_.yaml => linux_64_python3.9.____cpython.yaml} (67%) create mode 100644 .ci_support/win_64_python3.10.____cpython.yaml create mode 100644 .ci_support/win_64_python3.11.____cpython.yaml create mode 100644 .ci_support/win_64_python3.12.____cpython.yaml rename .ci_support/{win_64_.yaml => win_64_python3.9.____cpython.yaml} (54%) delete mode 100644 .github/workflows/automerge.yml delete mode 100644 .github/workflows/webservices.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..3db01d7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_python3.10.____cpython: + CONFIG: linux_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.9.____cpython: + CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 204327b..8a6d3fd 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,37 +8,31 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_: - CONFIG: win_64_ + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.9.____cpython: + CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + MINIFORGE_HOME: D:\Miniforge UPLOAD_TEMP: D:\\tmp steps: - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build env: + MINIFORGE_HOME: $(MINIFORGE_HOME) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml new file mode 100644 index 0000000..32f08a5 --- /dev/null +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..d4dfade --- /dev/null +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..47d4e61 --- /dev/null +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -0,0 +1,18 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml similarity index 67% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml index 8440e64..81feb1f 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -8,5 +8,11 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 mkl: - '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython target_platform: - linux-64 diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml new file mode 100644 index 0000000..e0ce6e7 --- /dev/null +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -0,0 +1,14 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..760bea1 --- /dev/null +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -0,0 +1,14 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..3ad3b03 --- /dev/null +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -0,0 +1,14 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +mkl: +- '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- win-64 diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_python3.9.____cpython.yaml similarity index 54% rename from .ci_support/win_64_.yaml rename to .ci_support/win_64_python3.9.____cpython.yaml index f767e4d..40edb09 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -4,5 +4,11 @@ channel_targets: - conda-forge main mkl: - '2023' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython target_platform: - win-64 diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 0535f6a..0000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - status: {} - check_suite: - types: - - completed - -jobs: - automerge-action: - runs-on: ubuntu-latest - name: automerge - steps: - - name: automerge-action - id: automerge-action - uses: conda-forge/automerge-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml deleted file mode 100644 index d6f06b5..0000000 --- a/.github/workflows/webservices.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: repository_dispatch - -jobs: - webservices: - runs-on: ubuntu-latest - name: webservices - steps: - - name: webservices - id: webservices - uses: conda-forge/webservices-dispatch-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index af0b9ac..f8051ab 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -73,8 +73,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 33f3277..e0a7606 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,30 +3,50 @@ :: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also :: benefit from the improvement. -:: Note: we assume a Miniforge installation is available - :: INPUTS (required environment variables) :: CONFIG: name of the .ci_support/*.yaml file for this job :: CI: azure, github_actions, or unset +:: MINIFORGE_HOME: where to install the base conda environment :: UPLOAD_PACKAGES: true or false :: UPLOAD_ON_BRANCH: true or false setlocal enableextensions enabledelayedexpansion +FOR %%A IN ("%~dp0.") DO SET "REPO_ROOT=%%~dpA" +if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" +:: Remove trailing backslash, if present +if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" +call :start_group "Provisioning base env with micromamba" +set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" +set "MICROMAMBA_VERSION=1.5.10-0" +set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" +set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" +set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" + +echo Downloading micromamba %MICROMAMBA_VERSION% +if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" +certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +if !errorlevel! neq 0 exit /b !errorlevel! + +echo Creating environment +call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ + --channel conda-forge ^ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Removing %MAMBA_ROOT_PREFIX% +del /S /Q "%MAMBA_ROOT_PREFIX%" +del /S /Q "%MICROMAMBA_TMPDIR%" + call :start_group "Configuring conda" :: Activate the base conda environment -call activate base +echo Activating environment +call "%MINIFORGE_HOME%\Scripts\activate.bat" :: Configure the solver set "CONDA_SOLVER=libmamba" if !errorlevel! neq 0 exit /b !errorlevel! set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" -:: Provision the necessary dependencies to build the recipe later -echo Installing dependencies -mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes -if !errorlevel! neq 0 exit /b !errorlevel! - :: Set basic configuration echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -54,8 +74,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" call :end_group :: Prepare some environment variables for the upload step diff --git a/README.md b/README.md index f32fa57..abacbd6 100644 --- a/README.md +++ b/README.md @@ -346,17 +346,59 @@ Current build status
VariantStatus
linux_64_python3.10.____cpythonlinux_64 - variant + variant
linux_64_python3.11.____cpythonwin_64 - variant - -
linux_64_python3.12.____cpython - - variant - -
linux_64_python3.9.____cpython - - variant - -
win_64_python3.10.____cpython - - variant - -
win_64_python3.11.____cpython - - variant - -
win_64_python3.12.____cpython - - variant - -
win_64_python3.9.____cpython - - variant + variant
- + - + + + + + + + + + + + + + + + + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index baa1c2b..773d216 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From b93a40c6487fef0b1929ce3c3ddcf4a349ae2b80 Mon Sep 17 00:00:00 2001 From: Yevhenii Havrylko Date: Wed, 6 Nov 2024 03:36:32 +0000 Subject: [PATCH 08/15] Use glibc 2.28 base image --- recipe/conda_build_config.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..4324b1a --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,5 @@ +c_stdlib_version: # [linux] + - 2.28 # [linux] +# Use image with support of glibc 2.28 +docker_image: +- quay.io/condaforge/linux-anvil-alma-x86_64:8 # [linux and x86_64] From 489819fac95a8a2f79e7c91dbd0fdc2a614614f2 Mon Sep 17 00:00:00 2001 From: Yevhenii Havrylko Date: Wed, 6 Nov 2024 04:30:03 +0000 Subject: [PATCH 09/15] Fix stdlib dependencies --- recipe/conda_build_config.yaml | 7 +- recipe/meta.yaml | 245 ++++++++++++++++++--------------- 2 files changed, 137 insertions(+), 115 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 4324b1a..b87e714 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,5 +1,10 @@ -c_stdlib_version: # [linux] +# sycl runtime components depends on 2.28 glibc. +c_stdlib_sycl_version: # [linux] - 2.28 # [linux] +c_stdlib_version: # [linux] + - 2.17 # [linux] +mkl: + - 2025 # Use image with support of glibc 2.28 docker_image: - quay.io/condaforge/linux-anvil-alma-x86_64:8 # [linux and x86_64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 01cf9aa..778d374 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,6 +38,21 @@ # use this if our build script changes and we need to increment beyond intel's version {% set dstbuildnum = '1' %} +# We need intel-openmp because it contains VCOMP symbols on windows in order to +# pytorch work. Those are deprecated symbols and should be removed in the +# future. +# https://github.com/conda-forge/intel_repack-feedstock/issues/59#issuecomment-1790007397 +# More info about OpenMP mutex could be found on conda-forge wiki: +# https://conda-forge.org/docs/maintainer/knowledge_base/#openmp +{% set openmp_pkg ="llvm-openmp" %} +{% set openmp_mutex ="_openmp_mutex * *_llvm" %} +{% if win or 'conda-forge' not in my_channel_targets %} +{% set openmp_pkg ="intel-openmp " ~ openmp_version.split('.')[0] ~ ".*" %} +# we don't need openmp, and there is no mutex on windows, so we are +# forced to use intel-openmp package as dependency +{% set openmp_mutex ="intel-openmp " ~ openmp_version.split('.')[0] ~ ".*" %} +{% endif %} + package: name: intel_repack # Use oneDAL as overall repack package version @@ -111,22 +126,6 @@ build: binary_relocation: false detect_binary_files_with_prefix: false skip: True # [not (linux64 or win)] - missing_dso_whitelist: - # normal linux stuff that would go away if we had libgcc-ng in the run deps - - /lib*/ld-linux.so.2 - - /lib64/ld-linux-x86-64.so.2 - - /lib*/libpthread.so.0 - - /lib*/libdl.so.2 - - /lib*/libgcc_s.so.1 - - /lib*/libc.so.6 - - /lib*/libm.so.6 - # these two really shouldn't be here. See mkl_repack_and_patchelf.sh - - libiomp5.so - - libcoi_device.so.0 - - /usr/lib/libstdc++.so.6 # [linux] - - /usr/lib64/libstdc++.so.6 # [linux] - # hooray, windows - - "C:\\Windows\\System32\\WINTRUST.dll" outputs: - name: mkl @@ -135,21 +134,15 @@ outputs: script: repack.bat # [win] number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: - {% if win or 'conda-forge' not in my_channel_targets %} + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] + - {{ stdlib('c') }} # [not linux] + - {{ openmp_mutex }} host: - - intel-openmp {{ openmp_version.split('.')[0] }}.* - - tbb {{ tbb_version.split('.')[0] }}.* - run: - - intel-openmp {{ openmp_version.split('.')[0] }}.* - - tbb {{ tbb_version.split('.')[0] }}.* - {% else %} - host: - - llvm-openmp - - tbb {{ tbb_version.split('.')[0] }}.* - run: - - llvm-openmp - - tbb {{ tbb_version.split('.')[0] }}.* - {% endif %} + - dpcpp-cpp-rt {{ dal_version.split('.')[0] }}.* + - tbb-devel {{ tbb_version.split('.')[0] }}.* about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -197,10 +190,14 @@ outputs: script: repack.bat # [win] number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: - run: - - {{ pin_subpackage('mkl', exact=True) }} - - dpcpp-cpp-rt {{ mkl_version.split('.')[0] }}.* - - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + build: + - {{ compiler('c') }} + - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] + - {{ stdlib('c') }} # [not linux] + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -216,8 +213,8 @@ outputs: test: commands: - ls -A $PREFIX/lib/* # [linux] - - test -f $PREFIX/lib/libmkl_sycl_blas.so.4 # [linux] - - if not exist %LIBRARY_BIN%\\mkl_sycl_blas.4.dll exit 1 # [win] + - test -f $PREFIX/lib/libmkl_sycl_blas.so.5 # [linux] + - if not exist %LIBRARY_BIN%\\mkl_sycl_blas.5.dll exit 1 # [win] - name: onemkl-sycl-datafitting version: {{ mkl_version }} @@ -225,10 +222,14 @@ outputs: script: repack.bat # [win] number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: - run: - - {{ pin_subpackage('mkl', exact=True) }} - - dpcpp-cpp-rt {{ mkl_version.split('.')[0] }}.* - - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + build: + - {{ compiler('c') }} + - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] + - {{ stdlib('c') }} # [not linux] + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -244,8 +245,8 @@ outputs: test: commands: - ls -A $PREFIX/lib/* # [linux] - - test -f $PREFIX/lib/libmkl_sycl_data_fitting.so.4 # [linux] - - if not exist %LIBRARY_BIN%\\mkl_sycl_data_fitting.4.dll exit 1 # [win] + - test -f $PREFIX/lib/libmkl_sycl_data_fitting.so.5 # [linux] + - if not exist %LIBRARY_BIN%\\mkl_sycl_data_fitting.5.dll exit 1 # [win] - name: onemkl-sycl-dft version: {{ mkl_version }} @@ -253,10 +254,14 @@ outputs: script: repack.bat # [win] number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: - run: - - {{ pin_subpackage('mkl', exact=True) }} - - dpcpp-cpp-rt {{ mkl_version.split('.')[0] }}.* - - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + build: + - {{ compiler('c') }} + - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] + - {{ stdlib('c') }} # [not linux] + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -272,8 +277,8 @@ outputs: test: commands: - ls -A $PREFIX/lib/* # [linux] - - test -f $PREFIX/lib/libmkl_sycl_dft.so.4 # [linux] - - if not exist %LIBRARY_BIN%\\mkl_sycl_dft.4.dll exit 1 # [win] + - test -f $PREFIX/lib/libmkl_sycl_dft.so.5 # [linux] + - if not exist %LIBRARY_BIN%\\mkl_sycl_dft.5.dll exit 1 # [win] - name: onemkl-sycl-lapack version: {{ mkl_version }} @@ -281,10 +286,16 @@ outputs: script: repack.bat # [win] number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: + build: + - {{ compiler('c') }} + - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] + - {{ stdlib('c') }} # [not linux] + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] + - {{ pin_subpackage('onemkl-sycl-blas', exact=True) }} run: - - {{ pin_subpackage('mkl', exact=True) }} - - dpcpp-cpp-rt {{ mkl_version.split('.')[0] }}.* - - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* - {{ pin_subpackage('onemkl-sycl-blas', exact=True) }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html @@ -301,8 +312,8 @@ outputs: test: commands: - ls -A $PREFIX/lib/* # [linux] - - test -f $PREFIX/lib/libmkl_sycl_lapack.so.4 # [linux] - - if not exist %LIBRARY_BIN%\\mkl_sycl_lapack.4.dll exit 1 # [win] + - test -f $PREFIX/lib/libmkl_sycl_lapack.so.5 # [linux] + - if not exist %LIBRARY_BIN%\\mkl_sycl_lapack.5.dll exit 1 # [win] - name: onemkl-sycl-rng version: {{ mkl_version }} @@ -310,10 +321,14 @@ outputs: script: repack.bat # [win] number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: - run: - - {{ pin_subpackage('mkl', exact=True) }} - - dpcpp-cpp-rt {{ mkl_version.split('.')[0] }}.* - - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + build: + - {{ compiler('c') }} + - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] + - {{ stdlib('c') }} # [not linux] + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -329,8 +344,8 @@ outputs: test: commands: - ls -A $PREFIX/lib/* # [linux] - - test -f $PREFIX/lib/libmkl_sycl_rng.so.4 # [linux] - - if not exist %LIBRARY_BIN%\\mkl_sycl_rng.4.dll exit 1 # [win] + - test -f $PREFIX/lib/libmkl_sycl_rng.so.5 # [linux] + - if not exist %LIBRARY_BIN%\\mkl_sycl_rng.5.dll exit 1 # [win] - name: onemkl-sycl-sparse version: {{ mkl_version }} @@ -338,10 +353,16 @@ outputs: script: repack.bat # [win] number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: + build: + - {{ compiler('c') }} + - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] + - {{ stdlib('c') }} # [not linux] + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] + - {{ pin_subpackage('onemkl-sycl-blas', exact=True) }} run: - - {{ pin_subpackage('mkl', exact=True) }} - - dpcpp-cpp-rt {{ mkl_version.split('.')[0] }}.* - - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* - {{ pin_subpackage('onemkl-sycl-blas', exact=True) }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html @@ -358,8 +379,8 @@ outputs: test: commands: - ls -A $PREFIX/lib/* # [linux] - - test -f $PREFIX/lib/libmkl_sycl_sparse.so.4 # [linux] - - if not exist %LIBRARY_BIN%\\mkl_sycl_sparse.4.dll exit 1 # [win] + - test -f $PREFIX/lib/libmkl_sycl_sparse.so.5 # [linux] + - if not exist %LIBRARY_BIN%\\mkl_sycl_sparse.5.dll exit 1 # [win] - name: onemkl-sycl-stats version: {{ mkl_version }} @@ -367,10 +388,14 @@ outputs: script: repack.bat # [win] number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: - run: - - {{ pin_subpackage('mkl', exact=True) }} - - dpcpp-cpp-rt {{ mkl_version.split('.')[0] }}.* - - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + build: + - {{ compiler('c') }} + - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] + - {{ stdlib('c') }} # [not linux] + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -386,8 +411,8 @@ outputs: test: commands: - ls -A $PREFIX/lib/* # [linux] - - test -f $PREFIX/lib/libmkl_sycl_stats.so.4 # [linux] - - if not exist %LIBRARY_BIN%\\mkl_sycl_stats.4.dll exit 1 # [win] + - test -f $PREFIX/lib/libmkl_sycl_stats.so.5 # [linux] + - if not exist %LIBRARY_BIN%\\mkl_sycl_stats.5.dll exit 1 # [win] - name: onemkl-sycl-vm version: {{ mkl_version }} @@ -395,10 +420,14 @@ outputs: script: repack.bat # [win] number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: - run: - - {{ pin_subpackage('mkl', exact=True) }} - - dpcpp-cpp-rt {{ mkl_version.split('.')[0] }}.* - - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + build: + - {{ compiler('c') }} + - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] + - {{ stdlib('c') }} # [not linux] + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -414,8 +443,8 @@ outputs: test: commands: - ls -A $PREFIX/lib/* # [linux] - - test -f $PREFIX/lib/libmkl_sycl_vm.so.4 # [linux] - - if not exist %LIBRARY_BIN%\\mkl_sycl_vm.4.dll exit 1 # [win] + - test -f $PREFIX/lib/libmkl_sycl_vm.so.5 # [linux] + - if not exist %LIBRARY_BIN%\\mkl_sycl_vm.5.dll exit 1 # [win] {% if win or 'conda-forge' not in my_channel_targets %} - name: intel-openmp @@ -423,6 +452,14 @@ outputs: script: repack.bat # [win] number: {{ openmp_buildnum|int + dstbuildnum|int }} version: {{ openmp_version }} + build: + host: + - intel-cmplr-lib-ur {{ openmp_version.split('.')[0] }}.* + run_constrained: + # prevent clobbering if user tries to install llvm's implementation + # TODO: use intel mutex or build windows torch in conda-froge + # https://github.com/conda-forge/intel-graphics-compiler-feedstock/pull/59 + - llvm-openmp <0a0 about: home: https://www.intel.com/content/www/us/en/developer/tools/overview.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -538,28 +575,19 @@ outputs: build: binary_relocation: false detect_binary_files_with_prefix: false - missing_dso_whitelist: - # normal linux stuff that would go away if we had libgcc-ng in the run deps - - /lib*/ld-linux.so.2 - - /lib64/ld-linux-x86-64.so.2 - - /lib*/libpthread.so.0 - - /lib*/libdl.so.2 - - /lib*/libgcc_s.so.1 - - /lib*/libc.so.6 - - /lib*/libm.so.6 - - lib/libgcc_s.so.1 - # these two really shouldn't be here. See mkl_repack_and_patchelf.sh - - libiomp5.so - - libcoi_device.so.0 - - /usr/lib/libstdc++.so.6 # [linux] - - /usr/lib64/libstdc++.so.6 # [linux] - # hooray, windows - - "C:\\Windows\\System32\\WINTRUST.dll" requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] + - {{ stdlib('c') }} # [not linux] host: - - tbb {{ tbb_version.split('.')[0] }}.* - run: - - tbb {{ tbb_version.split('.')[0] }}.* + - intel-sycl-rt {{ dal_version.split('.')[0] }}.* + - intel-cmplr-lib-rt {{ dal_version.split('.')[0] }}.* + - tbb-devel {{ tbb_version.split('.')[0] }}.* + # - libuuid # [linux] + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html summary: Intel® oneDAL runtime libraries @@ -609,9 +637,10 @@ outputs: script: repack.bat # [win] number: {{ dal_buildnum|int + dstbuildnum|int }} requirements: + host: + - tbb-devel {{ tbb_version.split('.')[0] }}.* run: - {{ pin_subpackage('dal-include', exact=True) }} - - tbb {{ tbb_version.split('.')[0] }}.* about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html summary: Static libraries for Intel® oneDAL @@ -675,24 +704,12 @@ outputs: number: {{ impi_buildnum|int + dstbuildnum|int }} # [linux or win] build: detect_binary_files_with_prefix: false - missing_dso_whitelist: - # normal linux stuff that would go away if we had libgcc-ng in the run deps - - /lib*/ld-linux.so.2 - - /lib64/ld-linux-x86-64.so.2 - - /lib*/libpthread.so.0 - - /lib*/libdl.so.2 - - /lib*/libgcc_s.so.1 - - /lib*/libc.so.6 - - /lib*/libm.so.6 - - lib/libgcc_s.so.1 - # these two really shouldn't be here. See mkl_repack_and_patchelf.sh - - libiomp5.so - - libcoi_device.so.0 - - /usr/lib/libstdc++.so.6 # [linux] - - /usr/lib64/libstdc++.so.6 # [linux] - # hooray, windows - - "C:\\Windows\\System32\\WINTRUST.dll" requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - {{ stdlib('c') }} + - {{ openmp_pkg }} run: - mpi 1.0 impi about: From adda76b546c278d3da9bec70dafa6a918b9a6887 Mon Sep 17 00:00:00 2001 From: Yevhenii Havrylko Date: Wed, 6 Nov 2024 23:48:04 +0000 Subject: [PATCH 10/15] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.0, and conda-forge-pinning 2024.11.06.14.03.29 --- .azure-pipelines/azure-pipelines-linux.yml | 8 +- .../linux_64_python3.10.____cpython.yaml | 23 +++- .../linux_64_python3.11.____cpython.yaml | 23 +++- .../linux_64_python3.12.____cpython.yaml | 23 +++- .../linux_64_python3.9.____cpython.yaml | 23 +++- .../win_64_python3.10.____cpython.yaml | 8 +- .../win_64_python3.11.____cpython.yaml | 8 +- .../win_64_python3.12.____cpython.yaml | 8 +- .ci_support/win_64_python3.9.____cpython.yaml | 8 +- README.md | 130 +++++++++--------- 10 files changed, 181 insertions(+), 81 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3db01d7..9c7c55d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,19 +11,19 @@ jobs: linux_64_python3.10.____cpython: CONFIG: linux_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-alma-x86_64:8 linux_64_python3.11.____cpython: CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-alma-x86_64:8 linux_64_python3.12.____cpython: CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-alma-x86_64:8 linux_64_python3.9.____cpython: CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-alma-x86_64:8 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 32f08a5..22423f1 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,13 +1,27 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_sycl_version: +- '2.28' +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-alma-x86_64:8 mkl: -- '2023' +- '2025' pin_run_as_build: python: min_pin: x.x @@ -16,3 +30,8 @@ python: - 3.10.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index d4dfade..b0c9847 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,13 +1,27 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_sycl_version: +- '2.28' +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-alma-x86_64:8 mkl: -- '2023' +- '2025' pin_run_as_build: python: min_pin: x.x @@ -16,3 +30,8 @@ python: - 3.11.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index 47d4e61..862784d 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,13 +1,27 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_sycl_version: +- '2.28' +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-alma-x86_64:8 mkl: -- '2023' +- '2025' pin_run_as_build: python: min_pin: x.x @@ -16,3 +30,8 @@ python: - 3.12.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 81feb1f..793f4b1 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,13 +1,27 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_sycl_version: +- '2.28' +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-alma-x86_64:8 mkl: -- '2023' +- '2025' pin_run_as_build: python: min_pin: x.x @@ -16,3 +30,8 @@ python: - 3.9.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index e0ce6e7..1b7da20 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -1,9 +1,15 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- vs2019 mkl: -- '2023' +- '2025' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index 760bea1..7aa3c7e 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -1,9 +1,15 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- vs2019 mkl: -- '2023' +- '2025' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 3ad3b03..aaee4b7 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -1,9 +1,15 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- vs2019 mkl: -- '2023' +- '2025' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 40edb09..cfbdf89 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -1,9 +1,15 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- vs2019 mkl: -- '2023' +- '2025' pin_run_as_build: python: min_pin: x.x diff --git a/README.md b/README.md index abacbd6..f13f0d3 100644 --- a/README.md +++ b/README.md @@ -115,86 +115,83 @@ CPUs, GPUs, and FPGAs. This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About dal-devel ---------------- +About onemkl-sycl-blas +---------------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Devel package for building against Intel® oneDAL shared libraries +Summary: Intel® oneAPI Math Kernel Library runtime libraries -Documentation: http://oneapi-src.github.io/oneDAL/ +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html -Intel® oneAPI Data Analytics Library (Intel® oneDAL) is the library of Intel® architecture -optimized building blocks covering all stages of data analytics: data acquisition from a data -source, preprocessing, transformation, data mining, modeling, validation, and decision making. +Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About dal-static ----------------- +About onemkl-sycl-datafitting +----------------------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Static libraries for Intel® oneDAL +Summary: Intel® oneAPI Math Kernel Library runtime libraries -Documentation: http://oneapi-src.github.io/oneDAL/ +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html -Intel® oneAPI Data Analytics Library (Intel® oneDAL) is the library of Intel® architecture -optimized building blocks covering all stages of data analytics: data acquisition from a data -source, preprocessing, transformation, data mining, modeling, validation, and decision making. +Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About impi-devel ----------------- +About onemkl-sycl-dft +--------------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/mpi-library.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Devel package for building against Intel® MPI libraries +Summary: Intel® oneAPI Math Kernel Library runtime libraries -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/mpi-library.html +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html -Intel® MPI Library is a multifabric message-passing library that implements the open -source MPICH specification. Use the library to create, maintain, and test advanced, -complex applications that perform better on HPC clusters based on Intel® and -compatible processors. +Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About mkl-devel ---------------- +About onemkl-sycl-rng +--------------------- Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Devel package for building against Intel® oneMKL libraries +Summary: Intel® oneAPI Math Kernel Library runtime libraries -Intel® oneAPI Math Kernel Library headers and libraries for developing software that uses oneMKL +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html + +Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About mkl-static ----------------- +About onemkl-sycl-stats +----------------------- Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Static libraries for Intel® oneMKL libraries +Summary: Intel® oneAPI Math Kernel Library runtime libraries -Intel® oneAPI Math Kernel Library static libraries for developing software that uses oneMKL +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html + +Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-blas ----------------------- +About onemkl-sycl-vm +-------------------- Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html @@ -208,78 +205,81 @@ Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numeric This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-datafitting ------------------------------ +About dal-devel +--------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Intel® oneAPI Math Kernel Library runtime libraries +Summary: Devel package for building against Intel® oneDAL shared libraries -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Documentation: http://oneapi-src.github.io/oneDAL/ -Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs +Intel® oneAPI Data Analytics Library (Intel® oneDAL) is the library of Intel® architecture +optimized building blocks covering all stages of data analytics: data acquisition from a data +source, preprocessing, transformation, data mining, modeling, validation, and decision making. This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-dft ---------------------- +About dal-static +---------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Intel® oneAPI Math Kernel Library runtime libraries +Summary: Static libraries for Intel® oneDAL -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Documentation: http://oneapi-src.github.io/oneDAL/ -Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs +Intel® oneAPI Data Analytics Library (Intel® oneDAL) is the library of Intel® architecture +optimized building blocks covering all stages of data analytics: data acquisition from a data +source, preprocessing, transformation, data mining, modeling, validation, and decision making. This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-rng ---------------------- +About impi-devel +---------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/mpi-library.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Intel® oneAPI Math Kernel Library runtime libraries +Summary: Devel package for building against Intel® MPI libraries -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/mpi-library.html -Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs +Intel® MPI Library is a multifabric message-passing library that implements the open +source MPICH specification. Use the library to create, maintain, and test advanced, +complex applications that perform better on HPC clusters based on Intel® and +compatible processors. This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-stats ------------------------ +About mkl-devel +--------------- Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Intel® oneAPI Math Kernel Library runtime libraries - -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Summary: Devel package for building against Intel® oneMKL libraries -Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs +Intel® oneAPI Math Kernel Library headers and libraries for developing software that uses oneMKL This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-vm --------------------- +About mkl-static +---------------- Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Intel® oneAPI Math Kernel Library runtime libraries - -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Summary: Static libraries for Intel® oneMKL libraries -Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs +Intel® oneAPI Math Kernel Library static libraries for developing software that uses oneMKL This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. From 5b0f53f164f4019f7f7ccaaa9ee88c5ecb1ddad6 Mon Sep 17 00:00:00 2001 From: Yevhenii Havrylko Date: Thu, 7 Nov 2024 16:55:20 +0000 Subject: [PATCH 11/15] Add mkl to onemkl dependency and fix windows CI --- conda-forge.yml | 6 ++++ recipe/meta.yaml | 85 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 2f501ce..3e5b704 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,9 @@ +azure: + settings_win: + variables: + CONDA_BLD_PATH: C:\\bld\\ + SET_PAGEFILE: "True" + MINIFORGE_HOME: C:\Miniforge conda_forge_output_validation: true github: branch_name: main diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 778d374..4b19fd3 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -141,8 +141,9 @@ outputs: - {{ stdlib('c') }} # [not linux] - {{ openmp_mutex }} host: - - dpcpp-cpp-rt {{ dal_version.split('.')[0] }}.* - tbb-devel {{ tbb_version.split('.')[0] }}.* + run: + - {{ openmp_mutex }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -194,10 +195,20 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} host: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -226,10 +237,20 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} host: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -258,10 +279,20 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} host: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -294,8 +325,18 @@ outputs: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} - {{ pin_subpackage('onemkl-sycl-blas', exact=True) }} run: + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} - {{ pin_subpackage('onemkl-sycl-blas', exact=True) }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html @@ -325,10 +366,20 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} host: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -362,8 +413,18 @@ outputs: - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] - {{ pin_subpackage('onemkl-sycl-blas', exact=True) }} + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} run: - {{ pin_subpackage('onemkl-sycl-blas', exact=True) }} + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -396,6 +457,17 @@ outputs: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} + run: + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -428,6 +500,17 @@ outputs: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} + run: + # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but + # not linked directly so you can chose different implementations. + # More information could be found at: + # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html + - {{ pin_subpackage('mkl', exact=True) }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 From 8986bfdf5aa63e0cc38c711863138f8088995c77 Mon Sep 17 00:00:00 2001 From: Yevhenii Havrylko Date: Thu, 7 Nov 2024 21:20:20 +0000 Subject: [PATCH 12/15] Update openmp/mkl metadata and fix windows CI --- conda-forge.yml | 1 + recipe/meta.yaml | 80 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 58 insertions(+), 23 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 3e5b704..826dba0 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,4 +1,5 @@ azure: + free_disk_space: true settings_win: variables: CONDA_BLD_PATH: C:\\bld\\ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4b19fd3..b432b29 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,12 +45,11 @@ # More info about OpenMP mutex could be found on conda-forge wiki: # https://conda-forge.org/docs/maintainer/knowledge_base/#openmp {% set openmp_pkg ="llvm-openmp" %} -{% set openmp_mutex ="_openmp_mutex * *_llvm" %} +{% set openmp_mutex ="- _openmp_mutex * *_llvm" %} {% if win or 'conda-forge' not in my_channel_targets %} {% set openmp_pkg ="intel-openmp " ~ openmp_version.split('.')[0] ~ ".*" %} -# we don't need openmp, and there is no mutex on windows, so we are -# forced to use intel-openmp package as dependency -{% set openmp_mutex ="intel-openmp " ~ openmp_version.split('.')[0] ~ ".*" %} +# There is no mutex for intel-openmp, so we don't need it +{% set openmp_mutex ="" %} {% endif %} package: @@ -139,11 +138,10 @@ outputs: - {{ compiler('cxx') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] - - {{ openmp_mutex }} + - {{ openmp_pkg }} + {{ openmp_mutex }} host: - tbb-devel {{ tbb_version.split('.')[0] }}.* - run: - - {{ openmp_mutex }} about: home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html license: LicenseRef-IntelSimplifiedSoftwareOct2022 @@ -195,15 +193,20 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + {{ openmp_mutex }} + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + # cpu runtime + - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + {{ openmp_mutex }} + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but # not linked directly so you can chose different implementations. # More information could be found at: # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html - {{ pin_subpackage('mkl', exact=True) }} - host: - - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - - ocl-icd # [linux] - - khronos-opencl-icd-loader # [win] + run: # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but # not linked directly so you can chose different implementations. # More information could be found at: @@ -237,15 +240,20 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + {{ openmp_mutex }} + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + # cpu runtime + - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + {{ openmp_mutex }} + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but # not linked directly so you can chose different implementations. # More information could be found at: # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html - {{ pin_subpackage('mkl', exact=True) }} - host: - - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - - ocl-icd # [linux] - - khronos-opencl-icd-loader # [win] + run: # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but # not linked directly so you can chose different implementations. # More information could be found at: @@ -279,15 +287,20 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + {{ openmp_mutex }} + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + # cpu runtime + - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + {{ openmp_mutex }} + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but # not linked directly so you can chose different implementations. # More information could be found at: # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html - {{ pin_subpackage('mkl', exact=True) }} - host: - - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - - ocl-icd # [linux] - - khronos-opencl-icd-loader # [win] + run: # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but # not linked directly so you can chose different implementations. # More information could be found at: @@ -321,8 +334,12 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + {{ openmp_mutex }} host: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + # cpu runtime + - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + {{ openmp_mutex }} - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but @@ -366,15 +383,20 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + {{ openmp_mutex }} + host: + - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + # cpu runtime + - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + {{ openmp_mutex }} + - ocl-icd # [linux] + - khronos-opencl-icd-loader # [win] # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but # not linked directly so you can chose different implementations. # More information could be found at: # https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2025-0/layered-model-concept.html - {{ pin_subpackage('mkl', exact=True) }} - host: - - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* - - ocl-icd # [linux] - - khronos-opencl-icd-loader # [win] + run: # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but # not linked directly so you can chose different implementations. # More information could be found at: @@ -408,8 +430,12 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + {{ openmp_mutex }} host: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + # cpu runtime + - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + {{ openmp_mutex }} - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] - {{ pin_subpackage('onemkl-sycl-blas', exact=True) }} @@ -453,8 +479,12 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + {{ openmp_mutex }} host: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + # cpu runtime + - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + {{ openmp_mutex }} - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but @@ -496,8 +526,12 @@ outputs: - {{ compiler('c') }} - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }} # [linux] - {{ stdlib('c') }} # [not linux] + {{ openmp_mutex }} host: - intel-sycl-rt {{ mkl_version.split('.')[0] }}.* + # cpu runtime + - intel-opencl-rt {{ mkl_version.split('.')[0] }}.* + {{ openmp_mutex }} - ocl-icd # [linux] - khronos-opencl-icd-loader # [win] # We need mkl because onemkl-sycl-* packages uses symbols from mkl, but From 50cddeaf52c705c8054b540dae697eaf1c134a63 Mon Sep 17 00:00:00 2001 From: Yevhenii Havrylko Date: Thu, 7 Nov 2024 21:27:05 +0000 Subject: [PATCH 13/15] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.2, and conda-forge-pinning 2024.11.07.16.38.57 --- .azure-pipelines/azure-pipelines-linux.yml | 21 ++++ .azure-pipelines/azure-pipelines-win.yml | 5 +- README.md | 130 ++++++++++----------- 3 files changed, 89 insertions(+), 67 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 9c7c55d..13b33cf 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -28,6 +28,27 @@ jobs: variables: {} steps: + - script: | + sudo mkdir -p /opt/empty_dir || true + for d in \ + /opt/ghc \ + /opt/hostedtoolcache \ + /usr/lib/jvm \ + /usr/local/.ghcup \ + /usr/local/lib/android \ + /usr/local/share/powershell \ + /usr/share/dotnet \ + /usr/share/swift \ + ; do + sudo rsync --stats -a --delete /opt/empty_dir/ $d || true + done + sudo apt-get purge -y -f firefox \ + google-chrome-stable \ + microsoft-edge-stable + sudo apt-get autoremove -y >& /dev/null + sudo apt-get autoclean -y >& /dev/null + df -h + displayName: Manage disk space # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a6d3fd..a41d96d 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -22,8 +22,9 @@ jobs: UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: - CONDA_BLD_PATH: D:\\bld\\ - MINIFORGE_HOME: D:\Miniforge + CONDA_BLD_PATH: C:\\bld\\ + MINIFORGE_HOME: C:\Miniforge + SET_PAGEFILE: 'True' UPLOAD_TEMP: D:\\tmp steps: diff --git a/README.md b/README.md index f13f0d3..abacbd6 100644 --- a/README.md +++ b/README.md @@ -115,83 +115,86 @@ CPUs, GPUs, and FPGAs. This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-blas ----------------------- +About dal-devel +--------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Intel® oneAPI Math Kernel Library runtime libraries +Summary: Devel package for building against Intel® oneDAL shared libraries -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Documentation: http://oneapi-src.github.io/oneDAL/ -Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs +Intel® oneAPI Data Analytics Library (Intel® oneDAL) is the library of Intel® architecture +optimized building blocks covering all stages of data analytics: data acquisition from a data +source, preprocessing, transformation, data mining, modeling, validation, and decision making. This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-datafitting ------------------------------ +About dal-static +---------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Intel® oneAPI Math Kernel Library runtime libraries +Summary: Static libraries for Intel® oneDAL -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Documentation: http://oneapi-src.github.io/oneDAL/ -Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs +Intel® oneAPI Data Analytics Library (Intel® oneDAL) is the library of Intel® architecture +optimized building blocks covering all stages of data analytics: data acquisition from a data +source, preprocessing, transformation, data mining, modeling, validation, and decision making. This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-dft ---------------------- +About impi-devel +---------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/mpi-library.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Intel® oneAPI Math Kernel Library runtime libraries +Summary: Devel package for building against Intel® MPI libraries -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/mpi-library.html -Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs +Intel® MPI Library is a multifabric message-passing library that implements the open +source MPICH specification. Use the library to create, maintain, and test advanced, +complex applications that perform better on HPC clusters based on Intel® and +compatible processors. This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-rng ---------------------- +About mkl-devel +--------------- Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Intel® oneAPI Math Kernel Library runtime libraries - -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Summary: Devel package for building against Intel® oneMKL libraries -Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs +Intel® oneAPI Math Kernel Library headers and libraries for developing software that uses oneMKL This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-stats ------------------------ +About mkl-static +---------------- Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Intel® oneAPI Math Kernel Library runtime libraries - -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html +Summary: Static libraries for Intel® oneMKL libraries -Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs +Intel® oneAPI Math Kernel Library static libraries for developing software that uses oneMKL This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About onemkl-sycl-vm --------------------- +About onemkl-sycl-blas +---------------------- Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html @@ -205,81 +208,78 @@ Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numeric This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About dal-devel ---------------- +About onemkl-sycl-datafitting +----------------------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Devel package for building against Intel® oneDAL shared libraries +Summary: Intel® oneAPI Math Kernel Library runtime libraries -Documentation: http://oneapi-src.github.io/oneDAL/ +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html -Intel® oneAPI Data Analytics Library (Intel® oneDAL) is the library of Intel® architecture -optimized building blocks covering all stages of data analytics: data acquisition from a data -source, preprocessing, transformation, data mining, modeling, validation, and decision making. +Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About dal-static ----------------- +About onemkl-sycl-dft +--------------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onedal.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Static libraries for Intel® oneDAL +Summary: Intel® oneAPI Math Kernel Library runtime libraries -Documentation: http://oneapi-src.github.io/oneDAL/ +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html -Intel® oneAPI Data Analytics Library (Intel® oneDAL) is the library of Intel® architecture -optimized building blocks covering all stages of data analytics: data acquisition from a data -source, preprocessing, transformation, data mining, modeling, validation, and decision making. +Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About impi-devel ----------------- +About onemkl-sycl-rng +--------------------- -Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/mpi-library.html +Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Devel package for building against Intel® MPI libraries +Summary: Intel® oneAPI Math Kernel Library runtime libraries -Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/mpi-library.html +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html -Intel® MPI Library is a multifabric message-passing library that implements the open -source MPICH specification. Use the library to create, maintain, and test advanced, -complex applications that perform better on HPC clusters based on Intel® and -compatible processors. +Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About mkl-devel ---------------- +About onemkl-sycl-stats +----------------------- Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Devel package for building against Intel® oneMKL libraries +Summary: Intel® oneAPI Math Kernel Library runtime libraries -Intel® oneAPI Math Kernel Library headers and libraries for developing software that uses oneMKL +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html + +Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. -About mkl-static ----------------- +About onemkl-sycl-vm +-------------------- Home: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html Package license: LicenseRef-IntelSimplifiedSoftwareOct2022 -Summary: Static libraries for Intel® oneMKL libraries +Summary: Intel® oneAPI Math Kernel Library runtime libraries -Intel® oneAPI Math Kernel Library static libraries for developing software that uses oneMKL +Documentation: https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html + +Intel® oneAPI Math Kernel Library is Intel®-Optimized Math Library for Numerical Computing on CPUs & GPUs This package is a repackaged set of binaries obtained directly from Intel\'s anaconda.org channel. From 6a410947aae527e9fd2011f5cb9b16b6e2d130e2 Mon Sep 17 00:00:00 2001 From: Yevhenii Havrylko Date: Thu, 7 Nov 2024 21:28:47 +0000 Subject: [PATCH 14/15] Reset build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b432b29..ced6992 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,7 +36,7 @@ {% set intel_ch = "https://software.repos.intel.com/python/conda" %} # use this if our build script changes and we need to increment beyond intel's version -{% set dstbuildnum = '1' %} +{% set dstbuildnum = '0' %} # We need intel-openmp because it contains VCOMP symbols on windows in order to # pytorch work. Those are deprecated symbols and should be removed in the From 462540bf2bc86a600f7be112379d6def0ce68859 Mon Sep 17 00:00:00 2001 From: Yevhenii Havrylko Date: Thu, 7 Nov 2024 23:16:06 +0000 Subject: [PATCH 15/15] Remove openmp constraint from onemkl-sycl-* --- recipe/meta.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ced6992..ba62944 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -187,6 +187,9 @@ outputs: version: {{ mkl_version }} script: repack.sh # [linux] script: repack.bat # [win] + build: + ignore_run_exports_from: + {{ openmp_mutex }} number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: build: @@ -234,6 +237,9 @@ outputs: version: {{ mkl_version }} script: repack.sh # [linux] script: repack.bat # [win] + build: + ignore_run_exports_from: + {{ openmp_mutex }} number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: build: @@ -281,6 +287,9 @@ outputs: version: {{ mkl_version }} script: repack.sh # [linux] script: repack.bat # [win] + build: + ignore_run_exports_from: + {{ openmp_mutex }} number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: build: @@ -328,6 +337,9 @@ outputs: version: {{ mkl_version }} script: repack.sh # [linux] script: repack.bat # [win] + build: + ignore_run_exports_from: + {{ openmp_mutex }} number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: build: @@ -377,6 +389,9 @@ outputs: version: {{ mkl_version }} script: repack.sh # [linux] script: repack.bat # [win] + build: + ignore_run_exports_from: + {{ openmp_mutex }} number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: build: @@ -424,6 +439,9 @@ outputs: version: {{ mkl_version }} script: repack.sh # [linux] script: repack.bat # [win] + build: + ignore_run_exports_from: + {{ openmp_mutex }} number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: build: @@ -473,6 +491,9 @@ outputs: version: {{ mkl_version }} script: repack.sh # [linux] script: repack.bat # [win] + build: + ignore_run_exports_from: + {{ openmp_mutex }} number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: build: @@ -520,6 +541,9 @@ outputs: version: {{ mkl_version }} script: repack.sh # [linux] script: repack.bat # [win] + build: + ignore_run_exports_from: + {{ openmp_mutex }} number: {{ mkl_buildnum|int + dstbuildnum|int }} requirements: build:
VariantStatus
linux_64linux_64_python3.10.____cpython - variant + variant
win_64linux_64_python3.11.____cpython - variant + variant + +
linux_64_python3.12.____cpython + + variant + +
linux_64_python3.9.____cpython + + variant + +
win_64_python3.10.____cpython + + variant + +
win_64_python3.11.____cpython + + variant + +
win_64_python3.12.____cpython + + variant + +
win_64_python3.9.____cpython + + variant