merge from master

Author: rscohn2

.github/workflows/main.yml

@@ -0,0 +1,20 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    container: rscohn2/oneapi-spec:latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: build in container
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID}}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+      run: |
+          python3 scripts/oneapi.py spec-venv
+          . spec-venv/bin/activate
+          python scripts/oneapi.py --branch $GITHUB_REF ci

scripts/oneapi.py

@@ -34,6 +34,7 @@
 import os.path
 from os.path import join
 import platform
+import requests
 import shutil
 from string import Template
 import stat
@@ -82,7 +83,7 @@ def __exit__(self, etype, value, traceback):
         os.chdir(self.savedPath)
 
 def log(*args, **kwargs):
-    print(indent * ' ' + ' '.join(map(str,args)), **kwargs)
+    print(indent * ' ' + ' '.join(map(str,args)), flush = True, **kwargs)
 
 def shell(c):
     log(c)
@@ -204,9 +205,12 @@ def ci_publish(root, target=None):
     root_only(root)
     if not args.branch:
         exit('Error: --branch <branchname> is required')
-    shell('aws s3 sync --only-show-errors --delete site s3://%s/exclude/ci/branches/%s' % (staging_host, args.branch))
-    log('published at http://staging.spec.oneapi.com.s3-website-us-west-2.amazonaws.com/exclude/ci/branches/%s/'
-          % (args.branch))
+    if 'AWS_SECRET_ACCESS_KEY' in os.environ:
+        shell('aws s3 sync --only-show-errors --delete site s3://%s/exclude/ci/branches/%s' % (staging_host, args.branch))
+        log('published at http://staging.spec.oneapi.com.s3-website-us-west-2.amazonaws.com/exclude/ci/branches/%s/'
+            % (args.branch))
+    else:
+        log('Skipping publishing the site because AWS access key is not available. This is expected when building a fork')
 
 @action
 def prod_publish(root, target=None):
@@ -252,18 +256,23 @@ def spec_venv(root, target=None):
     shell('%s install --quiet -r requirements.txt' % pip)
 
 @action
-def clones(root='.', target=None):
+def get_tarballs(root='.', target=None):
     root_only(root)
-    # defer loading this so script can be invoked without installing packages
-    from git import Repo
-    for repo_base in repos:
-        dir = join('repos',repo_base)
-        if os.path.exists(dir):
-            continue
-        uri = '%s/%s.git' % (os.environ['EXTRA_REPOS'], repo_base)
-        log('clone:', uri)
-        if not args.dry_run:
-            Repo.clone_from(uri, dir, multi_options=['--depth','1'])
+    print('exists',os.path.exists('tarballs'))
+    if args.dry_run or os.path.exists('tarballs'):
+        return
+    makedirs('tarballs')
+    for t in tarballs:
+        tf = join('tarballs','%s.tgz' % t)
+        url = 'https://spec.oneapi.com/tarballs/%s.tgz' % t
+        r = requests.get(url, stream = True)
+        log('wget', url, end = ' ')
+        with open(tf, 'wb') as tb:
+            for chunk in r.iter_content(chunk_size = 4 * 1024 * 1024):
+                if chunk:
+                    tb.write(chunk)
+                    log('.', end = '')
+            log('.')
 
 @action
 def site(root, target=None):
@@ -285,7 +294,7 @@ def site(root, target=None):
     copytree(html, versions_x)
     copy(pdf, versions_x)
     for t in tarballs:
-        tf = join('repos','oneapi-spec-tarballs','tarballs','%s.tgz' % t)
+        tf = join('tarballs','%s.tgz' % t)
         log('cd',versions_x,'&& tar zxf',tf)
         if not args.dry_run:
             with tarfile.open(tf) as tar:
@@ -295,9 +304,9 @@ def site(root, target=None):
 @action
 def ci(root, target=None):
     root_only(root)
-    clones(root)
+    get_tarballs(root)
     site(root)
-    if args.branch == 'publish':
+    if args.branch == 'publish' or args.branch == 'refs/heads/publish':
         stage_publish(root)
     else:
         ci_publish(root)
@@ -307,7 +316,7 @@ def ci(root, target=None):
 commands = {'ci': ci,
             'ci-publish': ci_publish,
             'clean': clean,
-            'clones': clones,
+            'get-tarballs': get_tarballs,
             'dockerbuild': dockerbuild,
             'dockerpush': dockerpush,
             'dockerrun': dockerrun,
@@ -332,10 +341,6 @@ def ci(root, target=None):
             'oneL0',
             'oneDAL']
 
-repos = ['onetbb-spec',
-         'oneapi-spec-tarballs']
-
-
 def main():
     global args
     parser = argparse.ArgumentParser(description='Build oneapi spec.')

source/elements/oneTBB/source/configuration/feature_macros.rst

@@ -36,39 +36,6 @@ enabled in the compiler, and 0 otherwise.
    ``TBB_USE_EXCEPTIONS=0``.
 
 
-TBB_USE_CAPTURED_EXCEPTION macro
---------------------------------
-
-The macro 
-``TBB_USE_CAPTURED_EXCEPTION`` controls rethrow of
-exceptions within the library. Because C++03 does not support catching an
-exception on one thread and rethrowing it on another thread, the library
-sometimes resorts to rethrowing an approximation called 
-``tbb::captured_exception``.
-
-* Define 
-  ``TBB_USE_CAPTURED_EXCEPTION=1`` to make the library
-  rethrow an approximation. This is useful for uniform behavior across platforms.
-* Define 
-  ``TBB_USE_CAPTURED_EXCEPTION=0`` to request rethrow of
-  the exact exception. This setting is valid only on platforms that support the
-  std::exception_ptr feature of C++11. Otherwise a compile-time diagnostic is
-  issued.
-
-On Windows* , Linux* and macOS* operating systems,
-the default value is 
-``1`` for supported host compilers with 
-``std::exception_ptr``, and 
-``0`` otherwise. On IA-64 architecture processors the
-default value is 
-``0``.
-
-.. caution::
-
-   In order for exact exception propagation to work
-   properly an appropriate library binary should be used.
-
-
 C++11 Support
 -------------