proj2

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

Proj2_Win/CPUversion/CPUSum.cpp

@@ -0,0 +1,78 @@
+#include "stdafx.h"
+#include "CPUSum.h"
+#include <iostream>
+
+CPUSum::CPUSum()
+{
+}
+
+
+CPUSum::~CPUSum()
+{
+}
+
+void CPUSum::scan_inclusive(const int *in, int *out, long n)
+{
+	out[0] = in[0];
+	for (long i = 1; i < n; i++)
+	{
+		out[i] = out[i - 1] + in[i];
+	}
+}
+
+void CPUSum::scan_exclusive(const int *in, int *out, long n)
+{
+	out[0] = 0;
+	for (long i = 1; i < n; i++)
+	{
+		out[i] = out[i - 1] + in[i-1];
+	}
+}
+
+void CPUSum::print(const int *a, long n)
+{
+	for (long i = 0; i < n; i++)
+	{
+		std::cout << a[i] << " ";
+	}
+	std::cout << std::endl;
+}
+
+void CPUSum::transform_bool(const int *in, int *out, long n)
+{
+	for (long i = 0; i < n; i++)
+	{
+		if (in[i] > 0)
+			out[i] = 1;
+		else
+		{
+			out[i] = 0;
+		}
+	}
+}
+
+void CPUSum::scatter(const int *in, int *out, const long len, long &newLength)
+{
+	int *temp = new int[len];
+	int *temp2 = new int[len];
+	transform_bool(in, temp, len);
+	scan_inclusive(temp, temp2, len);
+	newLength = temp2[len - 1];
+	//out = new int[newLength];
+	int pos = 0;
+	if (in[0] > 0)
+	{
+		out[pos++] = in[0];
+	}
+	for (long i = 1; i < len; i++)
+	{
+		if (temp2[i] > temp2[i - 1])
+		{
+			out[pos++] = in[i];
+		}
+	}
+	delete[] temp;
+	delete[] temp2;
+	//print(out, newLength);
+	//delete[] out;
+}

Proj2_Win/CPUversion/CPUSum.h

@@ -0,0 +1,13 @@
+#pragma once
+class CPUSum
+{
+public:
+	void scan_inclusive(const int *in, int *out,long n);
+	void scan_exclusive(const int*in, int *out, long n);
+	void transform_bool(const int *in, int *out, long n);
+	void print(const int *a, long n);
+	void scatter(const int *in, int *out, const long len, long &newLength);
+	CPUSum();
+	~CPUSum();
+};
+

Proj2_Win/CPUversion/CPUversion.cpp

@@ -0,0 +1,73 @@
+// CPUversion.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+#include "CPUSum.h"
+#include <time.h>
+#define TEST_TIMES 100
+#define LENGTH 100000
+void test(const int *in, int *out,int len){
+	CPUSum CPUapp;
+	long newLen = len;
+	CPUapp.scatter(in, out, len, newLen);
+}
+void warmup()
+{
+	clock_t start, finish;
+	double duration;
+	const int len = 1000;
+	int newLen = len;
+	int *in = new int[len];
+	int *out = new int[len];
+	int *out1 = new int[len];
+	//int in[] = { 0, 0, 3, 4, 0, 6, 6, 7, 0, 7, 1, 3, 3, 2, 0, 1 };
+	for (size_t i = 0; i < len; i++)
+	{
+		in[i] = i + 1;
+	}
+	int count = 10000;
+	start = clock();
+	while (count--)
+	{
+		test(in, out, len);
+	}
+	finish = clock();
+	duration = finish - start;
+	//CPUapp.print(out1, newLen);
+	printf("warmup in %f ms\n", duration);
+
+	delete[] out;
+	delete[] out1;
+}
+int _tmain(int argc, _TCHAR* argv[])
+{
+	warmup();
+	clock_t start, finish;
+	double duration;
+	const long len = LENGTH;
+	int newLen = len;
+	int *in = new int[len];
+	int *out = new int[len];
+	int *out1 = new int[len];
+	//int in[] = { 0, 0, 3, 4, 0, 6, 6, 7, 0, 7, 1, 3, 3, 2, 0, 1 };
+	for (long i = 0; i < len; i++)
+	{
+		in[i] = i + 1;
+	}
+	int count = TEST_TIMES;
+	start = clock();
+	while (count--)
+	{
+		test(in, out, len);
+	}
+	finish = clock();
+	duration = finish - start;
+	duration = duration / TEST_TIMES;
+	//CPUapp.print(out1, newLen);
+	printf("CPU Scattering finished in %f ms\n", duration);
+
+	delete[] out;
+	delete[] out1;
+	return 0;
+}
+

Proj2_Win/CPUversion/CPUversion.vcxproj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5B128216-B420-4BD4-9765-C5A0040A3C05}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>CPUversion</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="CPUSum.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="CPUSum.cpp" />
+    <ClCompile Include="CPUversion.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

Proj2_Win/CPUversion/CPUversion.vcxproj.filters

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="targetver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CPUSum.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CPUversion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CPUSum.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

Proj2_Win/CPUversion/Debug/CPUversion.Build.CppClean.log

@@ -0,0 +1,15 @@
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\cpuversion.pch
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\vc120.pdb
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\vc120.idb
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\stdafx.obj
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\cpusum.obj
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\cpuversion.obj
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\debug\cpuversion.ilk
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\debug\cpuversion.exe
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\debug\cpuversion.pdb
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\cpuversion.tlog\cl.command.1.tlog
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\cpuversion.tlog\cl.read.1.tlog
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\cpuversion.tlog\cl.write.1.tlog
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\cpuversion.tlog\link.command.1.tlog
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\cpuversion.tlog\link.read.1.tlog
+h:\documents\gpu programming\project2-streamcompaction\proj2_win\cpuversion\debug\cpuversion.tlog\link.write.1.tlog