diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f3e9f8..9dc852f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.1) project(cis565_getting_started) @@ -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/INSTRUCTION.md b/INSTRUCTION.md index 5f31bdb..1ce02b9 100644 --- a/INSTRUCTION.md +++ b/INSTRUCTION.md @@ -1,7 +1,7 @@ Project 0 CUDA Getting Started: Instructions ======================== -This is due **Friday, September 1 2017**. (See [late policy](#late-policy) at the bottom) +This is due **Friday, August 31st 2018**. (See [late policy](#late-policy) at the bottom) **Summary:** In this project, you will set up your CUDA development tools and verify that you can build, run, and do performance analysis. @@ -26,6 +26,11 @@ machine with these specs, you may use computers in the Moore or SIG Labs. Skip this part if you are developing on a lab computer. +#### Notes +- Before you get started: if you have multiple VS code and/or CMake versions, you will probably run into trouble. Either uninstall extra versions (if possible) or ensure that the correct VSCode (or XCode) and CMake versions are being chosen. +- If you are running into a lot of trouble, a clean installation of VS Code (or XCode), CMake, and CUDA can help fix any problems if other methods don't work. +- If you have driver issues or random crashing: uninstalling and reinstalling drivers usually works + ### Windows 1. Make sure you are running Windows 7/8/10 and that your NVIDIA drivers are @@ -73,7 +78,7 @@ Capability 5.0. * CUDA 8 is recommended. However, if you have any reason that you have to use CUDA 7.5, please clarify you're using CUDA 7.5 in your report. Also you need to change `find_package(CUDA 8.0 REQUIRED)` in `CMakeLists.txt` to `find_package(CUDA REQUIRED)` before you build your project. - For more Linux installation info, check out [CUDA_Linux Installation Guide](http://developer2.download.nvidia.com/compute/cuda/8.0/secure/Prod2/docs/sidebar/CUDA_Installation_Guide_Linux.pdf?weyH9mwDHKcyP4LBe1idPT47TTMqM6s3HKNrW1hOYPlw0om73Jx7isV6gG6L3O7p6pJm1JNcY4sp_4LDlBVE7dG7mGyjDeKq5O_T7eRdBDlb1I-ZhvperJ5VfM8dT_R6RuRj5hTUEijr5vY8_KFfZAQ1dvq2CQOW5O2gLBtMc3UISE-o11fzsUTBYQ). + For more Linux installation info, check out [CUDA_Linux Installation Guide](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html). * Make sure you select Nsight. 2. Install Git (`apt-get install git` on Debian/Ubuntu). 3. Install CMake (`apt-get install cmake` on Debian/Ubuntu). diff --git a/README.md b/README.md index fd52a04..dfa9334 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,19 @@ Project 0 CUDA Getting Started **University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 0** -* (TODO) YOUR NAME HERE -* 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();