diff --git a/.gitignore b/.gitignore index 60128bb..4347b8e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ cis565_getting_started_generated_kernel* *.sln *.vcxproj *.xcodeproj +build # Created by https://www.gitignore.io/api/linux,osx,sublimetext,windows,jetbrains,vim,emacs,cmake,c++,cuda,visualstudio,kate,webstorm,eclipse,xcode diff --git a/.project b/.project deleted file mode 100644 index 5af4f8e..0000000 --- a/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - cis565 - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/README.md b/README.md index 6c06581..fee5aa1 100644 --- a/README.md +++ b/README.md @@ -143,21 +143,19 @@ It is recommended that you use Nsight. 1. In a terminal, navigate to your cloned project directory (`cd some/path`). -2. Create a `build` directory: `mkdir build` - * (This "out-of-source" build makes it easy to delete the `build` directory - and try again if something goes wrong with the configuration.) -3. Navigate into that directory: `cd build` -4. Open the CMake GUI to configure the project: `cmake-gui ..` - * Click *Configure*. Select the Unix Makefiles generator. - * If you see an error like `CUDA_SDK_ROOT_DIR-NOTFOUND`, - set `CUDA_SDK_ROOT_DIR` to your CUDA install path. This will be something - like: `/usr/local/cuda` - * Click *Generate*. -5. Open Nsight. Set the workspace to the one *containing* your cloned repo. -6. *File->Import...->General->Existing Projects Into Workspace*. Select - the project directory. *Finish.* -7. Select the *cis565-* project in the Project Explorer. Build. -8. Run. +2. Type `make`. +3. If you see an error like `CUDA_SDK_ROOT_DIR-NOTFOUND`: + * `cd` to the build directory, then run CMake GUI: `cmake-gui ..` + * Set `CUDA_SDK_ROOT_DIR` to your CUDA install path. + This will be something like: `/usr/local/cuda` + * Click *Configure*, then *Generate*. +4. Open Nsight. Set the workspace to the one *containing* your cloned repo. +5. *File->New->Makefile Project with Existing Code*. + * Set the *Existing Code Location* to the cloned project directory. + * Select *CUDA Toolkit 7.0*. + * *Finish*. +6. Select the *cis565-* project in the Project Explorer. Build. +7. Run the `cis565_` binary. ## Part 4: Modify