Skip to content

Commit bf0c6b1

Browse files
vlad-perevezentsevvlad-perevezentsev
committed
Remove per_source device code splitting and separate run test step
1 parent 56ac18a commit bf0c6b1

File tree

12 files changed

+42
-186
lines changed

12 files changed

+42
-186
lines changed

‎.github/workflows/generate_coverage.yaml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -140,20 +140,6 @@ jobs:
140140
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
141141
env:
142142
SYCL_CACHE_PERSISTENT: 1
143-
with:
144-
shell: bash
145-
timeout_minutes: 60
146-
max_attempts: 5
147-
retry_on: error
148-
command: |
149-
. $CONDA/etc/profile.d/conda.sh
150-
conda activate coverage
151-
[ -f /opt/intel/oneapi/setvars.sh ] && source /opt/intel/oneapi/setvars.sh
152-
python scripts/gen_coverage.py --build-step skip-tensor --skip-pytest
153-
154-
- name: Run coverage tests
155-
id: run_tests
156-
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
157143
with:
158144
shell: bash
159145
timeout_minutes: 90
@@ -163,13 +149,12 @@ jobs:
163149
. $CONDA/etc/profile.d/conda.sh
164150
conda activate coverage
165151
[ -f /opt/intel/oneapi/setvars.sh ] && source /opt/intel/oneapi/setvars.sh
166-
python scripts/gen_coverage.py --tests-only
152+
python scripts/gen_coverage.py --build-step skip-tensor
167153
168154
- name: Total number of coverage attempts
169155
run: |
170156
echo "Total tensor build attempts: ${{ steps.build_tensor.outputs.total_attempts }}"
171157
echo "Total skip-tensor build attempts: ${{ steps.build_skip_tensor.outputs.total_attempts }}"
172-
echo "Total test run attempts: ${{ steps.run_tests.outputs.total_attempts }}"
173158
174159
- name: Upload coverage data to coveralls.io
175160
uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7

‎dpnp/CMakeLists.txt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,7 @@ function(build_dpnp_tensor_ext _trgt _src _dest)
9595
if(BUILD_DPNP_SYCL)
9696
add_sycl_to_target(TARGET ${_trgt} SOURCES ${_generated_src})
9797
target_compile_options(${_trgt} PRIVATE -fno-sycl-id-queries-fit-in-int)
98-
# For coverage builds, use per_source instead of per_kernel to reduce memory
99-
if(DPNP_GENERATE_COVERAGE)
100-
target_link_options(${_trgt} PRIVATE -fsycl-device-code-split=per_source)
101-
else()
102-
target_link_options(${_trgt} PRIVATE -fsycl-device-code-split=per_kernel)
103-
endif()
98+
target_link_options(${_trgt} PRIVATE -fsycl-device-code-split=per_kernel)
10499
if(DPNP_TENSOR_OFFLOAD_COMPRESS)
105100
target_link_options(${_trgt} PRIVATE --offload-compress)
106101
endif()

‎dpnp/backend/CMakeLists.txt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,7 @@ endif()
7070
# target_compile_definitions(${_trgt} PRIVATE _WIN=1)
7171
# endif()
7272

73-
# For coverage builds, use per_source instead of per_kernel to reduce memory
74-
if(DPNP_GENERATE_COVERAGE)
75-
target_link_options(${_trgt} PUBLIC -fsycl-device-code-split=per_source)
76-
else()
77-
target_link_options(${_trgt} PUBLIC -fsycl-device-code-split=per_kernel)
78-
endif()
73+
target_link_options(${_trgt} PUBLIC -fsycl-device-code-split=per_kernel)
7974

8075
if(DPNP_GENERATE_COVERAGE)
8176
target_link_options(${_trgt} PRIVATE -fprofile-instr-generate -fcoverage-mapping)

‎dpnp/backend/extensions/blas/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,7 @@ else()
100100
)
101101
endif()
102102

103-
# For coverage builds, use per_source instead of per_kernel to reduce memory
104-
if(DPNP_GENERATE_COVERAGE)
105-
target_link_options(
106-
${python_module_name}
107-
PUBLIC -fsycl-device-code-split=per_source
108-
)
109-
else()
110-
target_link_options(
111-
${python_module_name}
112-
PUBLIC -fsycl-device-code-split=per_kernel
113-
)
114-
endif()
103+
target_link_options(${python_module_name} PUBLIC -fsycl-device-code-split=per_kernel)
115104

116105
if(DPNP_GENERATE_COVERAGE)
117106
target_link_options(

‎dpnp/backend/extensions/fft/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,7 @@ else()
9393
)
9494
endif()
9595

96-
# For coverage builds, use per_source instead of per_kernel to reduce memory
97-
if(DPNP_GENERATE_COVERAGE)
98-
target_link_options(
99-
${python_module_name}
100-
PUBLIC -fsycl-device-code-split=per_source
101-
)
102-
else()
103-
target_link_options(
104-
${python_module_name}
105-
PUBLIC -fsycl-device-code-split=per_kernel
106-
)
107-
endif()
96+
target_link_options(${python_module_name} PUBLIC -fsycl-device-code-split=per_kernel)
10897

10998
if(DPNP_GENERATE_COVERAGE)
11099
target_link_options(

‎dpnp/backend/extensions/indexing/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,7 @@ else()
9898
endif()
9999

100100
target_compile_options(${python_module_name} PUBLIC -fno-sycl-id-queries-fit-in-int)
101-
# For coverage builds, use per_source instead of per_kernel to reduce memory
102-
if(DPNP_GENERATE_COVERAGE)
103-
target_link_options(
104-
${python_module_name}
105-
PUBLIC -fsycl-device-code-split=per_source
106-
)
107-
else()
108-
target_link_options(
109-
${python_module_name}
110-
PUBLIC -fsycl-device-code-split=per_kernel
111-
)
112-
endif()
101+
target_link_options(${python_module_name} PUBLIC -fsycl-device-code-split=per_kernel)
113102

114103
if(DPNP_GENERATE_COVERAGE)
115104
target_link_options(

‎dpnp/backend/extensions/lapack/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,18 +118,7 @@ else()
118118
)
119119
endif()
120120

121-
# For coverage builds, use per_source instead of per_kernel to reduce memory
122-
if(DPNP_GENERATE_COVERAGE)
123-
target_link_options(
124-
${python_module_name}
125-
PUBLIC -fsycl-device-code-split=per_source
126-
)
127-
else()
128-
target_link_options(
129-
${python_module_name}
130-
PUBLIC -fsycl-device-code-split=per_kernel
131-
)
132-
endif()
121+
target_link_options(${python_module_name} PUBLIC -fsycl-device-code-split=per_kernel)
133122

134123
if(DPNP_GENERATE_COVERAGE)
135124
target_link_options(

‎dpnp/backend/extensions/statistics/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,7 @@ else()
102102
)
103103
endif()
104104

105-
# For coverage builds, use per_source instead of per_kernel to reduce memory
106-
if(DPNP_GENERATE_COVERAGE)
107-
target_link_options(
108-
${python_module_name}
109-
PUBLIC -fsycl-device-code-split=per_source
110-
)
111-
else()
112-
target_link_options(
113-
${python_module_name}
114-
PUBLIC -fsycl-device-code-split=per_kernel
115-
)
116-
endif()
105+
target_link_options(${python_module_name} PUBLIC -fsycl-device-code-split=per_kernel)
117106

118107
if(DPNP_GENERATE_COVERAGE)
119108
target_link_options(

‎dpnp/backend/extensions/ufunc/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,7 @@ else()
129129
)
130130
endif()
131131

132-
# For coverage builds, use per_source instead of per_kernel to reduce memory
133-
if(DPNP_GENERATE_COVERAGE)
134-
target_link_options(
135-
${python_module_name}
136-
PUBLIC -fsycl-device-code-split=per_source
137-
)
138-
else()
139-
target_link_options(
140-
${python_module_name}
141-
PUBLIC -fsycl-device-code-split=per_kernel
142-
)
143-
endif()
132+
target_link_options(${python_module_name} PUBLIC -fsycl-device-code-split=per_kernel)
144133

145134
if(DPNP_GENERATE_COVERAGE)
146135
target_link_options(

‎dpnp/backend/extensions/vm/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,7 @@ else()
142142
)
143143
endif()
144144

145-
# For coverage builds, use per_source instead of per_kernel to reduce memory
146-
if(DPNP_GENERATE_COVERAGE)
147-
target_link_options(
148-
${python_module_name}
149-
PUBLIC -fsycl-device-code-split=per_source
150-
)
151-
else()
152-
target_link_options(
153-
${python_module_name}
154-
PUBLIC -fsycl-device-code-split=per_kernel
155-
)
156-
endif()
145+
target_link_options(${python_module_name} PUBLIC -fsycl-device-code-split=per_kernel)
157146

158147
if(DPNP_GENERATE_COVERAGE)
159148
target_link_options(

0 commit comments

Comments
 (0)