From 3a89a480440776b5576143bbdfd36cb9bbf630a4 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:04:06 -0700
Subject: [PATCH] CI: conda channel reconfiguration (#1932) (#1945)

* CI: miniconda to miniforge

* CI: conda channel reconfiguration

* additional intel cleanup

* remove defaults

* removed remove intel

* miniconda

* additional yml intel removals

* trying with updated intel channel

* forcing numpy<2 for dpnp compatibility

* forcing numpy<2 for dpnp compatibility

* trying without dpnp for 3.10

* remove dpctl on 3.10 as well

(cherry picked from commit f3d39a535b01adb7a546350914ef7ab2ea82446e)

# Conflicts:
#	.ci/pipeline/build-and-test-lnx.yml

Co-authored-by: ethanglaser <42726565+ethanglaser@users.noreply.github.com>
Co-authored-by: Nikolay Petrov <nikolay.a.petrov@intel.com>
---
 .ci/pipeline/build-and-test-lnx.yml | 6 ++++--
 .ci/pipeline/build-and-test-win.yml | 2 +-
 .ci/pipeline/nightly.yml            | 2 +-
 .ci/pipeline/release.yml            | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.ci/pipeline/build-and-test-lnx.yml b/.ci/pipeline/build-and-test-lnx.yml
index cfcc41ad30..c503b942fc 100644
--- a/.ci/pipeline/build-and-test-lnx.yml
+++ b/.ci/pipeline/build-and-test-lnx.yml
@@ -23,8 +23,10 @@ steps:
       bash .ci/scripts/describe_system.sh
     displayName: "System info"
   - script: |
+      conda config --add channels conda-forge
+      conda config --set channel_priority strict
       conda update -y -q conda
-      conda create -q -y -n CB -c conda-forge python=$(PYTHON_VERSION) intel::dal-devel mpich pyyaml "dpcpp-cpp-rt=2024.2.0"
+      conda create -q -y -n CB -c conda-forge python=$(PYTHON_VERSION) dal-devel mpich pyyaml "dpcpp-cpp-rt=2024.2.0"
     displayName: "Conda create"
   - script: |
       . /usr/share/miniconda/etc/profile.d/conda.sh
@@ -46,7 +48,7 @@ steps:
       bash .ci/scripts/setup_sklearn.sh $(SKLEARN_VERSION)
       pip install --upgrade -r requirements-test.txt
       pip install $(python .ci/scripts/get_compatible_scipy_version.py)
-      if [ $(echo $(PYTHON_VERSION) | grep '3.9\|3.10') ] && [ $(SKLEARN_VERSION) != "1.0" ]; then conda install -q -y -c intel dpctl=0.16.0 dpnp=0.14.0; fi
+      if [ $(echo $(PYTHON_VERSION) | grep '3.9\|3.11') ] && [ $(SKLEARN_VERSION) != "1.0" ]; then conda install -q -y -c https://software.repos.intel.com/python/conda/ dpctl=0.17.0 dpnp=0.15.0; fi
       pip list
     displayName: "Install testing requirements"
   - script: |
diff --git a/.ci/pipeline/build-and-test-win.yml b/.ci/pipeline/build-and-test-win.yml
index 0d1ae6fd89..13b7986aaa 100644
--- a/.ci/pipeline/build-and-test-win.yml
+++ b/.ci/pipeline/build-and-test-win.yml
@@ -16,7 +16,7 @@
 steps:
   - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
     displayName: Add conda to PATH
-  - script: conda create -q -y -n CB -c conda-forge -c intel python=$(PYTHON_VERSION) intel::dal-devel impi-devel clang-format pyyaml
+  - script: conda create -q -y -n CB -c conda-forge python=$(PYTHON_VERSION) dal-devel impi-devel clang-format pyyaml
     displayName: 'Create Anaconda environment'
   - script: |
       call activate CB
diff --git a/.ci/pipeline/nightly.yml b/.ci/pipeline/nightly.yml
index f425e14787..56a58eba78 100644
--- a/.ci/pipeline/nightly.yml
+++ b/.ci/pipeline/nightly.yml
@@ -64,7 +64,7 @@ jobs:
       conda config --append channels conda-forge
       conda config --remove channels defaults
       conda update -y -q conda
-      conda create -y -q -n CB -c intel -c conda-forge python=$(python.version) dal-devel impi-devel
+      conda create -y -q -n CB -c conda-forge python=$(python.version) dal-devel impi-devel
     displayName: 'Conda create'
   - script: |
       bash .ci/scripts/describe_system.sh
diff --git a/.ci/pipeline/release.yml b/.ci/pipeline/release.yml
index c4f611ddb8..f7557db732 100644
--- a/.ci/pipeline/release.yml
+++ b/.ci/pipeline/release.yml
@@ -45,7 +45,7 @@ jobs:
     displayName: 'Sklearn testing'
 - job: GeneratorConda
   steps:
-  - bash: python .ci/scripts/gen_release_jobs.py --channels intel conda-forge
+  - bash: python .ci/scripts/gen_release_jobs.py --channels conda-forge
     name: MatrixGen
 - job: ReleaseConda
   dependsOn: GeneratorConda