Cleanups

.github/workflows/build.yml

@@ -29,18 +29,6 @@ jobs:
     timeout-minutes: 450
 
     steps:
-      # - name: msvc env
-      #   shell: cmd
-      #   run: |
-      #     ${{ '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"' }}
-      # - uses: ilammy/msvc-dev-cmd@v1
-      #   with:
-      #     vsversion : "2019"
-      # - uses: microsoft/setup-msbuild@v2
-      #   with:
-      #     msbuild-architecture: x64
-      #     vs-version: '[16.9,17)'
-
       - name: Disable Defender
         shell: powershell
         run: |
@@ -99,7 +87,6 @@ jobs:
           pushd $env:vcvarsPath
           ./vcvars.ps1
           popd
-          gci env:* | sort-object name
           conda list
           cd $env:WORKSPACE
           mkdir -ea 0 -p llvm-mlir
@@ -214,7 +201,6 @@ jobs:
           ./vcvars.ps1
           popd
           cd numba_mlir
-          # conda create -y -n test-env python=${{ matrix.python }} "pip>=22" numba=0.59.1 numpy=1.24 "setuptools<65.6" scikit-learn pytest-xdist ninja scipy pybind11 pytest "tbb>=$env:TBB_VER" "tbb-devel>=$env:TBB_VER" cmake https://software.repos.intel.com/python/conda/::mkl https://software.repos.intel.com/python/conda/::mkl-devel "https://software.repos.intel.com/python/conda/::mkl-devel-dpcpp=2024.1" zlib "conda-forge::dpcpp_win-64=2024.1" level-zero-devel -c conda-forge -c numba -c https://software.repos.intel.com/python/conda/ --override-channels
           conda create -y -n test-env python=${{ matrix.python }} "dpcpp_win-64=2024.1" --file ../scripts/numba-mlir.env -c conda-forge
           conda info
           conda activate test-env
@@ -291,7 +277,6 @@ jobs:
 
         run: |
           cd numba_mlir_wheels
-          # conda create -y -n wheels-test-env python=${{ matrix.python }} numba=0.59.1 numpy=1.24 scikit-learn pytest-xdist scipy pytest "tbb>=$env:TBB_VER" cmake https://software.repos.intel.com/python/conda/::mkl https://software.repos.intel.com/python/conda/::mkl-devel "https://software.repos.intel.com/python/conda/::mkl-devel-dpcpp=2024.1" "conda-forge::dpcpp_win-64=2024.1" -c conda-forge -c numba -c https://software.repos.intel.com/python/conda/ --override-channels
           conda create -y -n wheels-test-env python=${{ matrix.python }} "dpcpp_win-64=2024.1" --file ../scripts/numba-mlir.env -c conda-forge
           conda info
           conda activate wheels-test-env
@@ -355,10 +340,6 @@ jobs:
 
       - name: Build conda package
         run: |
-          # $env:vcvarsPath = (Resolve-Path "$env:GITHUB_WORKSPACE\scripts")
-          # pushd $env:vcvarsPath
-          # ./vcvars.ps1
-          # popd
           conda create -y -n test-env python=${{ matrix.python }} conda-build conda-verify boa -c conda-forge
           conda info
           mkdir numba_mlir_conda
@@ -559,7 +540,6 @@ jobs:
 
         run: |
           cd numba_mlir
-          # conda create -y -n test-env python=${{ matrix.python }} "pip>=22" numba=0.59.1 numpy=1.24 "setuptools<65.6" scikit-learn pytest-xdist ninja scipy pybind11 pytest "tbb>=${TBB_VER}" "tbb-devel>=${TBB_VER}" cmake https://software.repos.intel.com/python/conda/::mkl https://software.repos.intel.com/python/conda/::mkl-devel "https://software.repos.intel.com/python/conda/::mkl-devel-dpcpp=2024.1" zlib "dpcpp_linux-64=2024.1" level-zero-devel -c conda-forge -c numba -c https://software.repos.intel.com/python/conda/ --override-channels
           conda create -y -n test-env python=${{ matrix.python }} "dpcpp_linux-64=2024.1" --file ../scripts/numba-mlir.env -c conda-forge
           conda info
           source $CONDA/bin/activate test-env
@@ -635,7 +615,6 @@ jobs:
 
         run: |
           cd numba_mlir_wheels
-          # conda create -y -n wheels-test-env python=${{ matrix.python }} numba=0.59.1 numpy=1.24 scikit-learn pytest-xdist scipy pytest tbb>=${TBB_VER} cmake https://software.repos.intel.com/python/conda/::mkl https://software.repos.intel.com/python/conda/::mkl-devel "https://software.repos.intel.com/python/conda/::mkl-devel-dpcpp=2024.1" "conda-forge::dpcpp_linux-64=2024.1" -c conda-forge -c numba -c https://software.repos.intel.com/python/conda/ --override-channels
           conda create -y -n wheels-test-env python=${{ matrix.python }} "dpcpp_linux-64=2024.1" --file ../scripts/numba-mlir.env -c conda-forge
           conda info
           source $CONDA/bin/activate wheels-test-env

README.md

@@ -47,8 +47,9 @@ ninja install
 Building and testing Python package
 ```Bash
 cd numba_mlir
-conda create -n test-env python=3.11 numba=0.59.1 numpy=1.24 "setuptools<65.6" scikit-learn pytest-xdist ninja scipy pybind11 pytest lit tbb=2021.11 tbb-devel=2021.11 cmake "intel::mkl-devel-dpcpp=2024.1" conda-forge::dpcpp_linux-64 level-zero-devel -c conda-forge -c https://software.repos.intel.com/python/conda/ -c numba --override-channels
+conda create -n test-env python=3.11 dpcpp_linux-64=2024.2 --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/
 export LLVM_PATH=<...>/llvm-install
 export NUMBA_MLIR_USE_SYCL=ON # Optional
 python setup.py develop

scripts/numba-mlir.env

@@ -10,6 +10,7 @@ pybind11
 pytest
 tbb
 tbb-devel
+lit
 cmake
 zlib
 level-zero-devel

scripts/vcvars.ps1

@@ -1,9 +1,8 @@
 pushd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\"
-cmd /c "vcvars64.bat&set" |
+cmd /c "vcvars64.bat & set" |
 foreach {
   if ($_ -match "=") {
     $v = $_.split("=", 2); set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
   }
 }
 popd
-Write-Host "`nVisual Studio 2019 Command Prompt variables set." -ForegroundColor Yellow