CIS565-Fall-2014 · JivingTechnostic · Sep 22, 2014
diff --git a/Part1/PROJ_WIN/CIS565_PROJ_1.suo b/Part1/PROJ_WIN/CIS565_PROJ_1.suo
diff --git a/Part1/PROJ_WIN/CIS565_PROJ_1/CIS565_PROJ_1.vcxproj b/Part1/PROJ_WIN/CIS565_PROJ_1/CIS565_PROJ_1.vcxproj
@@ -30,7 +30,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 5.5.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 6.5.props" />
   </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" />
@@ -62,7 +62,7 @@
       <GPUDebugInfo>true</GPUDebugInfo>
       <GenerateLineInfo>true</GenerateLineInfo>
       <HostDebugInfo>true</HostDebugInfo>
-      <CodeGeneration>compute_10,sm_10;compute_20,sm_20;compute_30,sm_30</CodeGeneration>
+      <CodeGeneration>compute_20,sm_20;compute_30,sm_30</CodeGeneration>
     </CudaCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -95,7 +95,7 @@
   <ItemGroup>
     <CudaCompile Include="..\..\src\kernel.cu">
       <FileType>Document</FileType>
-      <CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">compute_10,sm_10;compute_20,sm_20</CodeGeneration>
+      <CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">compute_20,sm_20</CodeGeneration>
     </CudaCompile>
   </ItemGroup>
   <ItemGroup>
@@ -114,6 +114,6 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 5.5.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 6.5.targets" />
   </ImportGroup>
 </Project>
diff --git a/Part1/PROJ_WIN/CIS565_PROJ_1/vc100.pdb b/Part1/PROJ_WIN/CIS565_PROJ_1/vc100.pdb
diff --git a/Part1/PROJ_WIN/src/kernel.cu.deps b/Part1/PROJ_WIN/src/kernel.cu.deps
diff --git a/Part1/src/kernel.cu b/Part1/src/kernel.cu
@@ -9,8 +9,8 @@
 dim3 threadsPerBlock(blockSize);
 
 int numObjects;
-const float planetMass = 3e8;
 const __device__ float starMass = 5e10;
+const __device__ float planetMass = 3e8;
 
 const float scene_scale = 2e2; //size of the height map in simulation space
 
@@ -89,19 +89,37 @@ __global__ void generateCircularVelArray(int time, int N, glm::vec3 * arr, glm::
 //		 REMEMBER : F = (G * m_a * m_b) / (r_ab ^ 2)
 __device__  glm::vec3 accelerate(int N, glm::vec4 my_pos, glm::vec4 * their_pos)
 {
-    return glm::vec3(0.0f);
+	glm::vec3 delta_acc (0.f);
+	float dist_from_star = sqrt(my_pos.x * my_pos.x + my_pos.y * my_pos.y + my_pos.z * my_pos.z);
+	if (dist_from_star > 1) {
+		delta_acc += (float)(G * starMass) / pow(dist_from_star, 3) * (-glm::vec3(my_pos));
+	}
+	for (int i = 0; i < N; i++) {
+		//glm::vec3 their_pos_3d (their_pos[i]);
+		glm::vec3 R (their_pos[i] - my_pos);
+		float dist = sqrt(R.x * R.x + R.y * R.y + R.z * R.z);
+		if (dist > 1) {
+			delta_acc += (float)(G * planetMass) / pow(dist, 3) * R;
+		}
+	}
+
+    return delta_acc;
 }
 
 // TODO : update the acceleration of each body
 __global__ void updateF(int N, float dt, glm::vec4 * pos, glm::vec3 * vel, glm::vec3 * acc)
 {
-	// FILL IN HERE
+	int index = threadIdx.x + (blockIdx.x * blockDim.x);
+	acc[index] = accelerate(N, pos[index], pos);
 }
 
 // TODO : update velocity and position using a simple Euler integration scheme
 __global__ void updateS(int N, float dt, glm::vec4 * pos, glm::vec3 * vel, glm::vec3 * acc)
 {
 	// FILL IN HERE
+    int index = threadIdx.x + (blockIdx.x * blockDim.x);
+	pos[index] += glm::vec4(dt * vel[index],0);
+	vel[index] += dt * acc[index];
 }
 
 // Update the vertex buffer object
@@ -180,6 +198,11 @@ void initCuda(int N)
 void cudaNBodyUpdateWrapper(float dt)
 {
 	// FILL IN HERE
+	dim3 fullBlocksPerGrid((int)ceil(float(numObjects)/float(blockSize)));
+	updateF<<<fullBlocksPerGrid, blockSize>>>(numObjects, dt, dev_pos, dev_vel, dev_acc);
+    cudaThreadSynchronize();
+	updateS<<<fullBlocksPerGrid, blockSize>>>(numObjects, dt, dev_pos, dev_vel, dev_acc);
+    cudaThreadSynchronize();
 }
 
 void cudaUpdateVBO(float * vbodptr, int width, int height)

diff --git a/Part1/src/main.cpp b/Part1/src/main.cpp
@@ -62,7 +62,7 @@ void runCuda()
     // execute the kernel
     cudaNBodyUpdateWrapper(DT);
 #if VISUALIZE == 1
-    cudaUpdatePBO(dptr, field_width, field_height);
+    //cudaUpdatePBO(dptr, field_width, field_height);
     cudaUpdateVBO(dptrvert, field_width, field_height);
 #endif
     // unmap buffer object

diff --git a/Part2/Part2.sln b/Part2/Part2.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project-1_part-2", "Project-1_part-2\Project-1_part-2.vcxproj", "{B9F2B494-1DFB-43C4-A456-00C4DCF651F9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B9F2B494-1DFB-43C4-A456-00C4DCF651F9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B9F2B494-1DFB-43C4-A456-00C4DCF651F9}.Debug|Win32.Build.0 = Debug|Win32
+		{B9F2B494-1DFB-43C4-A456-00C4DCF651F9}.Release|Win32.ActiveCfg = Release|Win32
+		{B9F2B494-1DFB-43C4-A456-00C4DCF651F9}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Part2/Project-1_part-2/Project-1_part-2.vcxproj b/Part2/Project-1_part-2/Project-1_part-2.vcxproj
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.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>{B9F2B494-1DFB-43C4-A456-00C4DCF651F9}</ProjectGuid>
+    <RootNamespace>Project1_part2</RootNamespace>
+    <ProjectName>Part2</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 6.5.props" />
+  </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 />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;cudart.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <CudaCompile>
+      <CompileOut>$(ProjectDir)$(Platform)/$(Configuration)/%(Filename)%(Extension).obj</CompileOut>
+    </CudaCompile>
+    <CudaCompile>
+      <Include>$(CudaToolkitIncludeDir)</Include>
+    </CudaCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CudaCompile Include="matrix_math.cu">
+      <CompileOut Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Platform)/$(Configuration)/%(Filename)%(Extension).obj</CompileOut>
+      <Include Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CudaToolkitIncludeDir)</Include>
+    </CudaCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 6.5.targets" />
+  </ImportGroup>
+</Project>
diff --git a/Part2/Project-1_part-2/Project-1_part-2.vcxproj.filters b/Part2/Project-1_part-2/Project-1_part-2.vcxproj.filters
@@ -0,0 +1,22 @@
+<?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;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>
+    <CudaCompile Include="matrix_math.cu">
+      <Filter>Source Files</Filter>
+    </CudaCompile>
+  </ItemGroup>
+</Project>
diff --git a/Part2/Project-1_part-2/matrix_math.cu b/Part2/Project-1_part-2/matrix_math.cu
@@ -0,0 +1,125 @@
+#include <stdio.h>
+#include <cuda.h>
+#include <cmath>
+#include <iostream>
+
+float cpu_array [25];
+float cpu_output_array [25];
+float *gpu_array_A;
+float *gpu_array_B;
+float *gpu_output_array;
+const int mat_width = 5;
+
+dim3 dimBlock(mat_width, mat_width);
+dim3 dimGrid(1, 1);
+
+void initCuda(int width) {
+	cudaMalloc((void**)&gpu_array_A, width*width*sizeof(float));
+	cudaMemcpy(gpu_array_A, cpu_array, width*width*sizeof(float), cudaMemcpyHostToDevice);
+
+	cudaMalloc((void**)&gpu_array_B, width*width*sizeof(float));
+	cudaMemcpy(gpu_array_B, cpu_array, width*width*sizeof(float), cudaMemcpyHostToDevice);
+
+	cudaMalloc((void**)&gpu_output_array, width*width*sizeof(float));
+}
+
+__global__ void mat_add (float* Ad, float* Bd, float* Pd, int width) {
+	int index = threadIdx.y * width + threadIdx.x;
+
+	Pd[index] = Ad[index] + Bd[index];
+}
+
+__global__ void mat_sub (float* Ad, float* Bd, float* Pd, int width) {
+	int index = threadIdx.y * width + threadIdx.x;
+
+	Pd[index] = Ad[index] - Bd[index];
+}
+
+__global__ void mat_mult (float* Ad, float* Bd, float* Pd, int width) {
+	int tx = threadIdx.x;
+	int ty = threadIdx.y;
+
+	float Pvalue = 0;
+
+	for (int k = 0; k < width; k++) {
+		Pvalue += Ad[ty * width + k] * Bd[k * width + tx];
+	}
+
+	Pd[ty * width + tx] = Pvalue;
+}
+
+void cpu_mat_add (float* A, float* B, float* P, int width) {
+	for (int i = 0; i < width; i++) {
+		for (int j = 0; j < width; j++) {
+			P[j * width + i] = A[j * width + i] + B[j * width + i];
+		}
+	}
+}
+
+void cpu_mat_sub (float* A, float* B, float* P, int width) {
+	for (int i = 0; i < width; i++) {
+		for (int j = 0; j < width; j++) {
+			P[j * width + i] = A[j * width + i] - B[j * width + i];
+		}
+	}
+}
+
+/***
+* Simple helper function for printing a matrix.
+***/
+void cpu_mat_mult (float* A, float* B, float* P, int width) {
+	for (int i = 0; i < width; i++) {
+		for (int j = 0; j < width; j++) {
+			float Psum = 0;
+			for (int k = 0; k < width; k++) {
+				Psum += A[j * width + k] * B[k * width + i];
+			}
+			P[j * width + i] = Psum;
+		}
+	}
+}
+
+/***
+* Simple helper function for printing a matrix.
+***/
+void printMatrix (float* M, int width) {
+	for (int i = 0; i < width; i++) {
+		for (int j = 0; j < width; j++) {
+			std::cout << cpu_output_array[i * width + j] << " ";
+		}
+		std::cout << std::endl;
+	}
+}
+
+int main(int argc, char** argv) {
+
+	for (int i = 0; i < 25; i++) {
+		cpu_array[i] = i;
+	}
+
+	initCuda(mat_width);
+
+	mat_add<<<dimGrid, dimBlock>>>(gpu_array_A, gpu_array_B, gpu_output_array, mat_width);
+	cudaMemcpy(cpu_output_array, gpu_output_array, mat_width*mat_width*sizeof(float), cudaMemcpyDeviceToHost);
+	printMatrix(cpu_output_array, mat_width);
+
+	cpu_mat_add(cpu_array, cpu_array, cpu_output_array, mat_width);
+	printMatrix(cpu_output_array, mat_width);
+
+	mat_sub<<<dimGrid, dimBlock>>>(gpu_array_A, gpu_array_B, gpu_output_array, mat_width);
+	cudaMemcpy(cpu_output_array, gpu_output_array, mat_width*mat_width*sizeof(float), cudaMemcpyDeviceToHost);
+	printMatrix(cpu_output_array, mat_width);
+
+	cpu_mat_sub(cpu_array, cpu_array, cpu_output_array, mat_width);
+	printMatrix(cpu_output_array, mat_width);
+
+	mat_mult<<<dimGrid, dimBlock>>>(gpu_array_A, gpu_array_B, gpu_output_array, mat_width);
+	cudaMemcpy(cpu_output_array, gpu_output_array, mat_width*mat_width*sizeof(float), cudaMemcpyDeviceToHost);
+	printMatrix(cpu_output_array, mat_width);
+
+	cpu_mat_mult(cpu_array, cpu_array, cpu_output_array, mat_width);
+	printMatrix(cpu_output_array, mat_width);
+
+	int a;
+	std::cin>>a;
+}