diff --git a/CMakeSettings.json b/CMakeSettings.json new file mode 100644 index 0000000..9678574 --- /dev/null +++ b/CMakeSettings.json @@ -0,0 +1,17 @@ +{ + "configurations": [ + { + "name": "x64-Debug", + "generator": "Visual Studio 15 2017 Win64", + "configurationType": "Debug", + "inheritEnvironments": [ + "msvc_x64_x64" + ], + "buildRoot": "D:\\Users\\Emily\\projects\\cis565\\Project0-CUDA-Getting-Started\\build", + "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", + "cmakeCommandArgs": "-DCUDA_SDK_ROOT_DIR=\"C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v9.2\" -DCUDA_TOOLKIT_ROOT_DIR=\"C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v9.2\"", + "buildCommandArgs": "-v", + "ctestCommandArgs": "" + } + ] +} \ No newline at end of file diff --git a/README.md b/README.md index 793f2b2..031dc3d 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,12 @@ Project 0 CUDA Getting Started **University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 0** -* (TODO) YOUR NAME HERE - * (TODO) [LinkedIn](), [personal website](), [twitter](), etc. -* Tested on: (TODO) Windows 22, i7-2222 @ 2.22GHz 22GB, GTX 222 222MB (Moore 2222 Lab) +* Emily Vo + * [LinkedIn](linkedin.com/in/emilyvo), [personal website](emilyhvo.com) +* Tested on: Windows 10, i7-7700HQ @ 2.8GHz 16GB, GTX 1060 6GB (Personal Computer) -### (TODO: Your README) - -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +### README +![](images/Window.PNG) +![](images/Timeline.PNG) +![](images/Autos_Warps.PNG) diff --git a/images/Autos_Warps.PNG b/images/Autos_Warps.PNG new file mode 100644 index 0000000..ebec4fe Binary files /dev/null and b/images/Autos_Warps.PNG differ diff --git a/images/Timeline.PNG b/images/Timeline.PNG new file mode 100644 index 0000000..8ada7ae Binary files /dev/null and b/images/Timeline.PNG differ diff --git a/images/Window.PNG b/images/Window.PNG new file mode 100644 index 0000000..b884bbc Binary files /dev/null and b/images/Window.PNG differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b98ef96..80df9cf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,5 +7,5 @@ set(SOURCE_FILES cuda_add_library(src ${SOURCE_FILES} - OPTIONS -arch=sm_20 + OPTIONS -arch=sm_61 ) diff --git a/src/main.cpp b/src/main.cpp index 886fd4c..895d6f6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,7 +11,7 @@ */ int main(int argc, char* argv[]) { // TODO: Change this line to use your name! - m_yourName = "TODO: YOUR NAME HERE"; + m_yourName = "EMILY VO"; if (init(argc, argv)) { mainLoop();