Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] correct Nightly-build, clean up ci files. #2920

Merged
merged 30 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
62cc2f5
Update nightly-build.yml
icfaust Sep 27, 2024
f97f719
Update install_windows.bat
icfaust Sep 27, 2024
3d060c6
Update nightly-build.yml
icfaust Sep 27, 2024
b2a91bd
Update nightly-build.yml
icfaust Sep 27, 2024
efe1efb
Update install_windows.bat
icfaust Sep 27, 2024
1713c97
Update install_windows.bat
icfaust Sep 27, 2024
09e9e1d
Update nightly-build.yml
icfaust Sep 27, 2024
80374b2
Delete .ci/scripts/install_dpc.ps1
icfaust Sep 27, 2024
8cc5a88
Update nightly-build.yml
icfaust Sep 27, 2024
8843393
Update install_windows.bat
icfaust Sep 27, 2024
c75c7d7
Update install_windows.bat
icfaust Sep 27, 2024
ca01b99
Update install_windows.bat
icfaust Sep 27, 2024
984c8a6
Update install_windows.bat
icfaust Sep 27, 2024
d46f55b
Update nightly-build.yml
icfaust Sep 27, 2024
25e6507
Update nightly-build.yml
icfaust Sep 27, 2024
f58d10f
Update ci.yml
icfaust Sep 27, 2024
45606df
Update install_windows.bat
icfaust Sep 27, 2024
80fc0ba
Update nightly-build.yml
icfaust Sep 27, 2024
98b1ae5
Update ci.yml
icfaust Sep 27, 2024
fc279cf
Update build.bat
icfaust Sep 27, 2024
4ccf2b4
Update build.bat
icfaust Sep 27, 2024
da85951
Update nightly-build.yml
icfaust Sep 27, 2024
1faae95
Update install_windows.bat
icfaust Sep 27, 2024
55978ae
Update ci.yml
icfaust Sep 27, 2024
0d17de3
Update ci.yml
icfaust Sep 27, 2024
f5f890a
Update install_windows.bat
icfaust Sep 27, 2024
00eb096
Update ci.yml
icfaust Sep 27, 2024
5601681
Update test.bat
icfaust Sep 27, 2024
cbecea5
Update ci.yml
icfaust Sep 27, 2024
e217570
install_windows -> install_basekit
icfaust Sep 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .ci/scripts/install_dpc.ps1

This file was deleted.

13 changes: 7 additions & 6 deletions .ci/scripts/install_windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@ rem See the License for the specific language governing permissions and
rem limitations under the License.
rem ============================================================================

rem %1 - url to download
rem %2 - components to download (following oneapi standards, default: default)
rem %3 - install directory (default: C:\temp\oneapi\)

set URL=%1
set COMPONENTS=%2
if "%2"=="" (set COMPONENTS=default) else (set COMPONENTS=%2)
Alexandr-Solovev marked this conversation as resolved.
Show resolved Hide resolved
if "%3"=="" (set DIRECTORY=C:\temp\oneapi\) else (set DIRECTORY=%3)

curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5
start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log
del %TEMP%\webimage.exe
if "%COMPONENTS%"=="" (
webimage_extracted\bootstrapper.exe -s --action install --eula=accept --install-dir=C:\temp\oneapi\ -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=.
) else (
webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept --install-dir=C:\temp\oneapi\ -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=.
)
webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept --install-dir=%DIRECTORY% -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=.
set installer_exit_code=%ERRORLEVEL%
rd /s/q "webimage_extracted"
exit /b %installer_exit_code%
30 changes: 20 additions & 10 deletions .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,35 +73,40 @@ jobs:
uses: actions/checkout@v4
with:
repository: oneapi-src/oneDAL
- name: Set MKL_FPK_GPU_VERSION_LINE
shell: bash
run: |
echo "MKL_FPK_GPU_VERSION_LINE=2024.0.0" >> "$GITHUB_ENV"
- name: Install DPC++
shell: cmd
run: |
call .\.ci\scripts\install_windows.bat ${{ env.WINDOWS_BASEKIT_URL }} ${{ env.WINDOWS_ALL_COMPONENTS }}
call .\.ci\scripts\install_windows.bat ${{ env.WINDOWS_BASEKIT_URL }} ${{ env.WINDOWS_ALL_COMPONENTS }} .\oneapi\
Alexandr-Solovev marked this conversation as resolved.
Show resolved Hide resolved
Alexandr-Solovev marked this conversation as resolved.
Show resolved Hide resolved
- name: Prepare Intel OpenCL CPU runtime
run: |
# Store the unpacked runtime to centralize and reduce external downloads
& .ci/scripts/collect_opencl_rt.ps1
- name: System Info
shell: cmd
run: |
set PATH=C:\msys64\usr\bin;%PATH%
pip install cpufeature
call C:\temp\oneapi\setvars.bat
call .\oneapi\setvars.bat
bash .ci/scripts/describe_system.sh
- name: Make daal
shell: cmd
run: |
call C:\temp\oneapi\setvars.bat
set MKL_FPK_GPU_VERSION_LINE=2024.0.0
call .\oneapi\setvars.bat
call .\.ci\scripts\build.bat daal vc avx2
- name: Make onedal
shell: cmd
run: |
call C:\temp\oneapi\setvars.bat
set MKL_FPK_GPU_VERSION_LINE=2024.0.0
call .\oneapi\setvars.bat
call .\.ci\scripts\build.bat onedal_c vc avx2
- name: Make oneapi_dpc
shell: cmd
run: |
call C:\temp\oneapi\setvars.bat
set MKL_FPK_GPU_VERSION_LINE=2024.0.0
call C:\temp\oneapi\compiler\latest\bin\sycl-ls.exe
call .\oneapi\setvars.bat
call .\oneapi\compiler\latest\bin\sycl-ls.exe
Alexandr-Solovev marked this conversation as resolved.
Show resolved Hide resolved
call .\.ci\scripts\build.bat onedal_dpc vc avx2
- name: Archive build
uses: actions/upload-artifact@v4
Expand All @@ -111,9 +116,14 @@ jobs:
- name: Compress DPC++
shell: cmd
run: |
tar -cvzf icx.zip C:\temp\oneapi
tar -cvzf icx.zip .\oneapi
- name: Archive DPC++
uses: actions/upload-artifact@v4
with:
name: icx_compiler
path: .\icx.zip
- name: Archive Intel OpenCL CPU runtime
uses: actions/upload-artifact@v4
with:
name: opencl_rt_installer
path: .\opencl_rt.msi
Loading