From c195f0bb1bcb67b22b54c6f4015462910a9c04e3 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Mon, 11 Dec 2023 19:01:59 -0600 Subject: [PATCH] Stay away from 2024.0.1 compiler package for now --- .github/workflows/conda-package.yml | 4 +++- conda-recipe/meta.yaml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 2bde4d7ccb..b69c78bcf8 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -448,6 +448,8 @@ jobs: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- - name: Install example requirements shell: bash -l {0} + env: + DPCPP_CMPLR: dpcpp_linux-64">=2024.0.0,<2024.0.1" run: | CHANNELS="${{ env.CHANNELS }}" . $CONDA/etc/profile.d/conda.sh @@ -456,7 +458,7 @@ jobs: conda install -n examples -y ninja $CHANNELS || exit 1 conda install -n examples -y pybind11 cython scikit-build $CHANNELS || exit 1 conda install -n examples -y mkl-dpcpp mkl-devel-dpcpp dpcpp_cpp_rt $CHANNELS || exit 1 - conda create -y -n build_env $CHANNELS gcc_linux-64 gxx_linux-64 dpcpp_linux-64 sysroot_linux-64">=2.28" + conda create -y -n build_env $CHANNELS gcc_linux-64 gxx_linux-64 ${{ env.DPCPP_CMPLR }} sysroot_linux-64">=2.28" - name: Install dpctl shell: bash -l {0} run: | diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 9e96e43135..fee3c311c6 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,4 +1,5 @@ {% set required_compiler_version = "2024.0" %} +{% set max_compiler_version = "2024.0.1" %} package: name: dpctl @@ -16,7 +17,7 @@ build: requirements: build: - {{ compiler('cxx') }} - - {{ compiler('dpcpp') }} >={{ required_compiler_version }} # [not osx] + - {{ compiler('dpcpp') }} >={{ required_compiler_version }},<{{ max_compiler_version }} # [not osx] - sysroot_linux-64 >=2.28 # [linux] host: - setuptools