From 77649b0b8448a5305034a2007d29c06410585e26 Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Wed, 13 Jun 2012 15:25:33 -0800 Subject: make sure CUDA_INSTALL_PATH points to a valid directory and that "which" can find nvcc [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13084] --- Makefile | 12 +++++++++++- setup_environment | 13 +++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0c7891d..09e8c34 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,17 @@ check_setup_environment: @if [ ! -n "$(GPGPUSIM_ROOT)" ]; then \ echo "ERROR *** run 'source setup_environment' before 'make'; please see README."; \ exit 101; \ - else true; \ + else \ + NVCC_PATH=`which nvcc`; \ + if [ $$? = 1 ]; then \ + echo ""; \ + echo "ERROR ** nvcc (from CUDA Toolkit) was not found in PATH but required to build GPGPU-Sim."; \ + echo " Try adding $(CUDA_INSTALL_PATH)/bin/ to your PATH environment variable."; \ + echo " Please also be sure to read the README file if you have not done so."; \ + echo ""; \ + exit 102; \ + else true; \ + fi \ fi no_opencl_support: diff --git a/setup_environment b/setup_environment index c805ada..066714e 100644 --- a/setup_environment +++ b/setup_environment @@ -4,6 +4,19 @@ if [ ! -n "$CUDA_INSTALL_PATH" ]; then echo "ERROR ** Install CUDA Toolkit and set CUDA_INSTALL_PATH."; return; fi +if [ ! -d "$CUDA_INSTALL_PATH" ]; then + echo "ERROR ** CUDA_INSTALL_PATH=$CUDA_INSTALL_PATH invalid (directory does not exist)"; + return; +fi +NVCC_PATH=`which nvcc`; +if [ $? = 1 ]; then + echo ""; + echo "ERROR ** nvcc (from CUDA Toolkit) was not found in PATH but required to build GPGPU-Sim."; + echo " Try adding $CUDA_INSTALL_PATH/bin/ to your PATH environment variable."; + echo " Please also be sure to read the README file if you have not done so."; + echo ""; + return; +fi # to run the debug build of GPGPU-Sim run: # source setup_environment debug -- cgit v1.3