diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b080ab..1c0c31d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,9 +49,17 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") list(APPEND CORELIBS "-framework CoreVideo") endif() +message(STATUS "Hello!") # Linux-specific hacks/fixes if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lX11 -lXxf86vm -lXrandr -lXi") + find_library(x11 NAMES X11) + find_library(xrandr NAMES Xrandr) + find_library(xi NAMES Xi) + find_library(xxf86vm NAMES Xxf86vm) + list(APPEND CORELIBS ${x11}) + list(APPEND CORELIBS ${xrandr}) + list(APPEND CORELIBS ${xi}) + list(APPEND CORELIBS ${xxf86vm}) endif() # Crucial magic for CUDA linking diff --git a/README.md b/README.md index fd52a04..eb3121b 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,18 @@ 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) +* Ruoyu Fan +* Tested on: Windows 10, i7-4720HQ @ 2.60GHz, 16GB Memory, + GTX 970M 3072MB +### Things I have done -### (TODO: Your README) +* Name in title bar +* Screenshots +* Screenshot of analysis -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +My laptop comes with Nvidia Optimus. Whenever I hit "Launch" for the performance +analysis while "OpenGL" checked in "Trace Settings", the program crashes. So I +traced CUDA only in the screenshot. +![Result](images/screenshot-result.png) +![Timeline](images/screenshot-analysis.png) diff --git a/images/screenshot-analysis.png b/images/screenshot-analysis.png new file mode 100644 index 0000000..1f1afd4 Binary files /dev/null and b/images/screenshot-analysis.png differ diff --git a/images/screenshot-result.png b/images/screenshot-result.png new file mode 100644 index 0000000..d1f537d Binary files /dev/null and b/images/screenshot-result.png differ diff --git a/src/main.cpp b/src/main.cpp index 886fd4c..b13b9c3 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 = "Ruoyu Fan"; if (init(argc, argv)) { mainLoop();