Merge branch 'oneapi-src:main' into main

uxlfoundation · Nov 10, 2021 · 9ae2225 · 9ae2225
2 parents f9b11d4 + d9d350a
commit 9ae2225
Show file tree

Hide file tree

Showing 23 changed files with 1,621 additions and 1,149 deletions.
diff --git a/oneapi-doc.json b/oneapi-doc.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.1-provisional-rev-2",
+    "version": "1.1-rev-1",
     "vpl_version": "2.5.0",
-    "art_version": "0.5-rev-1"
+    "art_version": "1.0-rev-1"
 }
diff --git a/source/conf.py b/source/conf.py
@@ -21,6 +21,8 @@
 repo_root = '..'
 exec(open(join(repo_root, 'source', 'conf', 'common_conf.py')).read())
 
+extensions += ['notfound.extension']  # noqa: F821
+
 # -- Project information -----------------------------------------------------
 
 project = u'oneAPI Specification'

diff --git a/source/conf/common_conf.py b/source/conf/common_conf.py
@@ -23,14 +23,12 @@
 )
 
 extensions = [
-    'notfound.extension',
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'sphinx.ext.mathjax',
     'sphinx.ext.ifconfig',
-    #    'sphinx.ext.imgconverter',
     'sphinx.ext.viewcode',
     'sphinx.ext.githubpages',
     'sphinx.ext.graphviz',
@@ -41,7 +39,6 @@
     'sphinx_substitution_extensions',
     'sphinxcontrib.plantuml',
     'breathe',
-    #      'vplapi',
     'dalapi',  # oneDAL API generator
 ]
 

diff --git a/source/elements/dpcpp/source/conf.py b/source/elements/dpcpp/source/conf.py
@@ -18,10 +18,11 @@
 #
 import os
 import sys
-sys.path.insert(0, os.path.abspath(os.path.join('..','..','..','conf')))
-# element_conf needs to import this conf
-sys.path.insert(0, os.path.abspath('.'))
+from os.path import join
+
 
 project = 'dpcpp'
 
-from element_conf import *
+repo_root = join('..', '..', '..', '..')
+exec(open(join(repo_root, 'source', 'conf', 'common_conf.py')).read())
+exec(open(join(repo_root, 'source', 'conf', 'element_conf.py')).read())
diff --git a/source/elements/dpcpp/source/index.rst b/source/elements/dpcpp/source/index.rst
diff --git a/source/elements/element_list.rst b/source/elements/element_list.rst
@@ -20,4 +20,9 @@
 - :ref:`oneVPL-section`: Algorithms for accelerated video processing
 - :ref:`oneMKL-section`: High performance math routines for science,
   engineering, and financial applications
-- :ref:`oneART-section`: A set of advanced ray tracing and high-fidelity rendering and computation routines for use in a wide variety of 3D graphics uses including, film and television photorealistic visual effects and animation rendering, scientific visualization, high-performance computing computations, gaming, and more. 
+- :ref:`oneART-section`: A set of advanced ray tracing and
+  high-fidelity rendering and computation routines for use in a wide
+  variety of 3D graphics uses including, film and television
+  photorealistic visual effects and animation rendering, scientific
+  visualization, high-performance computing computations, gaming, and
+  more.
diff --git a/source/elements/oneART/source/conf.py b/source/elements/oneART/source/conf.py
@@ -21,7 +21,7 @@
 from os.path import join
 
 
-project = 'oneART'
+project = 'Ray Tracing'
 
 repo_root = join('..', '..', '..', '..')
 exec(open(join(repo_root, 'source', 'conf', 'common_conf.py')).read())