Skip to content

Fix git push error for protected CLA branch #749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jan 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f955b72
Consolidated chapter 3.
DennisLee-DennisLee Jan 18, 2019
0cd9724
Copied all Appendix A child articles into the parent.
DennisLee-DennisLee Jan 19, 2019
9fc2749
Minor copyediting fixes.
DennisLee-DennisLee Jan 19, 2019
79aea0b
Merge branch 'master' of https://github.com/MicrosoftDocs/cpp-docs-pr
DennisLee-DennisLee Jan 22, 2019
5bbd875
Merge branch 'master' of https://github.com/MicrosoftDocs/cpp-docs-pr…
DennisLee-DennisLee Jan 23, 2019
feb44ac
Acrolinx and other cleanup for appendix B, D, E, and F.
DennisLee-DennisLee Jan 23, 2019
d773465
Mostly parallel construction changes.
DennisLee-DennisLee Jan 23, 2019
8556bd2
Merge branch 'master' of https://github.com/MicrosoftDocs/cpp-docs-pr…
DennisLee-DennisLee Jan 24, 2019
e3f23cb
Merge branch 'master' of https://github.com/MicrosoftDocs/cpp-docs-pr…
DennisLee-DennisLee Jan 25, 2019
58cfd15
Fixed the redirect conflict - merge the upstream master pull.
DennisLee-DennisLee Jan 25, 2019
d50e6e0
Merge pull request #1663 from DennisLee-DennisLee/v-dele-1362562-2
GitHubber17 Jan 25, 2019
3b31ffa
Merge branch 'master' of https://github.com/MicrosoftDocs/cpp-docs-pr…
DennisLee-DennisLee Jan 25, 2019
774db6a
Merge pull request #1677 from MicrosoftDocs/master
Taojunshen Jan 25, 2019
a49dfde
Adding corresponding changes to TOC, contents, and redirects.
DennisLee-DennisLee Jan 25, 2019
1da367e
Fixing the bookmark text in a redirect target.
DennisLee-DennisLee Jan 25, 2019
10c91bc
Merge pull request #1666 from DennisLee-DennisLee/v-dele-1362562-3
v-shils Jan 25, 2019
09be5bf
Merge branch 'master' of https://github.com/MicrosoftDocs/cpp-docs-pr…
DennisLee-DennisLee Jan 25, 2019
4e1e424
Fixed internal links so they don't have to rely on the redirect file.…
DennisLee-DennisLee Jan 26, 2019
498861b
Merge pull request #1678 from DennisLee-DennisLee/v-dele-1362562-5
GitHubber17 Jan 27, 2019
382e247
Merge pull request #1679 from MicrosoftDocs/master
Taojunshen Jan 28, 2019
143ca86
Merging changes synced from https://github.com/MicrosoftDocs/cpp-docs…
opbld16 Jan 28, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
255 changes: 255 additions & 0 deletions .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -10434,6 +10434,261 @@
"source_path": "docs/parallel/openmp/2-9-directive-nesting.md",
"redirect_url": "/cpp/parallel/openmp/2-directives#29-directive-nesting",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-execution-environment-functions.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#31-execution-environment-functions",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-2-lock-functions.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#32-lock-functions",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-3-timing-routines.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#33-timing-routines",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-1-omp-set-num-threads-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#311-omp_set_num_threads-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-2-omp-get-num-threads-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#312-omp_get_num_threads-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-3-omp-get-max-threads-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#313-omp_get_max_threads-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-4-omp-get-thread-num-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#314-omp_get_thread_num-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-5-omp-get-num-procs-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#315-omp_get_num_procs-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-6-omp-in-parallel-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#316-omp_in_parallel-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-7-omp-set-dynamic-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#317-omp_set_dynamic-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-8-omp-get-dynamic-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#318-omp_get_dynamic-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-9-omp-set-nested-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#319-omp_set_nested-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-1-10-omp-get-nested-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#3110-omp_get_nested-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-2-1-omp-init-lock-and-omp-init-nest-lock-functions.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#321-omp_init_lock-and-omp_init_nest_lock-functions",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-2-2-omp-destroy-lock-and-omp-destroy-nest-lock-functions.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#322-omp_destroy_lock-and-omp_destroy_nest_lock-functions",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-2-3-omp-set-lock-and-omp-set-nest-lock-functions.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#323-omp_set_lock-and-omp_set_nest_lock-functions",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-2-4-omp-unset-lock-and-omp-unset-nest-lock-functions.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#324-omp_unset_lock-and-omp_unset_nest_lock-functions",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-2-5-omp-test-lock-and-omp-test-nest-lock-functions.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#325-omp_test_lock-and-omp_test_nest_lock-functions",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-3-1-omp-get-wtime-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#331-omp_get_wtime-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/3-3-2-omp-get-wtick-function.md",
"redirect_url": "/cpp/parallel/openmp/3-run-time-library-functions#332-omp_get_wtick-function",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-1-executing-a-simple-loop-in-parallel.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a1-a-simple-loop-in-parallel",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-2-specifying-conditional-compilation.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a2-conditional-compilation",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-3-using-parallel-regions.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a3-parallel-regions",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-4-using-the-nowait-clause.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a4-the-nowait-clause",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-5-using-the-critical-directive.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a5-the-critical-directive",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-6-using-the-lastprivate-clause.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a6-the-lastprivate-clause",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-7-using-the-reduction-clause.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a7-the-reduction-clause",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-8-specifying-parallel-sections.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a8-parallel-sections",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-9-using-single-directives.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a9-single-directives",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-10-specifying-sequential-ordering.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a10-sequential-ordering",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-11-specifying-a-fixed-number-of-threads.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a11-a-fixed-number-of-threads",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-12-using-the-atomic-directive.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a12-the-atomic-directive",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-13-using-the-flush-directive-with-a-list.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a13-a-flush-directive-with-a-list",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-14-using-the-flush-directive-without-a-list.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a14-a-flush-directive-without-a-list",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-15-determining-the-number-of-threads-used.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a15-the-number-of-threads-used",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-16-using-locks.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a16-locks",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-17-using-nestable-locks.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a17-nestable-locks",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-18-nested-for-directives.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a18-nested-for-directives",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-19-examples-showing-incorrect-nesting-of-work-sharing-directives.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a19-examples-showing-incorrect-nesting-of-work-sharing-directives",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-20-binding-of-barrier-directives.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a20-bind-barrier-directives",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-21-scoping-variables-with-the-private-clause.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a21-scope-variables-with-the-private-clause",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-22-using-the-default-none-clause.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a22-the-defaultnone-clause",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-23-examples-of-the-ordered-directive.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a23-examples-of-the-ordered-directive",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-24-example-of-the-private-clause.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a24-example-of-the-private-clause",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-25-examples-of-the-copyprivate-data-attribute-clause.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a25-examples-of-the-copyprivate-data-attribute-clause",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-26-using-the-threadprivate-directive.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a26-the-threadprivate-directive",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-27-use-of-c99-variable-length-arrays.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a27-c99-variable-length-arrays",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-28-use-of-num-threads-clause.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a28-the-num_threads-clause",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-29-use-of-work-sharing-constructs-inside-a-critical-construct.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a29-work-sharing-constructs-inside-a-critical-construct",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-30-use-of-reprivatization.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a30-reprivatization",
"redirect_document_id": false
},
{
"source_path": "docs/parallel/openmp/a-31-thread-safe-lock-functions.md",
"redirect_url": "/cpp/parallel/openmp/a-examples#a31-thread-safe-lock-functions",
"redirect_document_id": false
}

]
Expand Down
6 changes: 3 additions & 3 deletions docs/parallel/openmp/1-introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The following terms are used in this document:

- construct

A construct is a statement. It consists of a directive, followed by a structured block. Some directives aren't part of a construct. (See *openmp-directive* in [Appendix C](c-openmp-c-and-cpp-grammar.md)).
A construct is a statement. It consists of a directive, followed by a structured block. Some directives aren't part of a construct. (See *openmp-directive* in [appendix C](c-openmp-c-and-cpp-grammar.md)).

- directive

Expand Down Expand Up @@ -111,7 +111,7 @@ The OpenMP C and C++ API is an extension to the base language that's supported b

All standard C and C++ library functions and built-in functions (that is, functions of which the compiler has specific knowledge) must be thread-safe. Unsynchronized use of thread-safe functions by different threads inside a parallel region doesn't produce undefined behavior. However, the behavior might not be the same as in a serial region. (A random number generation function is an example.)

The OpenMP C/C++ API specifies that certain behavior is *implementation-defined.* A conforming OpenMP implementation is required to define and document its behavior in these cases. For a list of implementation-defined behaviors, see [Appendix E](e-implementation-defined-behaviors-in-openmp-c-cpp.md).
The OpenMP C/C++ API specifies that certain behavior is *implementation-defined.* A conforming OpenMP implementation is required to define and document its behavior in these cases. For a list of implementation-defined behaviors, see [appendix E](e-implementation-defined-behaviors-in-openmp-c-cpp.md).

## 1.5 Normative references

Expand All @@ -128,4 +128,4 @@ Where this OpenMP API specification refers to C, reference is made to the base l
- [Run-time library functions](3-run-time-library-functions.md)
- [Environment variables](4-environment-variables.md)
- [Implementation-defined behaviors in OpenMP C/C++](e-implementation-defined-behaviors-in-openmp-c-cpp.md)
- [New features in OpenMP C/C++ Version 2.0](f-new-features-and-clarifications-in-version-2-0.md)
- [New features in OpenMP C/C++ version 2.0](f-new-features-and-clarifications-in-version-2-0.md)
20 changes: 10 additions & 10 deletions docs/parallel/openmp/2-directives.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ Restrictions to the `parallel` directive are as follows:
### Cross-references

- `private`, `firstprivate`, `default`, `shared`, `copyin`, and `reduction` clauses ([section 2.7.2](#272-data-sharing-attribute-clauses))
- [OMP_NUM_THREADS](4-2-omp-num-threads.md) environment variable
- [omp_set_dynamic](3-1-7-omp-set-dynamic-function.md) library function
- [OMP_DYNAMIC](4-3-omp-dynamic.md) environment variable
- [omp_set_nested](3-1-9-omp-set-nested-function.md) function
- [OMP_NESTED](4-4-omp-nested.md) environment variable
- [omp_set_num_threads](3-1-1-omp-set-num-threads-function.md) library function
- [OMP_NUM_THREADS](4-environment-variables.md#42-omp_num_threads) environment variable
- [omp_set_dynamic](3-run-time-library-functions.md#317-omp_set_dynamic-function) library function
- [OMP_DYNAMIC](4-environment-variables.md#43-omp_dynamic) environment variable
- [omp_set_nested](3-run-time-library-functions.md#319-omp_set_nested-function) function
- [OMP_NESTED](4-environment-variables.md#44-omp_nested) environment variable
- [omp_set_num_threads](3-run-time-library-functions.md#311-omp_set_num_threads-function) library function

## 2.4 Work-sharing constructs

Expand Down Expand Up @@ -221,7 +221,7 @@ Restrictions to the `for` directive are as follows:
#### Cross-references

- `private`, `firstprivate`, `lastprivate`, and `reduction` clauses ([section 2.7.2](#272-data-sharing-attribute-clauses))
- [OMP_SCHEDULE](4-1-omp-schedule.md) environment variable
- [OMP_SCHEDULE](4-environment-variables.md#41-omp_schedule) environment variable
- [ordered](#266-ordered-construct) construct
- [schedule](d-using-the-schedule-clause.md) clause

Expand Down Expand Up @@ -514,7 +514,7 @@ Restrictions to the `ordered` directive are as follows:

This section presents a directive and several clauses for controlling the data environment during the execution of parallel regions, as follows:

- A `threadprivate` directive (see the following section) is provided to make file- scope, namespace-scope, or static block-scope variables local to a thread.
- A [threadprivate](#271-threadprivate-directive) directive is provided to make file- scope, namespace-scope, or static block-scope variables local to a thread.

- Clauses that may be specified on the directives to control the sharing attributes of variables for the duration of the parallel or work-sharing constructs are described in [section 2.7.2](#272-data-sharing-attribute-clauses).

Expand Down Expand Up @@ -576,8 +576,8 @@ void f(int n) {

#### Cross-references

- [dynamic threads](3-1-7-omp-set-dynamic-function.md)
- [OMP_DYNAMIC](4-3-omp-dynamic.md) environment variable
- [dynamic threads](3-run-time-library-functions.md#317-omp_set_dynamic-function)
- [OMP_DYNAMIC](4-environment-variables.md#43-omp_dynamic) environment variable

### 2.7.2 Data-sharing attribute clauses

Expand Down
Loading