diff options
| author | Tor Aamodt <[email protected]> | 2012-05-31 16:34:41 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:47:32 -0700 |
| commit | f10b93eae05cafe2d6ea18e146d517d96d94c133 (patch) | |
| tree | 8e366f77d2b5237fb907433d1d4b845176145363 | |
| parent | 29e7261ad30156f08772e6393ba7d8747bc22c5d (diff) | |
- adding clearer documentation to setup_environment
- removing an assert that gets triggered when using CUDA 4.2
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 12865]
| -rw-r--r-- | setup_environment | 19 | ||||
| -rw-r--r-- | src/cuda-sim/ptx_ir.cc | 1 |
2 files changed, 15 insertions, 5 deletions
diff --git a/setup_environment b/setup_environment index 79b0b3b..c1288a9 100644 --- a/setup_environment +++ b/setup_environment @@ -1,14 +1,25 @@ # see README before running this -# change the following to point to your installation of CUDA Toolkit if [ ! -n "$CUDA_INSTALL_PATH" ]; then - if [ -d $HOME/nvcuda/4.0/cuda ]; then - export CUDA_INSTALL_PATH=$HOME/nvcuda/4.0/cuda + + # Be sure to compile GPGPU-Sim with the same version of the CUDA + # Toolkit that you use to compile an application you want to run on + # GPGPU-Sim. + # + # If you need to use multiple CUDA Toolkit versions (e.g., one for + # GPGPU-Sim, and another for some other project), then you can change + # the following line to point to a local install of the CUDA Toolkit + # (this should be a verson that GPGPU-Sim supports). + + MYCUDA_INSTALL_PATH=$HOME/nvcuda/4.2.9/cuda + + if [ -d $MYCUDA_INSTALL_PATH ]; then + export CUDA_INSTALL_PATH=$MYCUDA_INSTALL_PATH fi fi if [ ! -n "$CUDA_INSTALL_PATH" ]; then echo ""; - echo "ERROR ** Install CUDA Toolkit and edit this file to point to it."; + echo "ERROR ** Install CUDA Toolkit then set CUDA_INSTALL_PATH or edit this file."; echo ""; return; fi diff --git a/src/cuda-sim/ptx_ir.cc b/src/cuda-sim/ptx_ir.cc index 5f8410b..50669b6 100644 --- a/src/cuda-sim/ptx_ir.cc +++ b/src/cuda-sim/ptx_ir.cc @@ -115,7 +115,6 @@ unsigned symbol_table::get_sm_target() const void symbol_table::set_ptx_version( float ver, unsigned ext ) { m_ptx_version = ptx_version(ver,ext); - assert( m_ptx_version.ver() < 3 ); } void symbol_table::set_sm_target( const char *target, const char *ext, const char *ext2 ) |