merge from master

uxlfoundation · Mar 31, 2020 · 3c88005 · 3c88005
2 parents 61a21a8 + ee4340a
commit 3c88005
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 25 deletions.
diff --git a/scripts/oneapi.py b/scripts/oneapi.py
@@ -47,6 +47,7 @@
 sys.path.insert(0, os.path.abspath(join('source','conf')))
 import common_conf
 
+oneapi_spec_version = common_conf.env['oneapi_version']
 args = None
 
 
@@ -237,11 +238,11 @@ def stage_publish(root, target=None):
     root_only(root)
     local_top = 'site'
     local_versions = join(local_top, 'versions')
-    local_versions_x = join(local_versions, common_conf.oneapi_spec_version)
+    local_versions_x = join(local_versions, oneapi_spec_version)
     local_versions_latest = join(local_versions, 'latest')
     s3_top = 's3://%s' % (staging_host)
     s3_versions = '%s/versions' % s3_top
-    s3_versions_x = '%s/%s' % (s3_versions,common_conf.oneapi_spec_version)
+    s3_versions_x = '%s/%s' % (s3_versions, oneapi_spec_version)
     s3_versions_latest = '%s/latest' % s3_versions
 
     # Sync everything but versions
@@ -299,7 +300,7 @@ def site(root, target=None):
     # Build the site. It will have everything but the older versions
     site = 'site'
     versions = join(site,'versions')
-    versions_x = join(versions, common_conf.oneapi_spec_version)
+    versions_x = join(versions, oneapi_spec_version)
     pdf = join('build','latex','oneAPI-spec.pdf')
     html = join('build','html')
     rm(site)

diff --git a/source/conf.py b/source/conf.py
@@ -26,7 +26,7 @@
 author = u'Intel'
 
 # The short X.Y version
-version = u'0.7' 
+version = env['oneapi_version']
 # The full version, including alpha/beta/rc tags
 release = version
 

diff --git a/source/conf/common_conf.py b/source/conf/common_conf.py
@@ -1,3 +1,5 @@
+import string
+
 extensions = [
     'notfound.extension',
     'sphinx.ext.autodoc',
@@ -15,36 +17,44 @@
     'breathe',
 ]
 
-rst_prolog = """
+env = {
+    'oneapi_version': '0.7',
+    'l0_version': '0.91',
+}
+
+prolog_template = string.Template("""
 .. |dpcpp_full_name| replace:: oneAPI Data Parallel C++
-.. |dpcpp_version| replace:: 0.7
+.. |dpcpp_version| replace:: $oneapi_version
 .. |dpl_full_name| replace:: oneAPI DPC++ Library
-.. |dpl_version| replace:: 0.7
+.. |dpl_version| replace:: $oneapi_version
 .. |ccl_full_name| replace:: oneAPI Collective Communications Library
-.. |ccl_version| replace:: 0.7
+.. |ccl_version| replace:: $oneapi_version
 .. |dal_full_name| replace:: oneAPI Data Analytics Library
 .. |dal_short_name| replace:: oneDAL
-.. |dal_version| replace:: 0.7
+.. |dal_version| replace:: $oneapi_version
 .. |dal_namespace| replace:: daal
 .. |dnn_full_name| replace:: oneAPI Deep Neural Network Library
-.. |dnn_version| replace:: 0.7
+.. |dnn_version| replace:: $oneapi_version
 .. |l0_full_name| replace:: oneAPI Level Zero
-.. |l0_version| replace:: 0.91
+.. |l0_version| replace:: $l0_version
 .. |tbb_full_name| replace:: oneAPI Threading Building Blocks
-.. |tbb_version| replace:: 0.7
+.. |tbb_version| replace:: $oneapi_version
 .. |vpl_full_name| replace:: oneAPI Video Processing Library
-.. |vpl_version| replace:: 0.7
+.. |vpl_version| replace:: $oneapi_version
 .. |mkl_full_name| replace:: oneAPI Math Kernel Library
-.. |mkl_version| replace:: 0.7
-"""
+.. |mkl_version| replace:: $oneapi_version
+.. _`Level Zero Specification`: https://spec.oneapi.com/versions/$oneapi_version/oneL0/index.html
+""")
+
+rst_prolog = prolog_template.substitute(env)
+
 
 # for substitutions in code blocks and sphinx-prompts:
 substitutions = [
     ('|dal_short_name|', 'oneDAL'),
     ('|daal_in_code|', 'daal')
     ]
 
-oneapi_spec_version = '0.6.0'
 
 primary_domain = 'cpp'
 

diff --git a/source/elements/l0/source/index.rst b/source/elements/l0/source/index.rst
@@ -41,6 +41,5 @@ architectures, such as FPGAs.
 Detailed API Descriptions
 -------------------------
 
-The detailed specification for Level Zero is available `online`_.
-
-.. _`online`: https://spec.oneapi.com/versions/latest/oneL0/index.html
+The detailed specification can be found online in the `Level Zero
+Specification`_.
diff --git a/source/versions.rst b/source/versions.rst
@@ -17,7 +17,6 @@ updates.
   Version   Date        View                                                                                                            
   ========  ==========  =========
   `0.7`_    03/26/2020  `HTML <https://spec.oneapi.com/versions/0.7/>`__ `PDF <https://spec.oneapi.com/versions/0.7/oneAPI-spec.pdf>`__
-  `0.6`_    01/31/2020  `HTML <https://spec.oneapi.com/versions/0.6.0/>`__ `PDF <https://spec.oneapi.com/versions/0.6.0/oneAPI-spec.pdf>`__
   `0.5`_    11/17/2019  `HTML <https://spec.oneapi.com/versions/0.5.0/>`__                                                                
   ========  ==========  =========
 
@@ -31,8 +30,6 @@ between oneAPI version and component versions.
   +=========+============+========+========+========+========+========+========+========+========+
   | `0.7`_  | .91        | 0.7                                                                   |
   +---------+------------+--------+--------+--------+--------+--------+--------+--------+--------+
-  | `0.6`_  | .91        | 0.6                                                                   |
-  +---------+------------+--------+--------+--------+--------+--------+--------+--------+--------+
   | `0.5`_  | 0.5                                                                                |
   +---------+------------+--------+--------+--------+--------+--------+--------+--------+--------+
 
@@ -42,9 +39,6 @@ Release Notes
 0.7
 ---
 
-0.6
----
-
 0.5
 ---