diff --git a/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/License.txt b/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/License.txt index 6e9524bd74..415025cf03 100644 --- a/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/License.txt +++ b/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/License.txt @@ -1,4 +1,4 @@ -Copyright 2020 Intel Corporation +Copyright Intel Corporation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/README.md b/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/README.md index 604dd14b56..43ca9e2d4e 100644 --- a/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/README.md +++ b/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/README.md @@ -53,9 +53,12 @@ global ID variable) for a single time step. This code sample is licensed under MIT license. - ## Building the `iso2dfd` Program for CPU and GPU +### Include Files + +The include folder is located at %ONEAPI_ROOT%\dev-utilities\latest\include on your development system. + ### Running Samples In DevCloud If running a sample in the Intel DevCloud, remember that you must specify the compute node (CPU, GPU, @@ -92,18 +95,6 @@ Perform the following steps: Right click on the project in Solution explorer and select Rebuild. From top menu select Debug -> Start without Debugging. ->If you see the following error message when compiling this sample: -> -``` -Error 'dpc_common.hpp' file not found -``` ->You need to add the following directory to the list of include folders, that are required by your project, in your project's Visual Studio project property panel. The missing include folder is located at `%ONEAPI_ROOT%\dev-utilities\latest\include` on your development system. - -* Build the program using MSBuild - Open "x64 Native Tools Command Prompt for VS2017" or "x64 Native Tools Command Prompt for VS2019" - Run - MSBuild iso2dfd.sln /t:Rebuild /p:Configuration="Release" - - ## Running the Sample ### Application Parameters diff --git a/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/src/iso2dfd.cpp b/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/src/iso2dfd.cpp index e4638ba703..62bd936ccf 100644 --- a/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/src/iso2dfd.cpp +++ b/DirectProgramming/DPC++/StructuredGrids/iso2dfd_dpcpp/src/iso2dfd.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -327,7 +326,7 @@ int main(int argc, char* argv[]) { // Compute and display time used by device auto time = t_offload.Elapsed(); - cout << "Offload time: " << time << " ms\n\n"; + cout << "Offload time: " << time << " s\n\n"; // Output final wavefield (computed by device) to binary file ofstream out_file; @@ -351,7 +350,7 @@ int main(int argc, char* argv[]) { // Compute and display time used by CPU time = t_cpu.Elapsed(); - cout << "CPU time: " << time << " ms\n\n"; + cout << "CPU time: " << time << " s\n\n"; // Compute error (difference between final wavefields computed in device and // CPU) diff --git a/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/License.txt b/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/License.txt index 148940418d..e63c6e13dc 100644 --- a/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/License.txt +++ b/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/License.txt @@ -1,4 +1,4 @@ -Copyright 2020 Intel Corporation +Copyright Intel Corporation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/Particle_Diffusion.vcxproj b/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/Particle_Diffusion.vcxproj index bd8c54ed7f..ebb9027ed7 100644 --- a/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/Particle_Diffusion.vcxproj +++ b/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/Particle_Diffusion.vcxproj @@ -1,165 +1,165 @@ - - - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {9a9aad41-d608-401f-9339-fecf2c3cd8e4} - Win32Proj - Particle_Diffusion - $(WindowsSDKVersion.Replace("\","")) - - - - Application - true - oneAPI Data Parallel C++ Compiler - Unicode - - - Application - false - oneAPI Data Parallel C++ Compiler - true - Unicode - - - Application - true - Intel(R) oneAPI DPC++ Compiler - Unicode - No - - - Application - false - Intel(R) oneAPI DPC++ Compiler - true - Unicode - No - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Use - Level3 - Disabled - true - true - pch.h - - - Console - true - - - - - Use - Level3 - Disabled - true - true - pch.h - DisableAllWarnings - $(ONEAPI_ROOT)\mkl\latest\include;$(ONEAPI_ROOT)\mkl\latest\include\rng; %(AdditionalIncludeDirectories) - - - Console - true - /link /libpath:"$(ONEAPI_ROOT)\mkl\latest\lib\intel64" mkl_intel_ilp64.lib mkl_sequential.lib mkl_core.lib mkl_sycl.lib opencl.lib %(AdditionalOptions) - -fsycl-device-code-split;%(SpecifyDevCmplAdditionalOptions) - $(ONEAPI_ROOT)/mkl/latest/lib/intel64/mkl_sycl.lib - - - - - Use - Level3 - MaxSpeed - true - true - true - true - pch.h - - - Console - true - true - true - - - - - Use - Level3 - MaxSpeed - true - true - true - true - pch.h - DisableAllWarnings - $(ONEAPI_ROOT)\mkl\latest\include;$(ONEAPI_ROOT)\mkl\latest\include\rng; %(AdditionalIncludeDirectories) - - - Console - true - true - true - /link /libpath:"$(ONEAPI_ROOT)\mkl\latest\lib\intel64" mkl_intel_ilp64.lib mkl_sequential.lib mkl_core.lib mkl_sycl.lib opencl.lib %(AdditionalOptions) - -fsycl-device-code-split;%(SpecifyDevCmplAdditionalOptions) - $(ONEAPI_ROOT)/mkl/latest/lib/intel64/mkl_sycl.lib - - - - - - - - - - - - - - - \ No newline at end of file + + + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {9a9aad41-d608-401f-9339-fecf2c3cd8e4} + Win32Proj + Particle_Diffusion + $(WindowsSDKVersion.Replace("\","")) + + + + Application + true + oneAPI Data Parallel C++ Compiler + Unicode + + + Application + false + oneAPI Data Parallel C++ Compiler + true + Unicode + + + Application + true + Intel(R) oneAPI DPC++ Compiler + Unicode + No + + + Application + false + Intel(R) oneAPI DPC++ Compiler + true + Unicode + No + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + true + true + pch.h + + + Console + true + + + + + Use + Level3 + Disabled + true + true + pch.h + DisableAllWarnings + $(ONEAPI_ROOT)dev-utilities\latest\include;$(ONEAPI_ROOT)\mkl\latest\include;$(ONEAPI_ROOT)\mkl\latest\include\rng; %(AdditionalIncludeDirectories) + + + Console + true + /link /libpath:"$(ONEAPI_ROOT)\mkl\latest\lib\intel64" mkl_intel_ilp64.lib mkl_sequential.lib mkl_core.lib mkl_sycl.lib opencl.lib %(AdditionalOptions) + -fsycl-device-code-split;%(SpecifyDevCmplAdditionalOptions) + $(ONEAPI_ROOT)/mkl/latest/lib/intel64/mkl_sycl.lib + + + + + Use + Level3 + MaxSpeed + true + true + true + true + pch.h + + + Console + true + true + true + + + + + Use + Level3 + MaxSpeed + true + true + true + true + pch.h + DisableAllWarnings + $(ONEAPI_ROOT)dev-utilities\latest\include;$(ONEAPI_ROOT)\mkl\latest\include;$(ONEAPI_ROOT)\mkl\latest\include\rng; %(AdditionalIncludeDirectories) + + + Console + true + true + true + /link /libpath:"$(ONEAPI_ROOT)\mkl\latest\lib\intel64" mkl_intel_ilp64.lib mkl_sequential.lib mkl_core.lib mkl_sycl.lib opencl.lib %(AdditionalOptions) + -fsycl-device-code-split;%(SpecifyDevCmplAdditionalOptions) + $(ONEAPI_ROOT)/mkl/latest/lib/intel64/mkl_sycl.lib + + + + + + + + + + + + + + + diff --git a/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/README.md b/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/README.md index 50c61fa567..fc1e4910a4 100644 --- a/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/README.md +++ b/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/README.md @@ -104,18 +104,6 @@ Perform the following steps: Right click on the project in Solution explorer and select Rebuild From top menu select Debug -> Start without Debugging ->If you see the following error message when compiling this sample: -> -``` -Error 'dpc_common.hpp' file not found -``` ->You need to add the following directory to the list of include folders, that are required by your project, in your project's Visual Studio project property panel. The missing include folder is located at `%ONEAPI_ROOT%\dev-utilities\latest\include` on your development system. - - * Build the program using MSBuild - Open "x64 Native Tools Command Prompt for VS2017" or "x64 Native Tools Command Prompt for VS2019" - Run - MSBuild Particle_Diffusion.sln /t:Rebuild /p:Configuration="Release" - - ## Running the Sample ### Application Parameters diff --git a/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/src/motionsim.cpp b/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/src/motionsim.cpp index fda492d9e0..efbdb7c728 100644 --- a/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/src/motionsim.cpp +++ b/DirectProgramming/DPC++/StructuredGrids/particle-diffusion/src/motionsim.cpp @@ -25,7 +25,6 @@ // #include -#include #include #include #include