Fixes and tests enabling

numba · Jul 25, 2024 · 5bf2e19 · 5bf2e19
1 parent 74c2aa9
commit 5bf2e19
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -358,7 +358,7 @@ jobs:
           $env:CXX="cl.exe"
           $env:CC="cl.exe"
           $env:VSCMD_DEBUG = 3
-          conda mambabuild --output-folder=. ../numba_mlir/conda-recipe --python=${{ matrix.python }} -c conda-forge -c numba -c https://software.repos.intel.com/python/conda/ --override-channels
+          conda mambabuild --output-folder=. ../numba_mlir/conda-recipe --python=${{ matrix.python }} -c conda-forge -c numba -c https://software.repos.intel.com/python/conda/
           cd win-64
           ls .
           popd
@@ -568,7 +568,6 @@ jobs:
 
 
       - name: Run offload tests
-        if: false # Re-enable after packages update to 2024.2
         shell: bash -l {0}
 
         run: |
@@ -680,7 +679,8 @@ jobs:
           export LLVM_PATH=/home/runner/work/llvm-mlir/_mlir_install
           export LEVEL_ZERO_VERSION_CHECK_OFF=1
           export NUMBA_MLIR_USE_SYCL=ON
-          conda mambabuild --output-folder=. ../numba_mlir/conda-recipe --python=${{ matrix.python }} -c conda-forge -c numba -c https://software.repos.intel.com/python/conda/ --override-channels || exit 1
+          # conda mambabuild --output-folder=. ../numba_mlir/conda-recipe --python=${{ matrix.python }} -c conda-forge -c numba -c https://software.repos.intel.com/python/conda/ || exit 1
+          conda mambabuild --output-folder=. ../numba_mlir/conda-recipe --python=${{ matrix.python }} || exit 1
           cd linux-64
           ls -l --block-size=M
           popd

diff --git a/README.md b/README.md
@@ -47,9 +47,9 @@ ninja install
 Building and testing Python package
 ```Bash
 cd numba_mlir
-conda create -n test-env python=3.11 dpcpp_linux-64=2024.2 --file ../scripts/numba-mlir.env -c conda-forge
+conda create -n test-env python=3.11 --file ../scripts/numba-mlir.env -c conda-forge
 conda activate test-env
-conda install --file ../scripts/mkl.env -c https://software.repos.intel.com/python/conda/
+conda install dpcpp_linux-64=2024.2 --file ../scripts/mkl.env -c https://software.repos.intel.com/python/conda/
 export LLVM_PATH=<...>/llvm-install
 export NUMBA_MLIR_USE_SYCL=ON # Optional
 python setup.py develop

diff --git a/numba_mlir/conda-recipe/conda_build_config.yaml b/numba_mlir/conda-recipe/conda_build_config.yaml
@@ -3,6 +3,6 @@ cxx_compiler:
 numpy:
   - 1.23
 pin_run_as_build:
+  https://software.repos.intel.com/python/conda/::dpcpp-cpp-rt: x.x
   mkl: x.x
   mkl-dpcpp: x.x
-  conda-forge::dpcpp-cpp-rt: x.x
diff --git a/numba_mlir/conda-recipe/meta.yaml b/numba_mlir/conda-recipe/meta.yaml
@@ -18,6 +18,7 @@ build:
 requirements:
     build:
         - conda-forge::{{ compiler('cxx') }}
+        - https://software.repos.intel.com/python/conda/::dpcpp-cpp-rt {{ dpcpp_version }}
         - https://software.repos.intel.com/python/conda/::{{ compiler('dpcpp') }}  =2024.2  # [not osx]
         - sysroot_linux-64 >=2.17  # [linux]
         - cmake >=3.23
@@ -27,7 +28,7 @@ requirements:
         - https://software.repos.intel.com/python/conda/::mkl-devel-dpcpp {{ dpcpp_version }}
         - https://software.repos.intel.com/python/conda/::mkl {{ dpcpp_version }}
         - https://software.repos.intel.com/python/conda/::mkl-dpcpp {{ dpcpp_version }}
-        - conda-forge::dpcpp-cpp-rt {{ dpcpp_version }}
+        - https://software.repos.intel.com/python/conda/::dpcpp-cpp-rt {{ dpcpp_version }}
         - tbb-devel >=2021.6.0
         - level-zero-devel
         - numba >=0.59.1, <0.60