Adding changes to mandelbrot to remove libsycl-complex.so dependency

Author: vmadananth

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

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Copyright 2019 Intel Corporation
-=======
-Copyright Intel Corporation
->>>>>>> 646c0545c8df6680d8d8a84b191ce56b698e346e
 
 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/README.md

@@ -25,12 +25,9 @@ This code sample is licensed under MIT license.
 
 ## Building the `Mandelbrot` Program for CPU and GPU
 
-<<<<<<< HEAD
-=======
 ### Include Files
 The include folder is located at %ONEAPI_ROOT%\dev-utilities\latest\include on your development system.
 
->>>>>>> 646c0545c8df6680d8d8a84b191ce56b698e346e
 ### Running Samples In DevCloud
 If running a sample in the Intel DevCloud, remember that you must specify the compute node (CPU, GPU, FPGA) as well whether to run in batch or interactive mode. For more information see the Intel® oneAPI Base Toolkit Get Started Guide (https://devcloud.intel.com/oneapi/get-started/base-toolkit/)
 
@@ -65,15 +62,6 @@ $ make
       Right click on the project in Solution explorer and select Rebuild.
       From top menu select Debug -> Start without Debugging.
 
-<<<<<<< HEAD
->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.
-=======
->>>>>>> 646c0545c8df6680d8d8a84b191ce56b698e346e
 
 * Build the program using MSBuild
       Open "x64 Native Tools Command Prompt for VS2017" or "x64 Native Tools Command Prompt for VS2019"

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

@@ -14,10 +14,6 @@
     <ClCompile Include="src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-<<<<<<< HEAD
-    <ClInclude Include="src\dpc_common.hpp" />
-=======
->>>>>>> 646c0545c8df6680d8d8a84b191ce56b698e346e
     <ClInclude Include="src\mandel.hpp" />
   </ItemGroup>
   <ItemGroup>
@@ -113,15 +109,11 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <SYCLWarningLevel>Level3</SYCLWarningLevel>
-<<<<<<< HEAD
-=======
       <AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
->>>>>>> 646c0545c8df6680d8d8a84b191ce56b698e346e
     </ClCompile>
     <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'">
@@ -159,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/mandelbrot.vcxproj.filters

@@ -15,12 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-<<<<<<< HEAD
-    <ClInclude Include="src\dpc_common.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-=======
->>>>>>> 646c0545c8df6680d8d8a84b191ce56b698e346e
     <ClInclude Include="src\mandel.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>

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++;
     }