Skip to content

Commit 6696b65

Browse files
antonwolfyantonwolfy
authored
Merge branch 'master' into fix-gh-2641 
2 parents 9c2953b + dd9976d commit 6696b65

File tree

233 files changed

+10194
-3585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+10194
-3585
lines changed

‎.github/workflows/Windows-IntelLLVM_3.22.cmake‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
22
# file Copyright.txt or https://cmake.org/licensing for details.
33

4-
54
# This module is shared by multiple languages; use include blocker.
65
if(__WINDOWS_INTEL)
7-
return()
6+
return()
87
endif()
98
set(__WINDOWS_INTEL 1)
109

1110
include(Platform/Windows-MSVC)
1211
macro(__windows_compiler_intel lang)
13-
__windows_compiler_msvc(${lang})
14-
15-
set(CMAKE_${lang}_LINK_EXECUTABLE "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -link -out:<TARGET> -implib:<TARGET_IMPLIB> -pdb:<TARGET_PDB> -version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
16-
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -LD -link -out:<TARGET> -implib:<TARGET_IMPLIB> -pdb:<TARGET_PDB> -version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
17-
set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
18-
if (NOT "${lang}" STREQUAL "Fortran") # Fortran driver does not support -fuse-ld, yet
19-
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 <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
20-
endif()
21-
set(CMAKE_DEPFILE_FLAGS_${lang} "-QMMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
22-
set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
12+
__windows_compiler_msvc(${lang})
2313

14+
set(CMAKE_${lang}_LINK_EXECUTABLE
15+
"<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -link -out:<TARGET> -implib:<TARGET_IMPLIB> -pdb:<TARGET_PDB> -version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}"
16+
)
17+
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
18+
"<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -LD -link -out:<TARGET> -implib:<TARGET_IMPLIB> -pdb:<TARGET_PDB> -version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}"
19+
)
20+
set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
21+
if(NOT "${lang}" STREQUAL "Fortran") # Fortran driver does not support -fuse-ld, yet
22+
set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
23+
"<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -fuse-ld=llvm-lib -o <TARGET> -link <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}"
24+
)
25+
endif()
26+
set(CMAKE_DEPFILE_FLAGS_${lang} "-QMMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
27+
set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
2428
endmacro()

‎.github/workflows/Windows-IntelLLVM_3.26.cmake‎

Lines changed: 49 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
22
# file Copyright.txt or https://cmake.org/licensing for details.
33

4-
54
# This module is shared by multiple languages; use include blocker.
65
if(__WINDOWS_INTEL_LLVM)
7-
return()
6+
return()
87
endif()
98
set(__WINDOWS_INTEL_LLVM 1)
109

@@ -15,52 +14,65 @@ set(__WINDOWS_INTEL_LLVM 1)
1514

1615
# Save original CMAKE_${t}_LINKER_FLAGS_INIT
1716
foreach(t EXE SHARED MODULE STATIC)
18-
set(_saved_cmake_${t}_linker_flags_init ${CMAKE_${t}_LINKER_FLAGS_INIT})
19-
set(CMAKE_${t}_LINKER_FLAGS_INIT "")
17+
set(_saved_cmake_${t}_linker_flags_init ${CMAKE_${t}_LINKER_FLAGS_INIT})
18+
set(CMAKE_${t}_LINKER_FLAGS_INIT "")
2019
endforeach()
2120
include(Platform/Windows-MSVC)
2221
# Wrap linker flags from Windows-MSVC
2322
set(_IntelLLVM_LINKER_WRAPPER_FLAG "/Qoption,link,")
2423
set(_IntelLLVM_LINKER_WRAPPER_FLAG_SEP ",")
2524
foreach(t EXE SHARED MODULE STATIC)
26-
set(_wrapped_linker_flags "")
27-
foreach(flag ${CMAKE_${t}_LINKER_FLAGS_INIT})
28-
string(STRIP ${flag} flag)
29-
list(APPEND _wrapped_linker_flags "${_IntelLLVM_LINKER_WRAPPER_FLAG}${flag}")
30-
endforeach()
31-
set(CMAKE_${t}_LINKER_FLAGS_INIT "")
32-
list(APPEND CMAKE_${t}_LINKER_FLAGS_INIT
33-
${_saved_cmake_${t}_linker_flags_init} ${_wrapped_linker_flags})
25+
set(_wrapped_linker_flags "")
26+
foreach(flag ${CMAKE_${t}_LINKER_FLAGS_INIT})
27+
string(STRIP ${flag} flag)
28+
list(APPEND _wrapped_linker_flags "${_IntelLLVM_LINKER_WRAPPER_FLAG}${flag}")
29+
endforeach()
30+
set(CMAKE_${t}_LINKER_FLAGS_INIT "")
31+
list(
32+
APPEND CMAKE_${t}_LINKER_FLAGS_INIT
33+
${_saved_cmake_${t}_linker_flags_init}
34+
${_wrapped_linker_flags}
35+
)
3436
endforeach()
3537

3638
macro(__windows_compiler_intel lang)
37-
__windows_compiler_msvc(${lang})
39+
__windows_compiler_msvc(${lang})
3840

39-
set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "${_IntelLLVM_LINKER_WRAPPER_FLAG}")
40-
set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP "${_IntelLLVM_LINKER_WRAPPER_FLAG_SEP}")
41-
set(CMAKE_${lang}_CREATE_WIN32_EXE "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:windows")
42-
set(CMAKE_${lang}_CREATE_CONSOLE_EXE "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:console")
43-
set(CMAKE_LINK_DEF_FILE_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/DEF:")
44-
set(CMAKE_LIBRARY_PATH_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/LIBPATH:")
41+
set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "${_IntelLLVM_LINKER_WRAPPER_FLAG}")
42+
set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP "${_IntelLLVM_LINKER_WRAPPER_FLAG_SEP}")
43+
set(CMAKE_${lang}_CREATE_WIN32_EXE
44+
"${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:windows"
45+
)
46+
set(CMAKE_${lang}_CREATE_CONSOLE_EXE
47+
"${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:console"
48+
)
49+
set(CMAKE_LINK_DEF_FILE_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/DEF:")
50+
set(CMAKE_LIBRARY_PATH_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/LIBPATH:")
4551

46-
# Features for LINK_LIBRARY generator expression
47-
if(MSVC_VERSION GREATER "1900")
48-
## WHOLE_ARCHIVE: Force loading all members of an archive
49-
set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:/WHOLEARCHIVE:<LIBRARY>")
50-
set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
51-
endif()
52+
# Features for LINK_LIBRARY generator expression
53+
if(MSVC_VERSION GREATER "1900")
54+
## WHOLE_ARCHIVE: Force loading all members of an archive
55+
set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:/WHOLEARCHIVE:<LIBRARY>")
56+
set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
57+
endif()
5258

53-
set(CMAKE_${lang}_LINK_EXECUTABLE
54-
"${_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}")
55-
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
56-
"${_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}")
57-
set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
58-
if (NOT "${lang}" STREQUAL "Fortran" OR CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 2022.1)
59-
# The Fortran driver does not support -fuse-ld=llvm-lib before compiler version 2022.1
60-
set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
61-
"<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}")
62-
endif()
59+
set(CMAKE_${lang}_LINK_EXECUTABLE
60+
"${_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}"
61+
)
62+
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
63+
"${_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}"
64+
)
65+
set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
66+
if(
67+
NOT "${lang}" STREQUAL "Fortran"
68+
OR CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 2022.1
69+
)
70+
# The Fortran driver does not support -fuse-ld=llvm-lib before compiler version 2022.1
71+
set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
72+
"<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}"
73+
)
74+
endif()
6375

64-
set(CMAKE_DEPFILE_FLAGS_${lang} "-QMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
65-
set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
76+
set(CMAKE_DEPFILE_FLAGS_${lang} "-QMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
77+
set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
6678
endmacro()

‎.github/workflows/build-sphinx.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
if: env.oneapi-pkgs-env == ''
6767
run: |
6868
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
69-
cat GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
69+
< GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
7070
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
7171
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
7272
sudo apt update
@@ -102,7 +102,7 @@ jobs:
102102
sudo apt-get install -y nvidia-cuda-toolkit clinfo
103103
104104
- name: Checkout repo
105-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
105+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
106106
with:
107107
fetch-depth: 0
108108

@@ -177,10 +177,11 @@ jobs:
177177

178178
- name: Set a project number to current release
179179
run: |
180-
export PROJECT_NUMBER=$(git describe --tags --abbrev=0)
180+
PROJECT_NUMBER=$(git describe --tags --abbrev=0)
181+
export PROJECT_NUMBER
181182
182-
echo PROJECT_NUMBER=${PROJECT_NUMBER}
183-
echo "PROJECT_NUMBER=$PROJECT_NUMBER" >> $GITHUB_ENV
183+
echo "PROJECT_NUMBER=${PROJECT_NUMBER}"
184+
echo "PROJECT_NUMBER=$PROJECT_NUMBER" >> "$GITHUB_ENV"
184185
185186
- name: Build backend docs
186187
uses: mattnotmitt/doxygen-action@b84fe17600245bb5db3d6c247cc274ea98c15a3b # v1.12
@@ -248,7 +249,7 @@ jobs:
248249
timeout-minutes: 10
249250

250251
steps:
251-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
252+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
252253
with:
253254
fetch-depth: 0
254255

@@ -259,8 +260,8 @@ jobs:
259260
git remote add tokened_docs https://IntelPython:${{ secrets.GITHUB_TOKEN }}@github.com/IntelPython/dpnp.git
260261
git fetch tokened_docs
261262
git checkout --track tokened_docs/gh-pages
262-
echo `pwd`
263-
[ -d pull/${PR_NUM} ] && git rm -rf pull/${PR_NUM}
263+
pwd
264+
[ -d pull/"${PR_NUM}" ] && git rm -rf pull/"${PR_NUM}"
264265
git config --global user.name ${{ env.GH_BOT_NAME }}
265266
git config --global user.email ${{ env.GH_BOT_EMAIL }}
266267
git commit -m "Removing docs for closed pull request ${PR_NUM}"

‎.github/workflows/check-onemath.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
access_token: ${{ github.token }}
4040

4141
- name: Checkout DPNP repo
42-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
42+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4343
with:
4444
fetch-depth: 0
4545

@@ -57,7 +57,7 @@ jobs:
5757
cat ${{ env.environment-file }}
5858
5959
- name: Upload artifact
60-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
60+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
6161
with:
6262
name: ${{ env.environment-file-name }}
6363
path: ${{ env.environment-file }}
@@ -82,12 +82,12 @@ jobs:
8282

8383
steps:
8484
- name: Checkout DPNP repo
85-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
85+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
8686
with:
8787
fetch-depth: 0
8888

8989
- name: Download artifact
90-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
90+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
9191
with:
9292
name: ${{ env.environment-file-name }}
9393
path: ${{ env.environment-file-loc }}
@@ -176,18 +176,18 @@ jobs:
176176

177177
steps:
178178
- name: Checkout DPNP repo
179-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
179+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
180180
with:
181181
fetch-depth: 0
182182

183183
- name: Download artifact
184-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
184+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
185185
with:
186186
name: ${{ env.environment-file-name }}
187187
path: ${{ env.environment-file-loc }}
188188

189189
- name: Checkout oneMKL repo
190-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
190+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
191191
with:
192192
repository: 'oneapi-src/oneMKL'
193193
ref: 'develop'

0 commit comments

Comments
 (0)