Skip to content

Commit 30ca777

Browse files
Mike Kinsnerrscohn2
andauthored
Update DPC++ specification for 1.1 release (#384)
* Update DPC++ specification for 1.1 release. Primarily addition of new extensions, and removal of previous extensions that have been successfully folded into the SYCL 2020 specification. Signed-off-by: Michael Kinsner <[email protected]> * Clarify what extended atomics add over SYCL 2020 Signed-off-by: Michael Kinsner <[email protected]> * Incorporate @gmlueck input Signed-off-by: Michael Kinsner <[email protected]> * Fix links that were to extension directories and not the actual spec documents Signed-off-by: Michael Kinsner <[email protected]> * Remove assert description Signed-off-by: Michael Kinsner <[email protected]> * enable building standalone dpcpp, formatting fix Co-authored-by: Robert Cohn <[email protected]>
1 parent be33c3b commit 30ca777

File tree

4 files changed

+74
-134
lines changed

4 files changed

+74
-134
lines changed

source/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
repo_root = '..'
2222
exec(open(join(repo_root, 'source', 'conf', 'common_conf.py')).read())
2323

24+
extensions += ['notfound.extension'] # noqa: F821
25+
2426
# -- Project information -----------------------------------------------------
2527

2628
project = u'oneAPI Specification'

source/conf/common_conf.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@
2323
)
2424

2525
extensions = [
26-
'notfound.extension',
2726
'sphinx.ext.autodoc',
2827
'sphinx.ext.doctest',
2928
'sphinx.ext.todo',
3029
'sphinx.ext.coverage',
3130
'sphinx.ext.mathjax',
3231
'sphinx.ext.ifconfig',
33-
# 'sphinx.ext.imgconverter',
3432
'sphinx.ext.viewcode',
3533
'sphinx.ext.githubpages',
3634
'sphinx.ext.graphviz',
@@ -41,7 +39,6 @@
4139
'sphinx_substitution_extensions',
4240
'sphinxcontrib.plantuml',
4341
'breathe',
44-
# 'vplapi',
4542
'dalapi', # oneDAL API generator
4643
]
4744

source/elements/dpcpp/source/conf.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
#
1919
import os
2020
import sys
21-
sys.path.insert(0, os.path.abspath(os.path.join('..','..','..','conf')))
22-
# element_conf needs to import this conf
23-
sys.path.insert(0, os.path.abspath('.'))
21+
from os.path import join
22+
2423

2524
project = 'dpcpp'
2625

27-
from element_conf import *
26+
repo_root = join('..', '..', '..', '..')
27+
exec(open(join(repo_root, 'source', 'conf', 'common_conf.py')).read())
28+
exec(open(join(repo_root, 'source', 'conf', 'element_conf.py')).read())

0 commit comments

Comments
 (0)