diff --git a/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/01_SYCL_Migration_Simple_VectorAdd.ipynb b/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/01_SYCL_Migration_Simple_VectorAdd.ipynb index f380241b82..24774385a4 100755 --- a/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/01_SYCL_Migration_Simple_VectorAdd.ipynb +++ b/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/01_SYCL_Migration_Simple_VectorAdd/01_SYCL_Migration_Simple_VectorAdd.ipynb @@ -144,11 +144,10 @@ " - copy link to latest `linux_release.tgz` from assets\n", " - on the CUDA development machine: `mkdir syclomatic; cd syclomatic`\n", " - `wget `\n", - " - `tar -cvf linux_release.tgz`\n", - " - `export PATH=\"/home/$USER/syclomatic/bin:$PATH\"`\n", - "- Copy the above `vectoradd.cu` CUDA source to this machine\n", - "- Compile and run the `vectoradd.cu`\n", - " - nvcc vectoradd.cu\n", + " - `tar -xvf linux_release.tgz`\n", + " - `export PATH=\"/home/$USER/syclomatic/bin:$PATH\"`\n", + " - Verify installation: `c2s --version`\n", + "- Create a working directory and copy the above `vectoradd.cu` CUDA source to this machine\n", "\n", "\n", "### Migrate CUDA source to SYCL source using SYCLomatic\n", @@ -168,7 +167,7 @@ "Next we will use the `c2s --out-root` option to specify a custom output directory like shown below:\n", "\n", "```\n", - "c2s --out-root sycl_code vectoradd.cu\n", + "c2s vectoradd.cu --use-custom-helper=api --out-root sycl_code\n", "```\n", "\n", "This command should migrate the CUDA source to SYCL source in a folder named `sycl_code`\n", @@ -249,7 +248,14 @@ " sycl::free(d_C, q_ct1);\n", " return 0;\n", "}\n", - "```" + "```\n", + "\n", + "The migrated SYCL code can be compiled using the following command in terminal:\n", + "```sh\n", + "icpx -fsycl -I include vectoradd.dp.cpp\n", + "```\n", + "\n", + "OR you can compile and run by executing the cell below:" ] }, { @@ -323,7 +329,7 @@ "source": [ "## Manually Optimize the migrated SYCL source\n", "\n", - "The SYCLomaticy Tool will migrate the CUDA code to the SYCL code to get functionality, but you may have to manually optimize the resulting SYCL code for optimal performance.\n", + "The SYCLomatic Tool will migrate the CUDA code to the SYCL code to get functionality, but you may have to manually optimize the resulting SYCL code for optimal performance.\n", "\n", "Now that we have successfully migrated the CUDA code to the SYCL code and executed on an Intel CPU/GPU, let’s look at what manual optimizations we can do.\n", "\n", @@ -339,7 +345,7 @@ "The above code is also creating a SYCL queue with an `in_order` queue property and is doing a default device selection, which is the same as the code below using just SYCL api syntax:\n", "\n", "```cpp\n", - "sycl::queue q_ct1{sycl::default_selector(), sycl::property::queue::in_order()};\n", + "sycl::queue q_ct1{sycl::default_selector_v(), sycl::property::queue::in_order()};\n", "```\n", "\n", "Using an `in_order` queue property will not allow kernels with no dependency to overlap execution. Therefore, we will remove the `in_order` queue property and add event-based dependency between kernels.\n", diff --git a/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/02_SYCL_Migration_SortingNetworks/02_SYCL_Migration_SortingNetworks.ipynb b/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/02_SYCL_Migration_SortingNetworks/02_SYCL_Migration_SortingNetworks.ipynb index 0673d4cb0d..26d935f6b2 100755 --- a/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/02_SYCL_Migration_SortingNetworks/02_SYCL_Migration_SortingNetworks.ipynb +++ b/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/02_SYCL_Migration_SortingNetworks/02_SYCL_Migration_SortingNetworks.ipynb @@ -123,8 +123,9 @@ " - copy link to latest `linux_release.tgz` from assets\n", " - on the CUDA development machine: `mkdir syclomatic; cd syclomatic`\n", " - `wget `\n", - " - `tar -cvf linux_release.tgz`\n", - " - `export PATH=\"/home/$USER/syclomatic/bin:$PATH\"`\n", + " - `tar -xvf linux_release.tgz`\n", + " - `export PATH=\"/home/$USER/syclomatic/bin:$PATH\"`\n", + " - Verify installation: `c2s --version`\n", "- pull the CUDA samples repo to this machine\n", " - `git clone https://github.com/NVIDIA/cuda-samples.git`\n", "- Compile and run the `sortingNetworks` sample\n", diff --git a/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/03_SYCL_Migration_Jacobi_Iterative/03_SYCL_Migration_Jacobi_Iterative.ipynb b/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/03_SYCL_Migration_Jacobi_Iterative/03_SYCL_Migration_Jacobi_Iterative.ipynb index 448ea7dcde..d8b88dab4b 100755 --- a/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/03_SYCL_Migration_Jacobi_Iterative/03_SYCL_Migration_Jacobi_Iterative.ipynb +++ b/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/03_SYCL_Migration_Jacobi_Iterative/03_SYCL_Migration_Jacobi_Iterative.ipynb @@ -124,8 +124,9 @@ " - copy link to latest `linux_release.tgz` from assets\n", " - on the CUDA development machine: `mkdir syclomatic; cd syclomatic`\n", " - `wget `\n", - " - `tar -cvf linux_release.tgz`\n", - " - `export PATH=\"/home/$USER/syclomatic/bin:$PATH\"`\n", + " - `tar -xvf linux_release.tgz`\n", + " - `export PATH=\"/home/$USER/syclomatic/bin:$PATH\"`\n", + " - Verify installation: `c2s --version`\n", "- pull the CUDA samples repo to this machine\n", " - `git clone https://github.com/NVIDIA/cuda-samples.git`\n", "- Compile and run the `jacobiCudaGraphs` sample\n", diff --git a/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/04_SYCL_Migration_MatrixMul_CuBlas/04_SYCL_Migration_MatrixMul_CuBlas.ipynb b/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/04_SYCL_Migration_MatrixMul_CuBlas/04_SYCL_Migration_MatrixMul_CuBlas.ipynb index 08df9db77a..8944a8dc03 100755 --- a/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/04_SYCL_Migration_MatrixMul_CuBlas/04_SYCL_Migration_MatrixMul_CuBlas.ipynb +++ b/DirectProgramming/C++SYCL/Jupyter/cuda-to-sycl-migration-training/04_SYCL_Migration_MatrixMul_CuBlas/04_SYCL_Migration_MatrixMul_CuBlas.ipynb @@ -109,8 +109,9 @@ " - copy link to latest `linux_release.tgz` from assets\n", " - on the CUDA development machine: `mkdir syclomatic; cd syclomatic`\n", " - `wget `\n", - " - `tar -cvf linux_release.tgz`\n", - " - `export PATH=\"/home/$USER/syclomatic/bin:$PATH\"`\n", + " - `tar -xvf linux_release.tgz`\n", + " - `export PATH=\"/home/$USER/syclomatic/bin:$PATH\"`\n", + " - Verify installation: `c2s --version`\n", "- pull the CUDA samples repo to this machine\n", " - `git clone https://github.com/NVIDIA/cuda-samples.git`\n", "- Compile and run the `matrixMulCUBLAS` sample\n", diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/db/src/dbdata.cpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/db/src/dbdata.cpp index 0d3e62f045..4bdd04f26f 100644 --- a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/db/src/dbdata.cpp +++ b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/db/src/dbdata.cpp @@ -955,4 +955,4 @@ void Database::PrintQ12(std::string& SM1, std::string& SM2, // Restore the output format of cout std::cout.copyfmt(oldState); -} +} \ No newline at end of file diff --git a/DirectProgramming/C++SYCL_FPGA/Tutorials/DesignPatterns/shannonization/README.md b/DirectProgramming/C++SYCL_FPGA/Tutorials/DesignPatterns/shannonization/README.md index d2bfd85b24..cf4c5fdeb9 100644 --- a/DirectProgramming/C++SYCL_FPGA/Tutorials/DesignPatterns/shannonization/README.md +++ b/DirectProgramming/C++SYCL_FPGA/Tutorials/DesignPatterns/shannonization/README.md @@ -39,9 +39,9 @@ flowchart LR tier2("Tier 2: Explore the Fundamentals") tier3("Tier 3: Explore the Advanced Techniques") tier4("Tier 4: Explore the Reference Designs") - + tier1 --> tier2 --> tier3 --> tier4 - + style tier1 fill:#0071c1,stroke:#0071c1,stroke-width:1px,color:#fff style tier2 fill:#0071c1,stroke:#0071c1,stroke-width:1px,color:#fff style tier3 fill:#f96,stroke:#333,stroke-width:1px,color:#fff @@ -424,4 +424,4 @@ PASSED Code samples are licensed under the MIT license. See [License.txt](https://github.com/oneapi-src/oneAPI-samples/blob/master/License.txt) for details. -Third party program Licenses can be found here: [third-party-programs.txt](https://github.com/oneapi-src/oneAPI-samples/blob/master/third-party-programs.txt). \ No newline at end of file +Third party program Licenses can be found here: [third-party-programs.txt](https://github.com/oneapi-src/oneAPI-samples/blob/master/third-party-programs.txt). diff --git a/third-party-programs.txt b/third-party-programs.txt index 1fac18875f..a48f61c353 100644 --- a/third-party-programs.txt +++ b/third-party-programs.txt @@ -512,6 +512,27 @@ zlib License misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. +-------------------------------------------------------------------------------- +11. Google API + + The Google APIs provide fall back support for fonts used in the oneAPI + Samples Catalog. The specific fall back fonts used are: + Open+Sans&family and Roboto. + + 1. The Google APIs Terms of Service are found at: + https://developers.google.com/terms + + 1a. The website cited above was accessed on 29 March 2023. + + 1b. These Google API endpoints are used for the above-cited fonts, + whose base urls are: + - https://fonts.googleapis.com + - https://fonts.gstatic.com + - https://fonts.googleapis.com + + 2. The Google Fonts API Terms of Service are found at: + "https://developers.google.com/fonts/terms" + -------------------------------------------------------------------------------- The following third party programs have their own third party program files as well. These additional third party program files are as follows: