From 5a579b6932a87478a6463323cf11227e49c2c80a Mon Sep 17 00:00:00 2001 From: "Wei, Jimmy T" Date: Wed, 29 Nov 2023 16:22:39 -0800 Subject: [PATCH 1/3] Updated Windows samples that contain VS project files to support 2024.0 --- .../gamma-correction/gamma-correction.vcxproj | 16 ++-------------- .../oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj | 10 ++-------- .../tbb-resumable-tasks-sycl.vcxproj | 12 +++--------- .../oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj | 12 +++--------- .../tachyon/windows/msvs/build_with_tbb.vcxproj | 12 ------------ .../msvs/build_with_tbb_optimized.vcxproj | 13 ------------- 6 files changed, 10 insertions(+), 65 deletions(-) diff --git a/Libraries/oneDPL/gamma-correction/gamma-correction.vcxproj b/Libraries/oneDPL/gamma-correction/gamma-correction.vcxproj index 4fa148ec62..8af5cb61e2 100644 --- a/Libraries/oneDPL/gamma-correction/gamma-correction.vcxproj +++ b/Libraries/oneDPL/gamma-correction/gamma-correction.vcxproj @@ -34,6 +34,7 @@ true Intel(R) oneAPI DPC++ Compiler 2024 Unicode + true Application @@ -41,6 +42,7 @@ Intel(R) oneAPI DPC++ Compiler 2024 true Unicode + true @@ -80,15 +82,8 @@ Console true - /link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions) /Od - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\" - - - copy tbb12_debug.dll to binary folder - @@ -108,14 +103,7 @@ true true true - /link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions) - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\" - - - copy tbb12.dll to binary folder - diff --git a/Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj b/Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj index 29c514db32..fe2c3b82a2 100755 --- a/Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj +++ b/Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj @@ -23,6 +23,7 @@ true Intel(R) oneAPI DPC++ Compiler 2024 Unicode + true Application @@ -30,6 +31,7 @@ Intel(R) oneAPI DPC++ Compiler 2024 true Unicode + true @@ -66,12 +68,8 @@ Console true false - /link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions) /Od - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\" - @@ -94,11 +92,7 @@ true true false - /link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions) - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\" - diff --git a/Libraries/oneTBB/tbb-resumable-tasks-sycl/tbb-resumable-tasks-sycl.vcxproj b/Libraries/oneTBB/tbb-resumable-tasks-sycl/tbb-resumable-tasks-sycl.vcxproj index 60d2ada768..1b9b398b65 100755 --- a/Libraries/oneTBB/tbb-resumable-tasks-sycl/tbb-resumable-tasks-sycl.vcxproj +++ b/Libraries/oneTBB/tbb-resumable-tasks-sycl/tbb-resumable-tasks-sycl.vcxproj @@ -23,6 +23,7 @@ true Intel(R) oneAPI DPC++ Compiler 2024 Unicode + true Application @@ -30,6 +31,7 @@ Intel(R) oneAPI DPC++ Compiler 2024 true Unicode + true @@ -65,12 +67,8 @@ Console true false - /link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions) /Od - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\" - @@ -92,11 +90,7 @@ true true false - /link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions) - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\" - @@ -110,4 +104,4 @@ - + \ No newline at end of file diff --git a/Libraries/oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj b/Libraries/oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj index dc6d4781e6..b67546514b 100755 --- a/Libraries/oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj +++ b/Libraries/oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj @@ -23,6 +23,7 @@ true Intel(R) oneAPI DPC++ Compiler 2024 Unicode + true Application @@ -30,6 +31,7 @@ Intel(R) oneAPI DPC++ Compiler 2024 true Unicode + true @@ -66,12 +68,8 @@ Console true false - /link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions) /Od - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\" - @@ -94,11 +92,7 @@ true true false - /link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib" %(AdditionalOptions) - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\" - @@ -112,4 +106,4 @@ - + \ No newline at end of file diff --git a/Tools/VTuneProfiler/tachyon/windows/msvs/build_with_tbb.vcxproj b/Tools/VTuneProfiler/tachyon/windows/msvs/build_with_tbb.vcxproj index 86caf79f64..60d8ae5213 100644 --- a/Tools/VTuneProfiler/tachyon/windows/msvs/build_with_tbb.vcxproj +++ b/Tools/VTuneProfiler/tachyon/windows/msvs/build_with_tbb.vcxproj @@ -118,9 +118,6 @@ MachineX86 - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(OutDir)\" - @@ -153,9 +150,6 @@ MachineX64 - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(OutDir)\" - @@ -189,9 +183,6 @@ MachineX86 - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(OutDir)\" - @@ -225,9 +216,6 @@ MachineX64 - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(OutDir)\" - diff --git a/Tools/VTuneProfiler/tachyon/windows/msvs/build_with_tbb_optimized.vcxproj b/Tools/VTuneProfiler/tachyon/windows/msvs/build_with_tbb_optimized.vcxproj index a7ace57bb4..a12df82733 100644 --- a/Tools/VTuneProfiler/tachyon/windows/msvs/build_with_tbb_optimized.vcxproj +++ b/Tools/VTuneProfiler/tachyon/windows/msvs/build_with_tbb_optimized.vcxproj @@ -119,9 +119,6 @@ MachineX86 - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(OutDir)\" - @@ -154,9 +151,6 @@ MachineX64 - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12_debug.dll" "$(OutDir)\" - @@ -190,10 +184,6 @@ MachineX86 - - Copying DLLs and PDBs - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(OutDir)\" - @@ -227,9 +217,6 @@ MachineX64 - - copy /y "$(ONEAPI_ROOT)\tbb\latest\bin\tbb12.dll" "$(OutDir)\" - From 91acde091841eef5451258ffa8813ddbc02b4c02 Mon Sep 17 00:00:00 2001 From: "Wei, Jimmy T" Date: Wed, 29 Nov 2023 16:33:07 -0800 Subject: [PATCH 2/3] Renamed matrix_mul_dpcpp.vcxproj to matrix_mul_sycl.vcxproj --- .../{matrix_mul_dpcpp.vcxproj => matrix_mul_sycl.vcxproj} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename DirectProgramming/C++SYCL/DenseLinearAlgebra/matrix_mul/{matrix_mul_dpcpp.vcxproj => matrix_mul_sycl.vcxproj} (100%) diff --git a/DirectProgramming/C++SYCL/DenseLinearAlgebra/matrix_mul/matrix_mul_dpcpp.vcxproj b/DirectProgramming/C++SYCL/DenseLinearAlgebra/matrix_mul/matrix_mul_sycl.vcxproj similarity index 100% rename from DirectProgramming/C++SYCL/DenseLinearAlgebra/matrix_mul/matrix_mul_dpcpp.vcxproj rename to DirectProgramming/C++SYCL/DenseLinearAlgebra/matrix_mul/matrix_mul_sycl.vcxproj From 15baf6b281c231e486a5ec9a6df01563f78655cd Mon Sep 17 00:00:00 2001 From: "Wei, Jimmy T" Date: Fri, 1 Dec 2023 10:50:21 -0800 Subject: [PATCH 3/3] Updated AdditionalIncludeDirectories in VS project files to support both oneapi-vars and setvars.bat --- .../C++SYCL/CombinationalLogic/mandelbrot/mandelbrot.vcxproj | 4 ++-- .../CombinationalLogic/sepia-filter/sepia-filter.vcxproj | 4 ++-- .../DenseLinearAlgebra/complex_mult/complex_mult.vcxproj | 4 ++-- .../DenseLinearAlgebra/matrix_mul/matrix_mul_sycl.vcxproj | 4 ++-- .../all-pairs-shortest-paths/all-pairs-shortest-paths.vcxproj | 4 ++-- .../C++SYCL/GraphTraversal/bitonic-sort/bitonic-sort.vcxproj | 4 ++-- .../hidden-markov-models/hidden-markov-models.vcxproj | 4 ++-- .../C++SYCL/MapReduce/MonteCarloPi/MonteCarloPi.vcxproj | 4 ++-- DirectProgramming/C++SYCL/N-BodyMethods/Nbody/Nbody.vcxproj | 4 ++-- .../C++SYCL/ParallelPatterns/PrefixSum/PrefixSum.vcxproj | 4 ++-- .../C++SYCL/ParallelPatterns/loop-unroll/loop-unroll.vcxproj | 4 ++-- .../C++SYCL/SparseLinearAlgebra/merge-spmv/merge-spmv.vcxproj | 4 ++-- .../SpectralMethods/DiscreteCosineTransform/msvs/DCT.vcxproj | 4 ++-- .../StructuredGrids/1d_HeatTransfer/1d_HeatTransfer.vcxproj | 4 ++-- .../C++SYCL/StructuredGrids/iso2dfd_dpcpp/iso2dfd.vcxproj | 4 ++-- .../C++SYCL/StructuredGrids/iso3dfd_dpcpp/iso3dfd.vcxproj | 4 ++-- .../dynamic_selection/sepia-filter-ds/sepia-filter.vcxproj | 4 ++-- .../dynamic_selection/sepia-filter-ds/sepia-policies.vcxproj | 4 ++-- Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj | 4 ++-- Libraries/oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj | 4 ++-- Tools/Advisor/matrix_multiply_advisor/matrix_multiply.vcxproj | 4 ++-- .../array-transform/array-transform.vcxproj | 4 ++-- .../matrix_multiply_vtune/matrix_multiply.vcxproj | 4 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/DirectProgramming/C++SYCL/CombinationalLogic/mandelbrot/mandelbrot.vcxproj b/DirectProgramming/C++SYCL/CombinationalLogic/mandelbrot/mandelbrot.vcxproj index 31f9d770df..f0f6b4d94c 100644 --- a/DirectProgramming/C++SYCL/CombinationalLogic/mandelbrot/mandelbrot.vcxproj +++ b/DirectProgramming/C++SYCL/CombinationalLogic/mandelbrot/mandelbrot.vcxproj @@ -70,7 +70,7 @@ true pch.h Level3 - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -88,7 +88,7 @@ true pch.h Level3 - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/CombinationalLogic/sepia-filter/sepia-filter.vcxproj b/DirectProgramming/C++SYCL/CombinationalLogic/sepia-filter/sepia-filter.vcxproj index 829af33765..9841cdd4e6 100644 --- a/DirectProgramming/C++SYCL/CombinationalLogic/sepia-filter/sepia-filter.vcxproj +++ b/DirectProgramming/C++SYCL/CombinationalLogic/sepia-filter/sepia-filter.vcxproj @@ -58,7 +58,7 @@ true pch.h DisableAllWarnings - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -77,7 +77,7 @@ true pch.h DisableAllWarnings - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/DenseLinearAlgebra/complex_mult/complex_mult.vcxproj b/DirectProgramming/C++SYCL/DenseLinearAlgebra/complex_mult/complex_mult.vcxproj index 159883684d..17f7dcdc3f 100644 --- a/DirectProgramming/C++SYCL/DenseLinearAlgebra/complex_mult/complex_mult.vcxproj +++ b/DirectProgramming/C++SYCL/DenseLinearAlgebra/complex_mult/complex_mult.vcxproj @@ -69,7 +69,7 @@ true true pch.h - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -87,7 +87,7 @@ true true pch.h - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/DenseLinearAlgebra/matrix_mul/matrix_mul_sycl.vcxproj b/DirectProgramming/C++SYCL/DenseLinearAlgebra/matrix_mul/matrix_mul_sycl.vcxproj index e189a78c3a..4bec3d84d4 100644 --- a/DirectProgramming/C++SYCL/DenseLinearAlgebra/matrix_mul/matrix_mul_sycl.vcxproj +++ b/DirectProgramming/C++SYCL/DenseLinearAlgebra/matrix_mul/matrix_mul_sycl.vcxproj @@ -107,7 +107,7 @@ true pch.h DisableAllWarnings - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -144,7 +144,7 @@ true pch.h DisableAllWarnings - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/GraphAlgorithms/all-pairs-shortest-paths/all-pairs-shortest-paths.vcxproj b/DirectProgramming/C++SYCL/GraphAlgorithms/all-pairs-shortest-paths/all-pairs-shortest-paths.vcxproj index 3f3f218c8d..48c1926a91 100644 --- a/DirectProgramming/C++SYCL/GraphAlgorithms/all-pairs-shortest-paths/all-pairs-shortest-paths.vcxproj +++ b/DirectProgramming/C++SYCL/GraphAlgorithms/all-pairs-shortest-paths/all-pairs-shortest-paths.vcxproj @@ -55,7 +55,7 @@ Level3 - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -69,7 +69,7 @@ Level3 - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/GraphTraversal/bitonic-sort/bitonic-sort.vcxproj b/DirectProgramming/C++SYCL/GraphTraversal/bitonic-sort/bitonic-sort.vcxproj index 6c4d66bf50..4a84fb8ae0 100644 --- a/DirectProgramming/C++SYCL/GraphTraversal/bitonic-sort/bitonic-sort.vcxproj +++ b/DirectProgramming/C++SYCL/GraphTraversal/bitonic-sort/bitonic-sort.vcxproj @@ -58,7 +58,7 @@ - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -71,7 +71,7 @@ - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/GraphTraversal/hidden-markov-models/hidden-markov-models.vcxproj b/DirectProgramming/C++SYCL/GraphTraversal/hidden-markov-models/hidden-markov-models.vcxproj index 667d37de70..003947cf49 100644 --- a/DirectProgramming/C++SYCL/GraphTraversal/hidden-markov-models/hidden-markov-models.vcxproj +++ b/DirectProgramming/C++SYCL/GraphTraversal/hidden-markov-models/hidden-markov-models.vcxproj @@ -96,7 +96,7 @@ - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Disabled Level3 @@ -126,7 +126,7 @@ - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Disabled Level3 diff --git a/DirectProgramming/C++SYCL/MapReduce/MonteCarloPi/MonteCarloPi.vcxproj b/DirectProgramming/C++SYCL/MapReduce/MonteCarloPi/MonteCarloPi.vcxproj index fbbe50c3ed..6e7df53381 100644 --- a/DirectProgramming/C++SYCL/MapReduce/MonteCarloPi/MonteCarloPi.vcxproj +++ b/DirectProgramming/C++SYCL/MapReduce/MonteCarloPi/MonteCarloPi.vcxproj @@ -40,7 +40,7 @@ - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Disabled false @@ -50,7 +50,7 @@ - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ MaxSpeed false diff --git a/DirectProgramming/C++SYCL/N-BodyMethods/Nbody/Nbody.vcxproj b/DirectProgramming/C++SYCL/N-BodyMethods/Nbody/Nbody.vcxproj index bb1478f12f..50f8f9870c 100644 --- a/DirectProgramming/C++SYCL/N-BodyMethods/Nbody/Nbody.vcxproj +++ b/DirectProgramming/C++SYCL/N-BodyMethods/Nbody/Nbody.vcxproj @@ -74,7 +74,7 @@ true pch.h DisableAllWarnings - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -93,7 +93,7 @@ true pch.h DisableAllWarnings - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/ParallelPatterns/PrefixSum/PrefixSum.vcxproj b/DirectProgramming/C++SYCL/ParallelPatterns/PrefixSum/PrefixSum.vcxproj index f8197e77cb..06633f79b4 100644 --- a/DirectProgramming/C++SYCL/ParallelPatterns/PrefixSum/PrefixSum.vcxproj +++ b/DirectProgramming/C++SYCL/ParallelPatterns/PrefixSum/PrefixSum.vcxproj @@ -51,7 +51,7 @@ - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -64,7 +64,7 @@ - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/ParallelPatterns/loop-unroll/loop-unroll.vcxproj b/DirectProgramming/C++SYCL/ParallelPatterns/loop-unroll/loop-unroll.vcxproj index 2ffded98dd..fff2650dad 100644 --- a/DirectProgramming/C++SYCL/ParallelPatterns/loop-unroll/loop-unroll.vcxproj +++ b/DirectProgramming/C++SYCL/ParallelPatterns/loop-unroll/loop-unroll.vcxproj @@ -55,7 +55,7 @@ Level3 - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -70,7 +70,7 @@ Level3 - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/SparseLinearAlgebra/merge-spmv/merge-spmv.vcxproj b/DirectProgramming/C++SYCL/SparseLinearAlgebra/merge-spmv/merge-spmv.vcxproj index 85a92b2f48..e625d46a12 100644 --- a/DirectProgramming/C++SYCL/SparseLinearAlgebra/merge-spmv/merge-spmv.vcxproj +++ b/DirectProgramming/C++SYCL/SparseLinearAlgebra/merge-spmv/merge-spmv.vcxproj @@ -55,7 +55,7 @@ Level3 - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -69,7 +69,7 @@ Level3 - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/SpectralMethods/DiscreteCosineTransform/msvs/DCT.vcxproj b/DirectProgramming/C++SYCL/SpectralMethods/DiscreteCosineTransform/msvs/DCT.vcxproj index 82c3193c06..4333bc1b10 100644 --- a/DirectProgramming/C++SYCL/SpectralMethods/DiscreteCosineTransform/msvs/DCT.vcxproj +++ b/DirectProgramming/C++SYCL/SpectralMethods/DiscreteCosineTransform/msvs/DCT.vcxproj @@ -75,7 +75,7 @@ true stdcpp17 true - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -98,7 +98,7 @@ true stdcpp17 true - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/StructuredGrids/1d_HeatTransfer/1d_HeatTransfer.vcxproj b/DirectProgramming/C++SYCL/StructuredGrids/1d_HeatTransfer/1d_HeatTransfer.vcxproj index 4c01a69ba9..5b79ee7def 100644 --- a/DirectProgramming/C++SYCL/StructuredGrids/1d_HeatTransfer/1d_HeatTransfer.vcxproj +++ b/DirectProgramming/C++SYCL/StructuredGrids/1d_HeatTransfer/1d_HeatTransfer.vcxproj @@ -60,7 +60,7 @@ true true pch.h - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -77,7 +77,7 @@ true true pch.h - %ONEAPI_ROOT%\dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/StructuredGrids/iso2dfd_dpcpp/iso2dfd.vcxproj b/DirectProgramming/C++SYCL/StructuredGrids/iso2dfd_dpcpp/iso2dfd.vcxproj index 7d9232f0db..7e54c7922f 100644 --- a/DirectProgramming/C++SYCL/StructuredGrids/iso2dfd_dpcpp/iso2dfd.vcxproj +++ b/DirectProgramming/C++SYCL/StructuredGrids/iso2dfd_dpcpp/iso2dfd.vcxproj @@ -60,7 +60,7 @@ true true pch.h - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -77,7 +77,7 @@ true true pch.h - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/DirectProgramming/C++SYCL/StructuredGrids/iso3dfd_dpcpp/iso3dfd.vcxproj b/DirectProgramming/C++SYCL/StructuredGrids/iso3dfd_dpcpp/iso3dfd.vcxproj index efe33c5c14..b3b7bafc79 100755 --- a/DirectProgramming/C++SYCL/StructuredGrids/iso3dfd_dpcpp/iso3dfd.vcxproj +++ b/DirectProgramming/C++SYCL/StructuredGrids/iso3dfd_dpcpp/iso3dfd.vcxproj @@ -57,7 +57,7 @@ true true pch.h - include;$(ONEAPI_ROOT)dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -74,7 +74,7 @@ true true pch.h - include;$(ONEAPI_ROOT)dev-utilities\latest\include;%(AdditionalIncludeDirectories) + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/Libraries/oneDPL/dynamic_selection/sepia-filter-ds/sepia-filter.vcxproj b/Libraries/oneDPL/dynamic_selection/sepia-filter-ds/sepia-filter.vcxproj index 0cb50f4078..508c6bb83e 100644 --- a/Libraries/oneDPL/dynamic_selection/sepia-filter-ds/sepia-filter.vcxproj +++ b/Libraries/oneDPL/dynamic_selection/sepia-filter-ds/sepia-filter.vcxproj @@ -62,7 +62,7 @@ true pch.h DisableAllWarnings - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ _UNICODE;UNICODE;%(PreprocessorDefinitions);WINDOWS @@ -84,7 +84,7 @@ true pch.h DisableAllWarnings - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ _UNICODE;UNICODE;%(PreprocessorDefinitions);WINDOWS diff --git a/Libraries/oneDPL/dynamic_selection/sepia-filter-ds/sepia-policies.vcxproj b/Libraries/oneDPL/dynamic_selection/sepia-filter-ds/sepia-policies.vcxproj index 5f41d105e1..079fcd77f4 100644 --- a/Libraries/oneDPL/dynamic_selection/sepia-filter-ds/sepia-policies.vcxproj +++ b/Libraries/oneDPL/dynamic_selection/sepia-filter-ds/sepia-policies.vcxproj @@ -63,7 +63,7 @@ true pch.h DisableAllWarnings - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ _UNICODE;UNICODE;%(PreprocessorDefinitions);WINDOWS @@ -83,7 +83,7 @@ true pch.h DisableAllWarnings - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ _UNICODE;UNICODE;%(PreprocessorDefinitions);WINDOWS diff --git a/Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj b/Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj index fe2c3b82a2..8787688479 100755 --- a/Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj +++ b/Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj @@ -62,7 +62,7 @@ false /I"$(ONEAPI_ROOT)/tbb/latest/include" %(AdditionalOptions) DisableAllWarnings - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -84,7 +84,7 @@ false /I"$(ONEAPI_ROOT)/tbb/latest/include" %(AdditionalOptions) DisableAllWarnings - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/Libraries/oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj b/Libraries/oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj index b67546514b..3578cb8a63 100755 --- a/Libraries/oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj +++ b/Libraries/oneTBB/tbb-task-sycl/tbb-task-sycl.vcxproj @@ -62,7 +62,7 @@ /I"$(ONEAPI_ROOT)/tbb/latest/include" %(AdditionalOptions) false DisableAllWarnings - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -84,7 +84,7 @@ /I"$(ONEAPI_ROOT)/tbb/latest/include" %(AdditionalOptions) false DisableAllWarnings - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/Tools/Advisor/matrix_multiply_advisor/matrix_multiply.vcxproj b/Tools/Advisor/matrix_multiply_advisor/matrix_multiply.vcxproj index 9a13abd69f..43a2906171 100644 --- a/Tools/Advisor/matrix_multiply_advisor/matrix_multiply.vcxproj +++ b/Tools/Advisor/matrix_multiply_advisor/matrix_multiply.vcxproj @@ -61,7 +61,7 @@ WIN32;DPCPP;%(PreprocessorDefinitions) DisableAllWarnings /std:c++17 %(AdditionalOptions) - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -85,7 +85,7 @@ DisableAllWarnings Default %(AdditionalOptions) - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/Tools/ApplicationDebugger/array-transform/array-transform.vcxproj b/Tools/ApplicationDebugger/array-transform/array-transform.vcxproj index 5cfb0e6786..95dbe7d54f 100644 --- a/Tools/ApplicationDebugger/array-transform/array-transform.vcxproj +++ b/Tools/ApplicationDebugger/array-transform/array-transform.vcxproj @@ -63,7 +63,7 @@ pch.h stdcpp17 /Od - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -82,7 +82,7 @@ true pch.h stdcpp17 - $(ONEAPI_ROOT)dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console diff --git a/Tools/VTuneProfiler/matrix_multiply_vtune/matrix_multiply.vcxproj b/Tools/VTuneProfiler/matrix_multiply_vtune/matrix_multiply.vcxproj index 9a13abd69f..43a2906171 100644 --- a/Tools/VTuneProfiler/matrix_multiply_vtune/matrix_multiply.vcxproj +++ b/Tools/VTuneProfiler/matrix_multiply_vtune/matrix_multiply.vcxproj @@ -61,7 +61,7 @@ WIN32;DPCPP;%(PreprocessorDefinitions) DisableAllWarnings /std:c++17 %(AdditionalOptions) - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console @@ -85,7 +85,7 @@ DisableAllWarnings Default %(AdditionalOptions) - $(ONEAPI_ROOT)\dev-utilities\latest\include + $(ONEAPI_ROOT)\include\;$(ONEAPI_ROOT)\dev-utilities\latest\include\ Console