Try one action

ZzEeKkAa · ZzEeKkAa · commit 276f872a1608 · 2023-06-14T17:31:09.000-04:00
diff --git a/.github/workflows/Windows-IntelLLVM_3.26.cmake b/.github/workflows/Windows-IntelLLVM_3.26.cmake
@@ -0,0 +1,68 @@
+# SPDX-FileCopyrightText: 2000 - 2023 Kitware, Inc. and Contributors
+# SPDX-FileCopyrightText: 2022 - 2023 Intel Corporation
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+
+# This module is shared by multiple languages; use include blocker.
+if(__WINDOWS_INTEL_LLVM)
+  return()
+endif()
+set(__WINDOWS_INTEL_LLVM 1)
+
+# Platform/Windows-MSVC adds some linking options icx/ifx do not understand,
+# but that need to be passed to the linker.  Wrap all the linking options from
+# Platform/Windows-MSVC so that the compiler will hand them off to the linker
+# without interpreting them.
+
+# Save original CMAKE_${t}_LINKER_FLAGS_INIT
+foreach(t EXE SHARED MODULE STATIC)
+  set(_saved_cmake_${t}_linker_flags_init ${CMAKE_${t}_LINKER_FLAGS_INIT})
+  set(CMAKE_${t}_LINKER_FLAGS_INIT "")
+endforeach()
+include(Platform/Windows-MSVC)
+# Wrap linker flags from Windows-MSVC
+set(_IntelLLVM_LINKER_WRAPPER_FLAG "/Qoption,link,")
+set(_IntelLLVM_LINKER_WRAPPER_FLAG_SEP ",")
+foreach(t EXE SHARED MODULE STATIC)
+  set(_wrapped_linker_flags "")
+  foreach(flag ${CMAKE_${t}_LINKER_FLAGS_INIT})
+    string(STRIP ${flag} flag)
+    list(APPEND _wrapped_linker_flags "${_IntelLLVM_LINKER_WRAPPER_FLAG}${flag}")
+  endforeach()
+  set(CMAKE_${t}_LINKER_FLAGS_INIT "")
+  list(APPEND CMAKE_${t}_LINKER_FLAGS_INIT
+    ${_saved_cmake_${t}_linker_flags_init} ${_wrapped_linker_flags})
+endforeach()
+
+macro(__windows_compiler_intel lang)
+  __windows_compiler_msvc(${lang})
+
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "${_IntelLLVM_LINKER_WRAPPER_FLAG}")
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP "${_IntelLLVM_LINKER_WRAPPER_FLAG_SEP}")
+  set(CMAKE_${lang}_CREATE_WIN32_EXE "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:windows")
+  set(CMAKE_${lang}_CREATE_CONSOLE_EXE "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:console")
+  set(CMAKE_LINK_DEF_FILE_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/DEF:")
+  set(CMAKE_LIBRARY_PATH_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/LIBPATH:")
+
+  # Features for LINK_LIBRARY generator expression
+  if(MSVC_VERSION GREATER "1900")
+    ## WHOLE_ARCHIVE: Force loading all members of an archive
+    set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:/WHOLEARCHIVE:<LIBRARY>")
+    set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+  endif()
+
+  set(CMAKE_${lang}_LINK_EXECUTABLE
+    "${_CMAKE_VS_LINK_EXE}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} <LINK_FLAGS> <LINK_LIBRARIES> /link /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} ${CMAKE_END_TEMP_FILE}")
+  set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
+    "${_CMAKE_VS_LINK_DLL}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -LD <LINK_FLAGS> <LINK_LIBRARIES> -link /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} ${CMAKE_END_TEMP_FILE}")
+  set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
+  if (NOT "${lang}" STREQUAL "Fortran" OR CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 2022.1)
+    # The Fortran driver does not support -fuse-ld=llvm-lib before compiler version 2022.1
+    set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
+      "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -fuse-ld=llvm-lib -o <TARGET> <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
+  endif()
+
+  set(CMAKE_DEPFILE_FLAGS_${lang} "-QMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
+  set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
+endmacro()
diff --git a/.github/workflows/build_and_run.yml b/.github/workflows/build_and_run.yml
@@ -15,20 +15,31 @@ env:
 
 jobs:
   build_linux:
-    name: Build and run linux
-    runs-on: ubuntu-latest
+    name: Build and run
 
     strategy:
       fail-fast: false
       matrix:
+        os: ["ubuntu-latest", "windows-latest"]
         python: ["3.9", "3.10"]
         sycl: ["sycl","no-sycl"]
+        install: ["pip", "setup.py"]
         include:
           - sycl: sycl
+            os: ubuntu-latest
+            cc: icx
+            cxx: icpx
             environment: conda-linux-sycl.yml
+          - sycl: sycl
+            os: windows-latest
+            cc: icx
+            cxx: icx
+            environment: conda-win-sycl.yml
           - sycl: no-sycl
             environment: conda.yml
 
+    runs-on: ${{matrix.os}}
+
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.6.0
@@ -55,75 +66,8 @@ jobs:
           conda info
           conda list
 
-      - name: Sycl
-        if: matrix.sycl == 'sycl'
-        shell: bash -el {0}
-        run: |
-          sycl-ls
-          echo "CC=icx" >> "$GITHUB_ENV"
-          echo "CXX=icpx" >> "$GITHUB_ENV"
-          echo "DPBENCH_SYCL=1" >> "$GITHUB_ENV"
-          echo "WORKLOADS=$WORKLOADS,sycl" >> "$GITHUB_ENV"
-
-      - name: Build dpbench
-        shell: bash -el {0}
-        run: |
-          pip install \
-          --no-index --no-deps --no-build-isolation -e . -v
-
-      - name: Run benchmarks
-        shell: bash -el {0}
-        run: |
-          export OCL_ICD_FILENAMES=libintelocl.so
-          export NUMBA_MLIR_GPU_RUNTIME=sycl
-          # Turn off numba-dpex autofall back
-          export NUMBA_DPEX_FALLBACK_ON_CPU=0
-          # Make sure numba-dpex is using native atomics in github CI
-          export NUMBA_DPEX_ACTIVATE_ATOMICS_FP_NATIVE=1
-
-          dpbench -i ${WORKLOADS} run -r2 --no-print-results || exit 1
-
-      - name: Generate report
-        shell: bash -el {0}
-        run: |
-          dpbench -i ${WORKLOADS} report || exit 1
-
-  build-windows:
-    name: Build and run windows
-    runs-on: windows-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        python: ["3.9", "3.10"]
-        sycl: ["sycl","no-sycl"]
-        include:
-          - sycl: sycl
-            environment: conda-win-sycl.yml
-          - sycl: no-sycl
-            environment: conda.yml
-
-    steps:
-      - name: Checkout dpbench
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Setup conda
-        uses: conda-incubator/setup-miniconda@v2
-        with:
-          auto-update-conda: true
-          python-version: ${{ matrix.python }}
-          activate-environment: dpbench-dev
-          environment-file: environments/${{ matrix.environment }}
-
-      - name: Conda info
-        shell: pwsh
-        run: |
-          conda info
-          conda list
-
       - name: Configure Intel OpenCL CPU RT
+        if: matrix.os == 'windows-latest'
         shell: pwsh
         run: |
           $script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
@@ -135,38 +79,57 @@ jobs:
           $cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg"
           Get-Content -Tail 5 -Path $cl_cfg
 
-      - name: Sycl
-        if: matrix.sycl == 'sycl'
+      - name: Configure Python
+        if: matrix.os == 'windows-latest'
         shell: pwsh
+        run: |
+          # Set python encoding to support utf-8 symblos like ms.
+          echo "PYTHONIOENCODING=utf-8" >> $env:GITHUB_ENV
+
+      - name: Patch IntelLLVM cmake
+        if: matrix.os == 'windows-latest' && matrix.sycl == 'sycl'
+        shell: pwsh
+        run: |
+          $env:PATCHED_CMAKE_VERSION="3.26"
+          $env:PLATFORM_DIR="${env:CONDA_PREFIX}\Library\share\cmake-${env:PATCHED_CMAKE_VERSION}\Modules\Platform"
+          $env:FN="Windows-IntelLLVM.cmake"
+          Copy-Item ".github\workflows\Windows-IntelLLVM_${env:PATCHED_CMAKE_VERSION}.cmake" "${env:PLATFORM_DIR}\${env:FN}"
+
+      - name: Configure Sycl
+        if: matrix.sycl == 'sycl'
+        shell: bash -el {0}
         run: |
           sycl-ls
-          echo "CC=icx" >> $env:GITHUB_ENV
-          echo "CXX=icx" >> $env:GITHUB_ENV
-          echo "DPBENCH_SYCL=1" >> $env:GITHUB_ENV
-          echo "WORKLOADS=$env:WORKLOADS,sycl" >> $env:GITHUB_ENV
+          echo "CC=${{matrix.cc}}" >> "$GITHUB_ENV"
+          echo "CXX=${{matrix.cxx}}" >> "$GITHUB_ENV"
+          echo "DPBENCH_SYCL=1" >> "$GITHUB_ENV"
+          echo "WORKLOADS=$WORKLOADS,sycl" >> "$GITHUB_ENV"
 
       - name: Build dpbench
-        shell: pwsh
+        if: matrix.install == 'pip'
+        shell: bash -el {0}
+        run: |
+          pip install \
+          --no-index --no-deps --no-build-isolation -e . -v
+
+      - name: Build dpbench
+        if: matrix.install == 'setup.py'
+        shell: bash -el {0}
         run: |
           python setup.py develop
-          # pip install `
-          # --no-index --no-deps --no-build-isolation -e . -v
 
       - name: Run benchmarks
-        shell: pwsh
+        shell: bash -el {0}
         run: |
-          $env:NUMBA_MLIR_GPU_RUNTIME="sycl"
+          export NUMBA_MLIR_GPU_RUNTIME=sycl
           # Turn off numba-dpex autofall back
-          $env:NUMBA_DPEX_FALLBACK_ON_CPU=0
+          export NUMBA_DPEX_FALLBACK_ON_CPU=0
           # Make sure numba-dpex is using native atomics in github CI
-          $env:NUMBA_DPEX_ACTIVATE_ATOMICS_FP_NATIVE=1
-
-          $env:PYTHONIOENCODING="utf-8"
-          # $env:PYTHONLEGACYWINDOWSSTDIO=utf-8
+          export NUMBA_DPEX_ACTIVATE_ATOMICS_FP_NATIVE=1
 
-          dpbench -i $env:WORKLOADS run -r2 --no-print-results
+          dpbench -i ${WORKLOADS} run -r2 --no-print-results || exit 1
 
       - name: Generate report
-        shell: pwsh
+        shell: bash -el {0}
         run: |
-          dpbench -i $env:WORKLOADS report
+          dpbench -i ${WORKLOADS} report || exit 1
diff --git a/dpbench/configs/bench_info/knn.toml b/dpbench/configs/bench_info/knn.toml
@@ -32,7 +32,9 @@ array_args = [
 output_args = [
     "predictions",
 ]
-expected_failure_implementations = ["numba_dpex_p"]
+
+# `sycl` fails just on Windows
+expected_failure_implementations = ["numba_dpex_p", "sycl"]
 
 [benchmark.parameters.S]
 test_size = 1024
diff --git a/environments/conda-win-sycl.yml b/environments/conda-win-sycl.yml
@@ -5,24 +5,25 @@
 name: dpbench-dev
 channels:
   - dppy/label/dev
-  - intel
   - conda-forge
+  - intel
   - nodefaults
 dependencies:
-  - conda-forge::pip
-  - conda-forge::tomli
-  - conda-forge::alembic>=1.11.0
-  - conda-forge::sqlalchemy>=2.0.0
-  - conda-forge::scipy
-  - conda-forge::scikit-learn
-  - conda-forge::pandas
-  - numpy
+  - pip
+  - tomli
+  - alembic
+  - sqlalchemy
+  - scipy
+  - scikit-learn
+  - pandas
+  - intel::numpy
   - numba
   - dpctl
   - dpnp
   - numba-dpex
   - numba-mlir
   - dpcpp_win-64
+  - cmake
   - cython
   - scikit-build
   # https://github.com/scikit-build/scikit-build/issues/981
