Merge pull request #3 from oneapi-src/master

Update 08.20.20

Author: JoeOster

DirectProgramming/C++/CombinationalLogic/MandelbrotOMP/sample.json

@@ -3,7 +3,7 @@
     "description": "Calculates the mandelbrot set and outputs a bmp image representation using OpenMP*",
     "categories": ["Toolkit/Intel® oneAPI HPC Toolkit"],
     "os": ["linux", "darwin"],
-    "builder": ["cmake"],
+    "builder": ["make"],
     "languages": [{"cpp":{}}],
     "toolchain": ["icc"],
     "guid": "DD113F58-4D91-41BB-B46E-6CF2C0D9F6F9",

DirectProgramming/C++/CompilerInfrastructure/Intrinsics/sample.json

@@ -3,7 +3,7 @@
     "description": "Demonstrates the intrinsic functions of the Intel® C++ Compiler",
     "categories": ["Toolkit/Intel® oneAPI HPC Toolkit"],
     "os": ["linux", "darwin"],
-    "builder": ["cmake"],
+    "builder": ["make"],
     "languages": [{"cpp":{}}],
     "toolchain": ["icc"],
     "guid": "ACD0E89E-67CC-4CB4-87AB-B12B84962EAF",

DirectProgramming/C++/GraphTraversal/MergesortOMP/sample.json

@@ -3,7 +3,7 @@
     "description": "Classic sorting algorithm using OpenMP*",
     "categories": ["Toolkit/Intel® oneAPI HPC Toolkit"],
     "os": ["linux", "darwin"],
-    "builder": ["cmake"],
+    "builder": ["make"],
     "languages": [{"cpp":{}}],
     "toolchain": ["icc"],
     "guid": "5AFED65F-F725-411D-B21C-B59008D1166D",

DirectProgramming/DPC++/CombinationalLogic/mandelbrot/License.txt

@@ -1,4 +1,4 @@
-Copyright Intel Corporation
+Copyright 2019 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:
 

DirectProgramming/DPC++/CombinationalLogic/mandelbrot/mandelbrot.vcxproj

@@ -114,7 +114,6 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(ONEAPI_ROOT)\compiler\latest\windows\bin\libsycl-complex.o</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -152,10 +151,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(ONEAPI_ROOT)\compiler\latest\windows\bin\libsycl-complex.o</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

DirectProgramming/DPC++/CombinationalLogic/mandelbrot/src/CMakeLists.txt

@@ -2,10 +2,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++17")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
 
 add_executable(mandelbrot main.cpp)
-target_link_libraries(mandelbrot OpenCL sycl $ENV{ONEAPI_ROOT}/compiler/latest/linux/lib/libsycl-complex.o)
-add_custom_target(run ${CMAKE_COMMAND} -E env SYCL_BE=PI_OPENCL ./mandelbrot)
+target_link_libraries(mandelbrot OpenCL sycl)
+add_custom_target(run ./mandelbrot)
 
 add_executable(mandelbrot_usm main.cpp)
 target_compile_definitions(mandelbrot_usm PRIVATE MANDELBROT_USM)
-target_link_libraries(mandelbrot_usm OpenCL sycl $ENV{ONEAPI_ROOT}/compiler/latest/linux/lib/libsycl-complex.o)
-add_custom_target(run_usm ${CMAKE_COMMAND} -E env SYCL_BE=PI_OPENCL ./mandelbrot_usm)
+target_link_libraries(mandelbrot_usm OpenCL sycl)
+add_custom_target(run_usm ./mandelbrot_usm)

DirectProgramming/DPC++/CombinationalLogic/mandelbrot/src/mandel.hpp

@@ -33,6 +33,10 @@ struct MandelParameters {
   int max_iterations_;
 
   typedef std::complex<float> ComplexF;
+  static std::complex<float> complex_square( std::complex<float> c)
+  {
+    return std::complex<float>( c.real()*c.real() - c.imag()*c.imag(), c.real()*c.imag()*2 );
+  }
 
   MandelParameters(int row_count, int col_count, int max_iterations)
       : row_count_(row_count),
@@ -41,7 +45,7 @@ struct MandelParameters {
 
   int row_count() const { return row_count_; }
   int col_count() const { return col_count_; }
-  int max_iterations() const { return max_iterations_; }
+int max_iterations() const { return max_iterations_; }
 
   // Scale from 0..row_count to -1.5..0.5
   float ScaleRow(int i) const { return -1.5f + (i * (2.0f / row_count_)); }
@@ -63,7 +67,8 @@ struct MandelParameters {
         break;
       }
 
-      z = z * z + c;
+     // z = z * z + c;
+      z = complex_square(z) + c;
       count++;
     }
 

DirectProgramming/DPC++/ParallelPatterns/PrefixSum/CMakeLists.txt

@@ -0,0 +1,30 @@
+# required cmake version
+cmake_minimum_required(VERSION 3.5)
+
+project (PrefixSum)
+
+if(WIN32)
+        set(CMAKE_CXX_COMPILER "dpcpp")
+else()
+        set(CMAKE_CXX_COMPILER "dpcpp")
+endif()
+
+# Set default build type to RelWithDebInfo if not specified
+if (NOT CMAKE_BUILD_TYPE)
+    message (STATUS "Default CMAKE_BUILD_TYPE not set using Release with Debug Info")
+    set (CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE
+        STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel"
+        FORCE)
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fsycl -std=c++17")
+
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lOpenCL -lsycl")
+
+add_executable (PrefixSum src/PrefixSum.cpp)
+
+add_custom_target (run
+	COMMAND PrefixSum 21 47 
+        WORKING_DIRECTORY ${CMAKE_PROJECT_DIR}
+)
+

DirectProgramming/DPC++/ParallelPatterns/PrefixSum/License.txt

@@ -0,0 +1,7 @@
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

DirectProgramming/DPC++/ParallelPatterns/PrefixSum/PrefixSum.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29926.136
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrefixSum", "PrefixSum.vcxproj", "{BC12ABE6-7951-47D6-93DC-126F8A5FCFD2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BC12ABE6-7951-47D6-93DC-126F8A5FCFD2}.Debug|x64.ActiveCfg = Debug|x64
+		{BC12ABE6-7951-47D6-93DC-126F8A5FCFD2}.Debug|x64.Build.0 = Debug|x64
+		{BC12ABE6-7951-47D6-93DC-126F8A5FCFD2}.Release|x64.ActiveCfg = Release|x64
+		{BC12ABE6-7951-47D6-93DC-126F8A5FCFD2}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9B9594EB-112B-4FAE-AD1F-04BD8FF34B9F}
+	EndGlobalSection
+EndGlobal