Skip to content

Commit c629371

Browse files
danhoeflingerdanhoeflinger
authored
Merge branch 'main' into dev/dhoeflin/zip_view_friend_fix
2 parents 65bc50f + dcb307d commit c629371

37 files changed

+533
-746
lines changed

‎.github/workflows/ci-docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838
- name: Install prerequisites
3939
run: |
4040
echo GITHUB_SHA_SHORT=${GITHUB_SHA::8} >> $GITHUB_ENV
41-
python -m pip install -r documentation/library_guide/requirements.txt
41+
python -m pip install -r documentation/_auxiliary/requirements.txt
4242
- name: Build documentation
4343
run: |
4444
mkdir html
45-
sphinx-build -b html documentation/library_guide/ html/
45+
sphinx-build -b html documentation/ html/
4646
- name: Archive build directory
4747
uses: actions/upload-artifact@v4
4848
with:

‎.github/workflows/ci-testing.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,20 @@ jobs:
238238
lscpu
239239
240240
# TODO: fix or justify the excluded warnings
241-
warning_flags="-Wall -Wextra-semi -Werror -Wno-error=sign-compare"
241+
EXTRA_CXX_FLAGS="-Wall -Wextra-semi -Werror -Wno-error=sign-compare"
242242
if [[ "${{ matrix.cxx_compiler }}" != "g++" ]]; then
243-
warning_flags="${warning_flags} -Wno-error=pass-failed"
243+
EXTRA_CXX_FLAGS="${EXTRA_CXX_FLAGS} -Wno-error=pass-failed"
244244
fi
245245
if [[ "${{ matrix.cxx_compiler }}" == "icpx" ]]; then
246-
warning_flags="${warning_flags} -Wno-error=recommended-option"
246+
EXTRA_CXX_FLAGS="${EXTRA_CXX_FLAGS} -Wno-error=recommended-option"
247247
fi
248+
249+
if [[ "${{ matrix.device_type }}" == "FPGA_EMU" ]]; then
250+
EXTRA_CXX_FLAGS="${EXTRA_CXX_FLAGS} -DONEDPL_FPGA_DEVICE -DONEDPL_FPGA_EMULATOR"
251+
fi
252+
248253
cmake -DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
249-
-DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }} -DONEDPL_BACKEND=${{ matrix.backend }} -DCMAKE_CXX_FLAGS="${warning_flags}" ..
254+
-DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }} -DONEDPL_BACKEND=${{ matrix.backend }} -DCMAKE_CXX_FLAGS="${EXTRA_CXX_FLAGS}" ..
250255
make VERBOSE=1 -j${BUILD_CONCURRENCY} ${make_targets} |& tee build.log
251256
ONEAPI_DEVICE_SELECTOR=*:${{ matrix.device_type }}
252257
ctest --timeout ${TEST_TIMEOUT} --output-on-failure ${ctest_flags} |& tee ctest.log

documentation/library_guide/.gitignore renamed to documentation/.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
build
2-
__pycache__/
1+
build
2+
__pycache__/
33
*.pyc

documentation/library_guide/Makefile renamed to documentation/Makefile

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
# Minimal makefile for Sphinx documentation
2-
3-
# You can set these variables from the command line.
4-
SPHINXOPTS =
5-
SPHINXBUILD = sphinx-build
6-
SOURCEDIR = ./
7-
BUILDDIR = build
8-
9-
PAPEROPT_a4 = -D latex_paper_size=a4
10-
PAPEROPT_letter = -D latex_paper_size=letter
11-
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
12-
ERROROPTS = -W --keep-going
13-
14-
# Put it first so that "make" without argument is like "make help".
15-
help:
16-
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
17-
18-
.PHONY: help Makefile create_rst_examples
19-
20-
clean:
21-
rm -rf $(BUILDDIR)/*
22-
23-
latex:
24-
"$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)
25-
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
26-
@echo
27-
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
28-
@echo "Run \`make' in that directory to run these through (pdf)latex" \
29-
"(use \`make latexpdf' here to do that automatically)."
30-
31-
html:
32-
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
33-
@echo
34-
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
1+
# Minimal makefile for Sphinx documentation
2+
3+
# You can set these variables from the command line.
4+
SPHINXOPTS =
5+
SPHINXBUILD = sphinx-build
6+
SOURCEDIR = ./
7+
BUILDDIR = build
8+
9+
PAPEROPT_a4 = -D latex_paper_size=a4
10+
PAPEROPT_letter = -D latex_paper_size=letter
11+
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
12+
ERROROPTS = -W --keep-going
13+
14+
# Put it first so that "make" without argument is like "make help".
15+
help:
16+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
17+
18+
.PHONY: help Makefile create_rst_examples
19+
20+
clean:
21+
rm -rf $(BUILDDIR)/*
22+
23+
latex:
24+
"$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)
25+
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
26+
@echo
27+
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
28+
@echo "Run \`make' in that directory to run these through (pdf)latex" \
29+
"(use \`make latexpdf' here to do that automatically)."
30+
31+
html:
32+
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
33+
@echo
34+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."

documentation/library_guide/common_cross_document_links.txt renamed to documentation/_auxiliary/common_cross_document_links.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
.. |onedpl_library_guide| replace:: Intel® oneAPI DPC++ Library Guide
2-
.. _onedpl_library_guide: https://www.intel.com/content/www/us/en/docs/onedpl/developer-guide/2022-9/overview.html
1+
.. |onedpl_library_guide| replace:: :doc:`oneAPI DPC++ Library Guide </library_guide/introduction>`
2+
3+
.. |onedpl_requirements| replace:: :ref:`oneDPL System Requirements <library-requirements>`
34

45
.. |dpcpp_gsg| replace:: Get Started with the Intel® oneAPI DPC++/C++ Compiler
56
.. _dpcpp_gsg: https://www.intel.com/content/www/us/en/docs/dpcpp-cpp-compiler/get-started-guide/2025-2/overview.html

documentation/library_guide/requirements.txt renamed to documentation/_auxiliary/requirements.txt

File renamed without changes.

‎documentation/_auxiliary/variables.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.. |dpcpp_compiler| replace:: oneAPI DPC++ Compiler
2+
.. |onedpl_long| replace:: oneAPI DPC++ Library
3+
.. |onedpl_short| replace:: oneDPL
4+
.. |onetbb_long| replace:: oneAPI Threading Building Blocks (oneTBB)
5+
.. |onetbb_short| replace:: oneTBB
6+
.. |tbb_long| replace:: Intel® Threading Building Blocks (Intel® TBB)
7+
.. |tbb_short| replace:: Intel® TBB

documentation/library_guide/_static/custom.css renamed to documentation/_static/custom.css

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
.wy-side-nav-search, .wy-nav-top {
2-
background: #4308E5;
3-
}
4-
5-
/* make the page width fill the window */
6-
.wy-nav-content {
7-
max-width: 1100px;
8-
}
9-
10-
11-
.eqno {
12-
margin-left: 5px;
13-
float: right;
14-
}
15-
.math .headerlink {
16-
display: none;
17-
visibility: hidden;
18-
}
19-
.math:hover .headerlink {
20-
display: inline-block;
21-
visibility: visible;
22-
margin-right: -0.7em;
23-
}
24-
25-
/* A workaround for https://github.com/readthedocs/sphinx_rtd_theme/issues/647
26-
* Override display for function signatures so that there is spacing between
27-
* types and arguments */
28-
.rst-content dl:not(.docutils) dt {
29-
display: table-cell !important;
30-
}
31-
.rst-content dl:not(.docutils) dd {
32-
margin-top: 6px;
33-
}
34-
35-
/* override table width restrictions
36-
* https://rackerlabs.github.io/docs-rackspace/tools/rtd-tables.html */
37-
@media screen and (min-width: 767px) {
38-
39-
.wy-table-responsive table td {
40-
/* !important prevents the common CSS stylesheets from overriding
41-
this as on RTD they are loaded after this stylesheet */
42-
white-space: normal !important;
43-
}
44-
45-
.wy-table-responsive {
46-
overflow: visible !important;
47-
}
1+
.wy-side-nav-search, .wy-nav-top {
2+
background: #4308E5;
3+
}
4+
5+
/* make the page width fill the window */
6+
.wy-nav-content {
7+
max-width: 1100px;
8+
}
9+
10+
11+
.eqno {
12+
margin-left: 5px;
13+
float: right;
14+
}
15+
.math .headerlink {
16+
display: none;
17+
visibility: hidden;
18+
}
19+
.math:hover .headerlink {
20+
display: inline-block;
21+
visibility: visible;
22+
margin-right: -0.7em;
23+
}
24+
25+
/* A workaround for https://github.com/readthedocs/sphinx_rtd_theme/issues/647
26+
* Override display for function signatures so that there is spacing between
27+
* types and arguments */
28+
.rst-content dl:not(.docutils) dt {
29+
display: table-cell !important;
30+
}
31+
.rst-content dl:not(.docutils) dd {
32+
margin-top: 6px;
33+
}
34+
35+
/* override table width restrictions
36+
* https://rackerlabs.github.io/docs-rackspace/tools/rtd-tables.html */
37+
@media screen and (min-width: 767px) {
38+
39+
.wy-table-responsive table td {
40+
/* !important prevents the common CSS stylesheets from overriding
41+
this as on RTD they are loaded after this stylesheet */
42+
white-space: normal !important;
43+
}
44+
45+
.wy-table-responsive {
46+
overflow: visible !important;
47+
}
4848
}

documentation/library_guide/_static/custom.js renamed to documentation/_static/custom.js

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
//configure tms
2-
var wapLocalCode = 'us-en';
3-
//dynamically set per localized site, see mapping table for values
4-
var wapSection = "oneapi-docs";
5-
//load tms
6-
(function() {
7-
var host = (window.document.location.protocol == 'http:') ? "http://www.intel.com" : "https://www.intel.com";
8-
var url = host+"/content/dam/www/global/wap/tms-loader.js"; //wap file url
9-
var po = document.createElement('script');
10-
po.type = 'text/javascript';
11-
po.async = true;
12-
po.src = url;
13-
var s = document.getElementsByTagName('script')[0];
14-
s.parentNode.insertBefore(po, s);
15-
})();
16-
17-
window.MathJax = {
18-
TeX: {
19-
Macros: {
20-
src: '\\operatorname{src}',
21-
srclayer: '\\operatorname{src\\_layer}',
22-
srciter: '\\operatorname{src\\_iter}',
23-
srciterc: '\\operatorname{src\\_iter\\_c}',
24-
weights: '\\operatorname{weights}',
25-
weightslayer: '\\operatorname{weights\\_layer}',
26-
weightsiter: '\\operatorname{weights\\_iter}',
27-
weightspeephole: '\\operatorname{weights\\_peephole}',
28-
weightsprojection: '\\operatorname{weights\\_projection}',
29-
bias: '\\operatorname{bias}',
30-
dst: '\\operatorname{dst}',
31-
dstlayer: '\\operatorname{dst\\_layer}',
32-
dstiter: '\\operatorname{dst\\_iter}',
33-
dstiterc: '\\operatorname{dst\\_iter\\_c}',
34-
diffsrc: '\\operatorname{diff\\_src}',
35-
diffsrclayer: '\\operatorname{diff\\_src\\_layer}',
36-
diffsrciter: '\\operatorname{diff\\_src\\_iter}',
37-
diffsrciterc: '\\operatorname{diff\\_src\\_iter\\_c}',
38-
diffweights: '\\operatorname{diff\\_weights}',
39-
diffweightslayer: '\\operatorname{diff\\_weights\\_layer}',
40-
diffweightsiter: '\\operatorname{diff\\_weights\\_iter}',
41-
diffweightspeephole: '\\operatorname{diff\\_weights\\_peephole}',
42-
diffweightsprojection: '\\operatorname{diff\\_weights\\_projection}',
43-
diffbias: '\\operatorname{diff\\_bias}',
44-
diffdst: '\\operatorname{diff\\_dst}',
45-
diffdstlayer: '\\operatorname{diff\\_dst\\_layer}',
46-
diffdstiter: '\\operatorname{diff\\_dst\\_iter}',
47-
diffdstiterc: '\\operatorname{diff\\_dst\\_iter\\_c}',
48-
diffgamma: '\\operatorname{diff\\_\\gamma}',
49-
diffbeta: '\\operatorname{diff\\_\\beta}',
50-
workspace: '\\operatorname{workspace}'
51-
}
52-
}
1+
//configure tms
2+
var wapLocalCode = 'us-en';
3+
//dynamically set per localized site, see mapping table for values
4+
var wapSection = "oneapi-docs";
5+
//load tms
6+
(function() {
7+
var host = (window.document.location.protocol == 'http:') ? "http://www.intel.com" : "https://www.intel.com";
8+
var url = host+"/content/dam/www/global/wap/tms-loader.js"; //wap file url
9+
var po = document.createElement('script');
10+
po.type = 'text/javascript';
11+
po.async = true;
12+
po.src = url;
13+
var s = document.getElementsByTagName('script')[0];
14+
s.parentNode.insertBefore(po, s);
15+
})();
16+
17+
window.MathJax = {
18+
TeX: {
19+
Macros: {
20+
src: '\\operatorname{src}',
21+
srclayer: '\\operatorname{src\\_layer}',
22+
srciter: '\\operatorname{src\\_iter}',
23+
srciterc: '\\operatorname{src\\_iter\\_c}',
24+
weights: '\\operatorname{weights}',
25+
weightslayer: '\\operatorname{weights\\_layer}',
26+
weightsiter: '\\operatorname{weights\\_iter}',
27+
weightspeephole: '\\operatorname{weights\\_peephole}',
28+
weightsprojection: '\\operatorname{weights\\_projection}',
29+
bias: '\\operatorname{bias}',
30+
dst: '\\operatorname{dst}',
31+
dstlayer: '\\operatorname{dst\\_layer}',
32+
dstiter: '\\operatorname{dst\\_iter}',
33+
dstiterc: '\\operatorname{dst\\_iter\\_c}',
34+
diffsrc: '\\operatorname{diff\\_src}',
35+
diffsrclayer: '\\operatorname{diff\\_src\\_layer}',
36+
diffsrciter: '\\operatorname{diff\\_src\\_iter}',
37+
diffsrciterc: '\\operatorname{diff\\_src\\_iter\\_c}',
38+
diffweights: '\\operatorname{diff\\_weights}',
39+
diffweightslayer: '\\operatorname{diff\\_weights\\_layer}',
40+
diffweightsiter: '\\operatorname{diff\\_weights\\_iter}',
41+
diffweightspeephole: '\\operatorname{diff\\_weights\\_peephole}',
42+
diffweightsprojection: '\\operatorname{diff\\_weights\\_projection}',
43+
diffbias: '\\operatorname{diff\\_bias}',
44+
diffdst: '\\operatorname{diff\\_dst}',
45+
diffdstlayer: '\\operatorname{diff\\_dst\\_layer}',
46+
diffdstiter: '\\operatorname{diff\\_dst\\_iter}',
47+
diffdstiterc: '\\operatorname{diff\\_dst\\_iter\\_c}',
48+
diffgamma: '\\operatorname{diff\\_\\gamma}',
49+
diffbeta: '\\operatorname{diff\\_\\beta}',
50+
workspace: '\\operatorname{workspace}'
51+
}
52+
}
5353
}

documentation/library_guide/_static/favicons.png renamed to documentation/_static/favicons.png

File renamed without changes.

0 commit comments

Comments
 (0)