diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c80bce..9dc852f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/linux" "/usr/lib64") elseif(WIN32) - if(${MSVC_VERSION} MATCHES "1900") + if(${MSVC_VERSION} MATCHES "1915") + set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/win/vc2015") + elseif(${MSVC_VERSION} MATCHES "1900") set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/win/vc2015") elseif(${MSVC_VERSION} MATCHES "1800") set(EXTERNAL_LIB_PATH "${EXTERNAL}/lib/win/vc2013") diff --git a/README.md b/README.md index 793f2b2..dfa9334 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,19 @@ 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) +* Xiao Zhang + * [LinkedIn](https://www.linkedin.com/in/xiao-zhang-674bb8148/) +* Tested on: Windows 10, i7-7700K @ 4.20GHz 16.0GB, GTX 1080 15.96GB (my own PC) -### (TODO: Your README) +### Result -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +![](images/0.JPG) + +### Nsight + +![](images/1.png) + +![](images/2.png) + +![](images/3.png) diff --git a/images/0.JPG b/images/0.JPG new file mode 100644 index 0000000..dbb4d33 Binary files /dev/null and b/images/0.JPG differ diff --git a/images/1.png b/images/1.png new file mode 100644 index 0000000..6e5e73d Binary files /dev/null and b/images/1.png differ diff --git a/images/2.png b/images/2.png new file mode 100644 index 0000000..81d468b Binary files /dev/null and b/images/2.png differ diff --git a/images/3.png b/images/3.png new file mode 100644 index 0000000..68bfc59 Binary files /dev/null and b/images/3.png differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b98ef96..e3c1bf9 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_60 ) diff --git a/src/main.cpp b/src/main.cpp index 886fd4c..86d72b9 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 = "Xiao Zhang"; if (init(argc, argv)) { mainLoop();